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

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -254,6 +254,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
   if(item.field == 'itemCode') {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
+      {
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },
       {
         key: 'businessType',
         value: businessType.value ,
@@ -268,6 +274,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
      ]
     } else if (fromInventoryStatus.value == null) {
       item.tableForm.searchCondition = [
+      {
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },
       {
         key: 'businessType',
         value: businessType.value ,

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -527,6 +527,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
+      searchCondition: [{
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请填写生产线代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }],
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -537,6 +547,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
+        searchCondition: [{
+          key:'fromWarehouseCode',
+          value:'fromWarehouseCode',
+          message: '请填写生产线代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
       }
     }
   },