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

Merge Q-CAST-III-MR-206: feature/qcast-100

Browse Source
This commit is contained in:
상연 정 2024-11-01 01:51:09 +00:00 committed by Space Cloud
commit 775884542d
No known key found for this signature in database
GPG Key ID: 2F4D45726235F749
5 changed files with 67 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,6 @@ export default function StuffDetail() {
}
}
console.log('buttonStyle:::', buttonStyle, params.value)
return (
<>
<div className="grid-cell-btn">
@ -323,18 +322,12 @@ export default function StuffDetail() {
let favList
// if (sessionState?.storeId === 'T01') {
if (session?.storeId === 'T01') {
console.log('신규T01::::::::::::::::::::::::::::::::::::')
// url = `/api/object/saleStore/${sessionState?.storeId}/list?userId=${sessionState?.userId}`
url = `/api/object/saleStore/${session?.storeId}/firstList?userId=${session?.userId}`
} else {
// url = `/api/object/saleStore/${sessionState?.storeId}/list`
if (session.storeLvl === '1') {
console.log('로그인이1차:::::::')
//url = `/api/object/saleStore/${session?.storeId}/list`
url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${sessionState?.userId}`
} else {
console.log('로그인이2차:::')
url = ``
url = `/api/object/saleStore/${session?.storeId}/list?firstFlg=1&userId=${session?.userId}`
}
}
@ -386,61 +379,26 @@ export default function StuffDetail() {
setOtherSaleStoreList(otherList)
} else {
console.log('1차점아님:::::::::', res)
//10X22, 201X112,202X217
firstList = res.filter((row) => row.firstAgentYn === 'Y')
setSaleStoreList(firstList)
setFavoriteStoreList(firstList)
setShowSaleStoreList(firstList)
setSelOptions(firstList[0].saleStoreId)
form.setValue('saleStoreId', firstList[0].saleStoreId)
form.setValue('saleStoreLevel', firstList[0].saleStoreLevel)
otherList = res.filter((row) => row.firstAgentYn === 'N')
setOtherSaleStoreList(otherList)
//2차 판매점명/ID는 본인을 셀렉트
setOtherSelOptions(session?.storeId)
form.setValue('otherSaleStoreId', session?.storeId)
form.setValue('otherSaleStoreLevel', session?.storeLvl)
}
}
}
})
// get({ url: url }).then((res) => {
// if (!isEmptyArray(res)) {
// const firstList = res.filter((row) => row.saleStoreLevel === '1')
// let favList
// // if (sessionState?.storeId === 'T01') {
// if (session?.storeId === 'T01') {
// firstList.sort((a, b) => (a.saleStoreId !== 'T01') - (b.saleStoreId !== 'T01') || a.saleStoreId - b.saleStoreId)
// favList = firstList.filter((row) => row.saleStoreId === 'T01' || row.priority !== 'B')
// setSaleStoreList(firstList)
// setFavoriteStoreList(favList)
// setShowSaleStoreList(favList)
// } else {
// //1차점 셀렉트박스
// setSaleStoreList(firstList)
// }
// const otherList = res.filter((row) => row.saleStoreLevel !== '1')
// let filterOtherList
// // if (sessionState?.storeId === 'T01') {
// if (session?.storeId === 'T01') {
// filterOtherList = otherList.filter((row) => row.firstAgentId === 'T01')
// setOriginOtherSaleStoreList(filterOtherList)
// setOtherSaleStoreList(filterOtherList)
// } else {
// //T01 아니고 2차점 판매점 셀렉트박스
// setOriginOtherSaleStoreList(otherList)
// setOtherSaleStoreList(otherList)
// }
// // if (sessionState?.storeLvl === '1') {
// if (session?.storeLvl === '1') {
// // setSelOptions(sessionState?.storeId)
// setSelOptions(session?.storeId)
// // form.setValue('saleStoreId', sessionState?.storeId)
// form.setValue('saleStoreId', session?.storeId)
// // form.setValue('saleStoreLevel', sessionState?.storeLvl)
// form.setValue('saleStoreLevel', session?.storeLvl)
// } else {
// setSelOptions(firstList[0].saleStoreId)
// // setOtherSelOptions(sessionState?.storeId)
// setOtherSelOptions(session?.storeId)
// form.setValue('saleStoreId', firstList[0].saleStoreId)
// // form.setValue('otherSaleStoreId', sessionState?.storeId)
// form.setValue('otherSaleStoreId', session?.storeId)
// // form.setValue('otherSaleStoreLevel', sessionState?.storeLvl)
// form.setValue('otherSaleStoreLevel', session?.storeLvl)
// }
// }
// })
}
// }, [objectNo, sessionState])
}, [objectNo, session])
@ -462,7 +420,7 @@ export default function StuffDetail() {
useEffect(() => {
if (isObjectNotEmpty(detailData)) {
console.log('상세데이타세팅:::::', detailData)
// console.log('상세데이타세팅:::::', detailData)
// 도도부현API
get({ url: '/api/object/prefecture/list' }).then((res) => {
if (!isEmptyArray(res)) {
@ -501,6 +459,11 @@ export default function StuffDetail() {
setFavoriteStoreList(favList)
setShowSaleStoreList(favList)
form.setValue('saleStoreId', firstList[0].saleStoreId)
form.setValue('saleStoreName', firstList[0].saleStoreName)
form.setValue('saleStoreLevel', firstList[0].saleStoreLevel)
setSelOptions(firstList[0].saleStoreId)
//상세데이터의 1차점 아이디로 2차점 목록 조회하기
// url = `/api/object/saleStore/${detailData?.saleStoreId}/list?firstFlg=0&userId=${sessionState?.userId}`
url = `/api/object/saleStore/${detailData?.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
@ -680,6 +643,7 @@ export default function StuffDetail() {
if (objectNo) {
tempObjectNo = objectNo.substring(0, 1)
}
if (tempObjectNo === 'T') {
if (planReqNo) {
if (delFlg) {
@ -690,11 +654,21 @@ export default function StuffDetail() {
form.setValue('saleStoreName', key.saleStoreName)
form.setValue('saleStoreLevel', key.saleStoreLevel)
setSelOptions(key.saleStoreId)
//선택한 1차점 정보로 2차점 list 추리기
//長府工産株式会社　大阪支社
console.log('여기도?????????????????????')
// let newOtherSaleStoreList = originOtherSaleStoreList.filter((row) => row.firstAgentId === key.saleStoreId)
// setOtherSaleStoreList(newOtherSaleStoreList)
let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
let otherList
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
row.value = row.saleStoreId
row.label = row.saleStoreName
})
otherList = res
setOtherSaleStoreList(otherList)
} else {
setOtherSaleStoreList([])
}
})
} else {
//X누름
setSelOptions('')
@ -716,12 +690,9 @@ export default function StuffDetail() {
form.setValue('saleStoreName', key.saleStoreName)
form.setValue('saleStoreLevel', key.saleStoreLevel)
//선택한 1차점 정보로 2차점 조회하기
//長府工産株式会社　大阪支社
console.log('바꿔조ㅜㅝ............', key.saleStoreId)
let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
let otherList
get({ url: url }).then((res) => {
console.log('고른1차점으로 2차점목록조회결과;:::', res)
if (!isEmptyArray(res)) {
res.map((row) => {
row.value = row.saleStoreId
@ -729,7 +700,6 @@ export default function StuffDetail() {
})
otherList = res
console.log('otherList::::::::', otherList)
setOtherSaleStoreList(otherList)
setOtherSelOptions('')
form.setValue('otherSaleStoreId', '')
@ -764,11 +734,21 @@ export default function StuffDetail() {
form.setValue('saleStoreName', key.saleStoreName)
form.setValue('saleStoreLevel', key.saleStoreLevel)
setSelOptions(key.saleStoreId)
//선택한 1차점 정보로 2차점 list 추리기
//長府工産株式会社　大阪支社
console.log('여기도용')
// let newOtherSaleStoreList = originOtherSaleStoreList.filter((row) => row.firstAgentId === key.saleStoreId)
// setOtherSaleStoreList(newOtherSaleStoreList)
let url = `/api/object/saleStore/${key.saleStoreId}/list?firstFlg=0&userId=${session?.userId}`
let otherList
get({ url: url }).then((res) => {
if (!isEmptyArray(res)) {
res.map((row) => {
row.value = row.saleStoreId
row.label = row.saleStoreName
})
otherList = res
setOtherSaleStoreList(otherList)
} else {
setOtherSaleStoreList([])
}
})
} else {
//X누름
setSelOptions('')
@ -818,6 +798,7 @@ export default function StuffDetail() {
if (objectNo) {
tempObjectNo = objectNo.substring(0, 1)
}
if (tempObjectNo === 'T') {
if (planReqNo) {
if (delFlg) {
@ -1306,16 +1287,7 @@ export default function StuffDetail() {
// params.saleStoreLevel = sessionState.storeLvl
params.saleStoreLevel = session.storeLvl
}
//수직적설량, 설치높이 0인지 체크
// let snow = params.verticalSnowCover
// let height = params.installHeight
// if (snow === '0') {
// return alert(getMessage('stuff.detail.save.valierror1'))
// }
// if (height === '0') {
// return alert(getMessage('stuff.detail.save.valierror2'))
// }
await promisePost({ url: '/api/object/save-object', data: params }).then((res) => {
if (res.status === 201) {
alert(getMessage('stuff.detail.tempSave.message1'))
@ -1389,7 +1361,7 @@ export default function StuffDetail() {
)) ||
null}
</div>
<Button className="btn-origin grey" onPress={onSearchDesignRequestPopOpen}>
<Button type="button" className="btn-origin grey" onPress={onSearchDesignRequestPopOpen}>
{getMessage('stuff.planReqPopup.title')}
</Button>
</div>
@ -1491,12 +1463,9 @@ export default function StuffDetail() {
onChange={onSelectionChange}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
// isClearable={sessionState?.storeLvl === '1' ? true : false}
isClearable={session?.storeLvl === '1' ? true : false}
// isDisabled={sessionState?.storeLvl !== '1' ? true : false}
isClearable={true}
isDisabled={session?.storeLvl !== '1' ? true : false}
value={saleStoreList.filter(function (option) {
// console.log('showSaleStoreList:::::', option.saleStoreId)
return option.saleStoreId === selOptions
})}
></Select>
@ -1516,7 +1485,6 @@ export default function StuffDetail() {
{/* {sessionState?.storeId !== 'T01' && sessionState?.storeLvl === '1' && ( */}
{session?.storeId !== 'T01' && session?.storeLvl === '1' && (
<>
신규 T01아닌 1차점
<div className="select-wrap mr5" style={{ width: '567px' }}>
<Select
id="long-value-select1"
@ -1528,7 +1496,7 @@ export default function StuffDetail() {
onChange={onSelectionChange}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
isClearable={session?.storeLvl === '1' ? true : false}
isClearable={false}
isDisabled={session?.storeLvl !== '1' ? true : session?.storeId !== 'T01' ? true : false}
value={showSaleStoreList.filter(function (option) {
return option.saleStoreId === selOptions
@ -1548,41 +1516,6 @@ export default function StuffDetail() {
)}
{/* {sessionState?.storeId !== 'T01' && sessionState?.storeLvl !== '1' && ( */}
{session?.storeId !== 'T01' && session?.storeLvl !== '1' && (
<>
신규 로그인이2차점
<div className="select-wrap mr5" style={{ width: '567px' }}>
<Select
id="long-value-select1"
instanceId="long-value-select1"
className="react-select-custom"
classNamePrefix="custom"
placeholder="Select"
options={saleStoreList}
onChange={onSelectionChange}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
// isClearable={sessionState?.storeLvl === '1' ? true : false}
isClearable={session?.storeLvl === '1' ? true : false}
// isDisabled={sessionState?.storeLvl !== '1' ? true : false}
isDisabled={session?.storeLvl !== '1' ? true : false}
value={saleStoreList.filter(function (option) {
return option.saleStoreId === selOptions
})}
></Select>
</div>
<div className="input-wrap" style={{ width: '216px' }}>
<input
type="text"
className="input-light"
value={form.watch('saleStoreId') || ''}
{...form.register('saleStoreId')}
readOnly
/>
</div>
</>
)}
{/* {(sessionState?.storeId === 'T01' && (
<>
<div className="select-wrap mr5" style={{ width: '567px' }}>
<Select
@ -1592,12 +1525,11 @@ export default function StuffDetail() {
classNamePrefix="custom"
placeholder="Select"
options={showSaleStoreList}
onInputChange={onInputChange}
onChange={onSelectionChange}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
isClearable={sessionState?.storeLvl === '1' ? true : false}
isDisabled={sessionState?.storeLvl !== '1' ? true : false}
isClearable={false}
isDisabled={true}
value={showSaleStoreList.filter(function (option) {
return option.saleStoreId === selOptions
})}
@ -1613,38 +1545,7 @@ export default function StuffDetail() {
/>
</div>
</>
)) || (
<>
<div className="select-wrap mr5" style={{ width: '567px' }}>
T01아님
<Select
id="long-value-select1"
instanceId="long-value-select1"
className="react-select-custom"
classNamePrefix="custom"
placeholder="Select"
options={saleStoreList}
onChange={onSelectionChange}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
isClearable={sessionState?.storeLvl === '1' ? true : false}
isDisabled={sessionState?.storeLvl !== '1' ? true : false}
value={saleStoreList.filter(function (option) {
return option.saleStoreId === selOptions
})}
></Select>
</div>
<div className="input-wrap" style={{ width: '216px' }}>
<input
type="text"
className="input-light"
value={form.watch('saleStoreId') || ''}
{...form.register('saleStoreId')}
readOnly
/>
</div>
</>
)} */}
)}
</div>
</td>
</tr>
@ -1672,10 +1573,8 @@ export default function StuffDetail() {
onChange={onSelectionChange2}
getOptionLabel={(x) => x.saleStoreName}
getOptionValue={(x) => x.saleStoreId}
// isDisabled={session?.storeLvl === '1' && form.watch('saleStoreId') != '' ? false : true}
isDisabled={session?.storeLvl === '1' && form.watch('saleStoreId') != '' && otherSaleStoreList.length > 1 ? false : true}
// isClearable={sessionState?.storeLvl === '1' ? true : false}
isClearable={session?.storeLvl === '1' ? true : false}
isDisabled={otherSaleStoreList.length > 1 ? false : true}
isClearable={true}
value={otherSaleStoreList.filter(function (option) {
return option.saleStoreId === otherSelOptions
})}

2
src/components/management/StuffSearchCondition.jsx
View File

@ -240,7 +240,7 @@ export default function StuffSearchCondition() {
schSelSaleStoreId: allList[0].saleStoreId,
})
} else {
//201X112 그냥2차점
//10X22, 201X112 그냥2차점
//2차점인데 34들고있는애 202X217
setSchSelSaleStoreList(res)
setFavoriteStoreList(res)

2
src/components/management/StuffSubHeader.jsx
View File

@ -88,7 +88,7 @@ export default function StuffSubHeader({ type }) {
<li className="title-item">
<a className="sub-header-title" onClick={moveFloorPlan}>
<span className="icon drawing"></span>
{getMessage('plan.menu.plan.drawing')}
{getMessage('stuff.temp.subTitle2')}
</a>
</li>
</ul>

1
src/locales/ja.json
View File

@ -586,6 +586,7 @@
"stuff.addressPopup.btn2": "住所適用",
"stuff.planReqPopup.title": "設計依頼のインポート",
"stuff.temp.subTitle": "商品情報",
"stuff.temp.subTitle2": "作図",
"stuff.detail.header.message1": "存在しないものです。",
"stuff.detail.header.message2": "商品番号がコピーされました。",
"stuff.detail.header.message3": "存在しないものです。",

1
src/locales/ko.json
View File

@ -592,6 +592,7 @@
"stuff.addressPopup.btn2": "주소적용",
"stuff.planReqPopup.title": "설계의뢰 불러오기",
"stuff.temp.subTitle": "물건정보",
"stuff.temp.subTitle2": "도면작성",
"stuff.detail.header.message1": "존재하지 않는 물건입니다.",
"stuff.detail.header.message2": "물건번호가 복사되었습니다.",
"stuff.detail.header.message3": "물건번호 복사에 실패했습니다.",