qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #865

Merged
ysCha merged 16 commits from dev into prd-deploy 2026-05-18 17:00:30 +09:00
Conversation 0 Commits 16 Files Changed 118 +42 -14
6 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f32f9187d1 - Show all commits

1
src/components/estimate/Estimate.jsx
View File

@ -1426,6 +1426,7 @@ export default function Estimate({}) {
<input
type="text"
className="input-light"
maxLength={50 - 1 - (estimateContextState?.objectNameOmit?.length ?? 0)}
value={estimateContextState?.objectName || ''}
onBlur={handleBlurObjectName}
onChange={handleBlurObjectName}

6
src/components/estimate/popup/EstimateCopyPop.jsx
View File

@ -127,7 +127,8 @@ export default function EstimateCopyPop({ planNo, setEstimateCopyPopupOpen }) {
useEffect(() => {
if (estimateContextState?.charger) {
setCopyReceiveUser(session?.userNm)
// [RECEIVEUSER-CLIP20 2026-05-18] T_PLAN.CHARGER nvarchar(20) — 21자+ session 값 클립
setCopyReceiveUser(session?.userNm?.slice(0, 20))
}
}, [estimateContextState?.charger])
@ -311,7 +312,8 @@ export default function EstimateCopyPop({ planNo, setEstimateCopyPopupOpen }) {
type="text"
className="input-light"
required
defaultValue={session?.userNm}
maxLength={20}
defaultValue={session?.userNm?.slice(0, 20)}
onChange={(e) => {
setCopyReceiveUser(e.target.value)
}}

38
src/components/management/StuffDetail.jsx
View File

@ -64,7 +64,7 @@ export default function StuffDetail() {
const formInitValue = {
// 물건번호 T...(임시) S...(진짜)
planReqNo: '', //설계의뢰No
receiveUser: session?.userNm, //담당자 로그인사용자명 디폴트
receiveUser: session?.userNm?.slice(0, 20), //담당자 로그인사용자명 디폴트 // [RECEIVEUSER-CLIP20 2026-05-18] DDL nvarchar(20) — 21자+ session 값 클립
objectStatusId: '0', //물건구분(신축:0 기축 : 1)
objectName: '', //물건명
objectNameOmit: '', //경칭선택
@ -652,7 +652,8 @@ export default function StuffDetail() {
//설계의뢰No.
form.setValue('planReqNo', managementState.planReqNo)
//담당자
form.setValue('receiveUser', managementState.receiveUser)
// [RECEIVEUSER-CLIP20 2026-05-18] DDL nvarchar(20) — 기 저장된 21자+ 값 클립
form.setValue('receiveUser', managementState.receiveUser?.slice(0, 20))
//물건구분objectStatusId
setSelectObjectStatusId(managementState.objectStatusId)
@ -1138,6 +1139,9 @@ export default function StuffDetail() {
const _receiveUser = watch('receiveUser')
//objectName: '', //물건명
const _objectName = watch('objectName')
// [NVARCHAR50-GUARD 2026-05-18] ADDRESSEE_COMPANY_NAME(nvarchar(50)) = objectName + ' ' + objectNameOmit 합산 maxLength
const _objectNameOmit = watch('objectNameOmit')
const objectNameMaxLength = Math.max(0, 50 - 1 - (_objectNameOmit?.length ?? 0))
// saleStoreId: '', //1차 판매점ID
const _saleStoreId = watch('saleStoreId')
// 2차 판매점명
@ -1374,6 +1378,11 @@ export default function StuffDetail() {
return swalFire({ text: getMessage('stuff.detail.save.valierror3', [errors]), type: 'alert', icon: 'warning' })
}
// [NVARCHAR50-GUARD 2026-05-18] ADDRESSEE_COMPANY_NAME = objectName + ' ' + objectNameOmit (nvarchar(50)) 합산 가드
if (formData.objectName && (formData.objectName + ' ' + (formData.objectNameOmit ?? '')).length > 50) {
return swalFire({ text: getMessage('stuff.detail.save.objectNameTooLong'), type: 'alert', icon: 'warning' })
}
const apiUrl = '/api/object/save-object'
const params = {
@ -1610,6 +1619,11 @@ export default function StuffDetail() {
}
}
// [NVARCHAR50-GUARD 2026-05-18] ADDRESSEE_COMPANY_NAME = objectName + ' ' + objectNameOmit (nvarchar(50)) 합산 가드
if (params.objectName && (params.objectName + ' ' + (params.objectNameOmit ?? '')).length > 50) {
return swalFire({ text: getMessage('stuff.detail.save.objectNameTooLong'), type: 'alert', icon: 'warning' })
}
const apiUrl = '/api/object/save-object'
if (objectNo) {
setIsGlobalLoading(true)
@ -1883,7 +1897,7 @@ export default function StuffDetail() {
</th>
<td>
<div className="input-wrap" style={{ width: '500px' }}>
<input type="text" className="input-light" {...form.register('receiveUser')} />
<input type="text" className="input-light" maxLength={20} {...form.register('receiveUser')} />
</div>
</td>
</tr>
@ -1912,7 +1926,7 @@ export default function StuffDetail() {
})}
{/* 라디오끝 */}
<div className="input-wrap mr5" style={{ width: '545px' }}>
<input type="text" className="input-light" maxLength={50} {...form.register('objectName')} />
<input type="text" className="input-light" maxLength={objectNameMaxLength} {...form.register('objectName')} />
</div>
<div className="select-wrap" style={{ width: '120px' }}>
<Select
@ -1940,7 +1954,7 @@ export default function StuffDetail() {
<th>{getMessage('stuff.detail.objectNameKana')}</th>
<td>
<div className="input-wrap" style={{ width: '789px' }}>
<input type="text" className="input-light" {...form.register('objectNameKana')} />
<input type="text" className="input-light" maxLength={50} {...form.register('objectNameKana')} />
</div>
</td>
</tr>
@ -2153,7 +2167,7 @@ export default function StuffDetail() {
)}
</div>
<div className="input-wrap mr5" style={{ width: '580px' }}>
<input type="text" className="input-light" value={form.watch('address') || ''} {...form.register('address')} />
<input type="text" className="input-light" maxLength={255} value={form.watch('address') || ''} {...form.register('address')} />
</div>
</div>
</td>
@ -2340,7 +2354,7 @@ export default function StuffDetail() {
<th>{getMessage('stuff.detail.remarks')}</th>
<td>
<div className="input-wrap">
<input type="text" className="input-light" {...form.register('remarks')} />
<input type="text" className="input-light" maxLength={500} {...form.register('remarks')} />
</div>
</td>
</tr>
@ -2475,7 +2489,7 @@ export default function StuffDetail() {
</th>
<td>
<div className="input-wrap" style={{ width: '500px' }}>
<input type="text" className="input-light" {...form.register('receiveUser')} value={form.watch('receiveUser') || ''} />
<input type="text" className="input-light" maxLength={20} {...form.register('receiveUser')} value={form.watch('receiveUser') || ''} />
</div>
</td>
</tr>
@ -2504,7 +2518,7 @@ export default function StuffDetail() {
})}
{/* 상세라디오끝 */}
<div className="input-wrap mr5" style={{ width: '545px' }}>
<input type="text" className="input-light" maxLength={50} {...form.register('objectName')} />
<input type="text" className="input-light" maxLength={objectNameMaxLength} {...form.register('objectName')} />
</div>
<div className="select-wrap" style={{ width: '120px' }}>
<Select
@ -2532,7 +2546,7 @@ export default function StuffDetail() {
<th>{getMessage('stuff.detail.objectNameKana')}</th>
<td>
<div className="input-wrap" style={{ width: '789px' }}>
<input type="text" className="input-light" {...form.register('objectNameKana')} />
<input type="text" className="input-light" maxLength={50} {...form.register('objectNameKana')} />
</div>
</td>
</tr>
@ -2754,7 +2768,7 @@ export default function StuffDetail() {
)}
</div>
<div className="input-wrap mr5" style={{ width: '580px' }}>
<input type="text" className="input-light" value={form.watch('address') || ''} {...form.register('address')} />
<input type="text" className="input-light" maxLength={255} value={form.watch('address') || ''} {...form.register('address')} />
</div>
</div>
</td>
@ -2955,7 +2969,7 @@ export default function StuffDetail() {
<th>{getMessage('stuff.detail.remarks')}</th>
<td>
<div className="input-wrap">
<input type="text" className="input-light" {...form.register('remarks')} value={form.watch('remarks') || ''} />
<input type="text" className="input-light" maxLength={500} {...form.register('remarks')} value={form.watch('remarks') || ''} />
</div>
</td>
</tr>

7
src/hooks/floorPlan/estimate/useEstimateController.js
View File

@ -207,6 +207,13 @@ export const useEstimateController = (planNo, flag) => {
return swalFire({ text: getMessage('estimate.detail.save.requiredObjectName'), type: 'alert', icon: 'warning' })
}
// [NVARCHAR50-GUARD 2026-05-18] ADDRESSEE_COMPANY_NAME = objectName + ' ' + objectNameOmit (nvarchar(50)) 합산 가드
if ((estimateData.objectName + ' ' + (estimateData.objectNameOmit ?? '')).length > 50) {
flag = false
setIsGlobalLoading(false)
return swalFire({ text: getMessage('estimate.detail.save.objectNameTooLong'), type: 'alert', icon: 'warning' })
}
if (isNaN(Date.parse(estimateData.estimateDate))) {
flag = false
setIsGlobalLoading(false)

2
src/locales/ja.json
View File

@ -801,6 +801,7 @@
"stuff.detail.save.valierror2": "設置高さ0より大きい値を入力してください",
"stuff.detail.save.valierror3": "{0} 必須入力項目です。",
"stuff.detail.save.valierror4": "二次販売店名は必須オプションです。",
"stuff.detail.save.objectNameTooLong": "物件名（敬称含む）は50文字以内で入力してください。",
"stuff.detail.move.confirmMsg": "商品情報画面に移動します。 [保存]していない図面情報は削除されます。商品情報画面に移動しますか？",
"stuff.planReqPopup.popTitle": "設計依頼検索",
"stuff.planReqPopup.btn1": "検索",
@ -1051,6 +1052,7 @@
"estimate.detail.save.requiredItem": "製品は1つ以上登録する必要があります。",
"estimate.detail.save.requiredCharger": "担当者は必須です。",
"estimate.detail.save.requiredObjectName": "案件名は必須です。",
"estimate.detail.save.objectNameTooLong": "案件名（敬称含む）は50文字以内で入力してください。",
"estimate.detail.save.requiredPkgAsp": "住宅PKG単価は0より大きい値を入力してください。",
"estimate.detail.save.requiredEstimateDate": "見積日は必須です。",
"estimate.detail.save.requiredItemId": "製品を選択してください。",

2
src/locales/ko.json
View File

@ -801,6 +801,7 @@
"stuff.detail.save.valierror2": "설치높이는 0보다 큰 값을 입력하세요",
"stuff.detail.save.valierror3": "{0} 필수 입력 항목입니다.",
"stuff.detail.save.valierror4": "2차 판매점명은 필수 선택사항입니다.",
"stuff.detail.save.objectNameTooLong": "물건명과 경칭을 합쳐 50자 이내로 입력해주세요.",
"stuff.detail.move.confirmMsg": "물건정보 화면으로 이동합니다. [저장]하지 않은 도면정보는 삭제됩니다. 물건정보 화면으로 이동하시겠습니까?",
"stuff.planReqPopup.popTitle": "설계 의뢰 검색",
"stuff.planReqPopup.btn1": "검색",
@ -1051,6 +1052,7 @@
"estimate.detail.save.requiredItem": "제품은 1개이상 등록해야 됩니다.",
"estimate.detail.save.requiredCharger": "담당자는 필수값 입니다.",
"estimate.detail.save.requiredObjectName": "안건명은 필수값 입니다.",
"estimate.detail.save.objectNameTooLong": "안건명과 경칭을 합쳐 50자 이내로 입력해주세요.",
"estimate.detail.save.requiredPkgAsp": "주택pkg 단가는 0보다 큰 값을 입력하세요.",
"estimate.detail.save.requiredEstimateDate": "견적일은 필수값 입니다.",
"estimate.detail.save.requiredItemId": "제품을 선택해주세요.",