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

src/views/wms/basicDataManage/orderManage/shift/index.vue

@@ -165,12 +165,23 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+      var isHave =Shift.allSchemas.formSchema.some(function (item) {
+        return item.field === 'beginTime' || item.field === 'entTime';
+      });
+      if(isHave){
+        if(data.beginTime && data.entTime && data.beginTime >=data.entTime){
+          message.error('开始时间要大于结束时间')
+          return;
+        }
+      }
+      if(data.beginTime==0)data.beginTime = null;
+      if(data.entTime==0)data.entTime = null;
       var isHave =Shift.allSchemas.formSchema.some(function (item) {
         return item.field === 'activeTime' || item.field === 'expireTime';
       });
       if(isHave){
         if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-          message.error('失效时间要大于生效时间')
+          message.error('生效时间要大于失效时间')
           return;
         }
       }

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -127,7 +127,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       if(formField == 'packingNumber') {
         row['packingNumber'] = val[0]['packingNumber']
-        row['poLine'] = val[0]['packingNumber']
         row['containerNumber'] = val[0]['containerNumber']
         row['batch'] = val[0]['batch']
         row['inventoryStatus'] = val[0]['inventoryStatus']

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

@@ -174,26 +174,50 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
         key: 'businessType',
         value: businessType.value ,
         isMainValue: false
-      }]
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
       item.form.componentProps.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value,
         isMainValue: false
-      }]
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
     } else if (fromInventoryStatus.value == null) {
       item.tableForm.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value ,
         isMainValue: false
-      }]
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
       item.form.componentProps.searchCondition = [
       {
         key: 'businessType',
         value: businessType.value,
         isMainValue: false
-      }]
+      },
+      {
+          key: 'fromWarehouseCode',
+          value: 'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        }]
     } else {
       delete item.tableForm.searchCondition
     }

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

@@ -549,17 +549,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
-      searchCondition: [
-        {
-          key: 'warehouseCode',
-          value: 'fromWarehouseCode',
-          message: '请填写从仓库代码！',
-          isMainValue: true
-        },{
-        key: 'locationCode',
-        value: 'businessType',
-        isMainValue: true
-      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -570,17 +559,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
-        searchCondition: [{
-          key: 'warehouseCode',
-          value: 'fromWarehouseCode',
-          message: '请填写从仓库代码！',
-          isMainValue: true
-        },
-        {
-          key: 'locationCode',
-          value: 'businessType',
-          isMainValue: true
-        }]
       }
     }
   },