diff --git a/src/pages/Setting/Users/components/edit.tsx b/src/pages/Setting/Users/components/edit.tsx index 5c95283..2e70ff8 100644 --- a/src/pages/Setting/Users/components/edit.tsx +++ b/src/pages/Setting/Users/components/edit.tsx @@ -144,8 +144,8 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab, const { data: supplierList } = useRequest(async () => { const req = { searchParameter: { - OWNERUNIT_ID: currentUser?.OwnerUnitId, - PROVINCE_CODE: currentUser?.ProvinceCode, + OWNERUNIT_ID: 911, + PROVINCE_CODE: 530000, MERCHANTS_TYPE: "" }, PageIndex: 1, @@ -769,7 +769,7 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab, return data } if (params.USER_PROVINCE || params.USER_PATTERN) { const req: any = { - ProvinceCode: '530000', + // ProvinceCode: '530000', UserTypePattern: tableTab === 9000 ? 1000 : tableTab } const data = await getUserTypeTree(req) diff --git a/src/pages/travelMember/ProductListingManagement/index.tsx b/src/pages/travelMember/ProductListingManagement/index.tsx index 6cdde20..6a4fe59 100644 --- a/src/pages/travelMember/ProductListingManagement/index.tsx +++ b/src/pages/travelMember/ProductListingManagement/index.tsx @@ -522,7 +522,45 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop setDetailImgList([]) actionRef.current?.reload() - handlecsyncWeChatGetMallGoodsInfo({ appId: 'wxee018fb96955552a', userdefinedTypeId: currentRow?.USERDEFINEDTYPE_ID }) + let USERDEFINEDTYPEList: any = session.get('USERDEFINEDTYPEList') + let list: any = [] + if (USERDEFINEDTYPEList && USERDEFINEDTYPEList.length > 0) { + list = USERDEFINEDTYPEList + } else { + const req = { + OWNERUNIT_ID: currentUser?.OwnerUnitId, + PROVINCE_CODE: "", + GOODSTYPE: 4000, + USERDEFINEDTYPE_STATE: 1 + } + const data = await handlGetUSERDEFINEDTYPEList(req); + session.set("USERDEFINEDTYPEList", data) + list = data + } + let resPid: any = '' + if (list && list.length > 0) { + let obj: any = {} + list.forEach((item: any) => { + let childrenTypeList: any = [] + if (item.children && item.children.length > 0) [ + item.children.forEach((subItem: any) => { + childrenTypeList.push(subItem.USERDEFINEDTYPE_ID) + }) + ] + obj[item.USERDEFINEDTYPE_ID] = childrenTypeList + }) + console.log('objobjobjobj', obj); + + for (let key in obj) { + if (obj[key].indexOf(Number(currentRow?.USERDEFINEDTYPE_ID)) !== -1) { + resPid = key + } + } + } + + console.log('resPidresPidresPidresPid', resPid); + + handlecsyncWeChatGetMallGoodsInfo({ appId: 'wxee018fb96955552a', userdefinedTypeId: resPid }) } }; @@ -642,7 +680,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop console.log('resPidresPidresPidresPid', resPid); - handlecsyncWeChatGetMallGoodsInfo({ appId: 'wxee018fb96955552a', userdefinedTypeId: data.Result_Data?.USERDEFINEDTYPE_ID }) + handlecsyncWeChatGetMallGoodsInfo({ appId: 'wxee018fb96955552a', userdefinedTypeId: resPid }) } else { message.error(data.Result_Desc) }