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

src/api/wms/balance/index.ts

@@ -94,5 +94,11 @@ export const importTemplate = () => {
 
 // 获得库位代码筛选出的库存余额分页
 export const selectLocationTypeToBalance = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/pageLocationCodeToBalanceSenior', data })
+  } else {
     return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params})
+  }
 }

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -55,6 +55,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    :isShowButton = isShowButton
   />
 
   <!-- 详情 -->
@@ -113,8 +114,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV[formField] = val[0][searchField]      
       if(formField == 'deliverPlanNumber') {
         setV['deliverPlanNumber'] = val[0]['number']
-        setV['customerCode'] = val[0]['customerCode']
+        if(setV['deliverPlanNumber'] != null){
           isShowButton.value = false
+        }
+        setV['customerCode'] = val[0]['customerCode']
         // 获取子表数据 getBomDisassemble
         DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
         .then(res => {
@@ -293,12 +296,16 @@ const openForm =async (type: string, row?: number) => {
   if(type == "update"){
     DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'deliverPlanNumber') {
-              item.componentProps.isSearchList = false
+              item.componentProps.isSearchList = false,
+              item.componentProps.disabled = true
             }
           })       
   }else {
-    item.componentProps.isSearchList = true,
+    DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
-    item.componentProps.disabled = true
+      if (item.field == 'deliverPlanNumber') {
+        item.componentProps.isSearchList = true
+      }
+    })  
   }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)

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

@@ -700,7 +700,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库存状态',
+    label: '从库存状态',
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
@@ -710,6 +710,17 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '到库存状态',
+    field: 'toInventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '订单号',
     field: 'poNumber',

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

@@ -275,6 +275,20 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['fromBatch'] = val[0]['batch']
       setV['fromInventoryStatus'] = val[0]['inventoryStatus']
       setV['fromLocationCode'] = val[0]['locationCode']
+      setV['uom'] = val[0]['uom']
+      if(routeName.value == 'OktoholdRequestMain'){
+          row['toInventoryStatus'] = "HOLD"
+        }else if ( routeName.value == 'HoldtookRequestMain') {
+          row['toInventoryStatus'] = "OK"
+        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+          row['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'OktoscrapRequestMain') {
+          row['toInventoryStatus'] = "SCRAP"
+        }else if ( routeName.value == 'ScraptoholdRequestMain') {
+          row['toInventoryStatus'] = "HOLD"
+        }else{
+          row['toInventoryStatus'] = null
+        }
     } else {
       setV[formField] = val[0][searchField]
     }

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

@@ -465,6 +465,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -506,6 +511,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -574,6 +584,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -618,6 +633,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -629,6 +649,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -683,6 +708,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     tableForm: {
       disabled: true,
       type: 'Select'
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {