Merge remote-tracking branch 'origin/master'

src/api/wms/productionlineitem/index.ts

@@ -23,7 +23,14 @@ export const getProductionlineitemPage = async (params) => {
 
 // 查询生产线物料关系列表——根据 生产线 物品类型为原料和半成品
 export const getProductionlineitemPageByItemtype = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productionlineitem/pageByItemtypeSenior', data })
+  } else {
     return await request.get({ url: `/wms/productionlineitem/pageByItemtype`, params })
+  }
+  
 }
 
 // 查询生产线物料关系详情

src/components/SearchTable/src/SearchTable.vue

@@ -87,14 +87,29 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   if (searchCondition) tableObjectRef.value.params = searchCondition;
 
   // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
+  const { getList } = tableMethods
-  setSearchParamsRef.value = setSearchParams
+  // setSearchParamsRef.value = setSearchParams
+  setSearchParamsRef.value = tableObject.params
   getListRef.value = getList
   getList()
 }
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  // console.log(99, rowRef.value)
+  // console.log(100, searchData)
+  // console.log(101, tableObjectRef.value.params)
+  
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters 
+  if (tableObjectRef.value.params) {
+    Object.keys(tableObjectRef.value.params).forEach(key => {
+      searchData.filters.push({
+        action: "==",
+        column: key,
+        value: tableObjectRef.value.params[key]
+      })
+    });
+  }
   tableObjectRef.value.params = {
     isSearch: true,
     filters: searchData.filters

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -546,6 +546,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
           key: 'locationCode',
           value: 'fromLocationCode',
           isMainValue: true
+        },{
+          key: 'inventoryStatus',
+          value: 'OK',
+          isMainValue: false
         }]
       }
     },
@@ -560,6 +564,10 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         key: 'locationCode',
         value: 'fromLocationCode',
         isMainValue: true
+      },{
+        key: 'inventoryStatus',
+        value: 'OK',
+        isMainValue: false
       }]
     },
   },