diff --git a/src/hooks/useTable.ts b/src/hooks/useTable.ts index cd066cb..97bb238 100644 --- a/src/hooks/useTable.ts +++ b/src/hooks/useTable.ts @@ -64,9 +64,18 @@ export const useTable = ( } } if (routeName === "foundationSetWarehouse") { + //组织 if (Array.isArray(state.totalParam?.use_org_number) && state.totalParam?.use_org_number?.length) { state.totalParam.use_org_number = state.totalParam.use_org_number.join(","); } + //金蝶仓库 + if (Array.isArray(state.totalParam?.kd_warehouse_number) && state.totalParam?.kd_warehouse_number?.length) { + state.totalParam.kd_warehouse_number = state.totalParam.kd_warehouse_number.join(","); + } + //金蝶子仓库 + if (Array.isArray(state.totalParam?.kd_subwarehouse) && state.totalParam?.kd_subwarehouse?.length) { + state.totalParam.kd_subwarehouse = state.totalParam.kd_subwarehouse.join(","); + } } }; diff --git a/src/views/foundation/set/warehouse/index.vue b/src/views/foundation/set/warehouse/index.vue index 6f56f1b..e25e208 100644 --- a/src/views/foundation/set/warehouse/index.vue +++ b/src/views/foundation/set/warehouse/index.vue @@ -348,7 +348,7 @@ const handleOrgTagRemove = (remainingOrgValues: any[]) => { // 3. 重置仓库状态(清空已选+更新选项) dataStore.initParam.kd_warehouse_number = ""; - dataStore.formData[1].value = []; + dataStore.formData[1].options = []; dataStore.formData[1].options = filteredWarehouses; // 4. 重置子仓库状态(仓库变化后必须清空) @@ -360,7 +360,7 @@ const handleOrgTagRemove = (remainingOrgValues: any[]) => { * 金蝶仓库标签关闭处理(联动子仓库) * @param remainingWarehouseValues 关闭后剩余的仓库value数组(如:["AD"]、["AD","CK001"]) */ -const handleKdWarehouseTagRemove = (remainingWarehouseValues: string[]) => { +const handleKdWarehouseTagRemove = (remainingWarehouseValues: any[]) => { // 2. 筛选子仓库:基于原始金蝶子仓库数据,聚合所有剩余仓库对应的子仓库 let filteredSubWarehouses = []; if (remainingWarehouseValues.length > 0) { @@ -374,7 +374,7 @@ const handleKdWarehouseTagRemove = (remainingWarehouseValues: string[]) => { // 3. 重置子仓库状态(清空已选+更新选项) dataStore.initParam.kd_subwarehouse = ""; - dataStore.formData[2].value = []; + dataStore.formData[2].options = []; dataStore.formData[2].options = filteredSubWarehouses; }; @@ -382,9 +382,9 @@ const handleKdWarehouseTagRemove = (remainingWarehouseValues: string[]) => { * 金蝶子仓库标签关闭处理(仅更新自身,不联动上级) * @param remainingSubWarehouseValues 关闭后剩余的子仓库value数组 */ -const handleKdSubWarehouseTagRemove = (remainingSubWarehouseValues: string[]) => { +const handleKdSubWarehouseTagRemove = (remainingSubWarehouseValues: any[]) => { // 同步表单已选值 - dataStore.formData[2].value = remainingSubWarehouseValues; + dataStore.formData[2].options = remainingSubWarehouseValues; }; // //监听弹窗开启 watch(