Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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

@@ -603,7 +603,26 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       }]
     },
   },
-  
+  {
+    label: '原料库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isDetail:false,
+    isTable:false,
+    isTableForm: false,
+    isForm: false,
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -621,12 +640,12 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
         searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
         searchCondition:[
-        //   {
+          {
-        //   key: 'locationCode',
+          key: 'locationCode',
-        //   value: 'fromLocationCode',
+          value: 'fromLocationCode',
-        //   message: '请填写从库位代码！',
+          message: '请填写原料库位！',
-        //   isMainValue: true
+          isMainValue: true
-        // },
+        },
         {
           key: 'inventoryStatus',
           value: 'OK',
@@ -642,21 +661,20 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
       searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法
       searchCondition:[
-      //   {
+        {
-      //   key: 'locationCode',
+        key: 'locationCode',
-      //   value: 'fromLocationCode',
+        value: 'fromLocationCode',
-      //   message: '请填写从库位代码！',
+        message: '请填写从库位代码！',
-      //   isMainValue: true
+        isMainValue: true
-      // },
+      },
       {
         key: 'inventoryStatus',
         value: 'OK',
         isMainValue: false
       },{
-          key: 'productionLineCode',
+          key: 'businessType',
-          value: 'productionLineCode',
+          value: 'ReturnToStore', // 合格退料
-          message: '请选择生产线信息！',
+          isMainValue: false
-          isMainValue: true
         }]
     },
   },