Merge remote-tracking branch 'origin/master'

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -106,7 +106,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        row['itemCode'] = val[0]['componentItemCode']
+      } else {
+        row[formField] = val[0][searchField]
+      }
       row['toLocationCode'] = val[0]['rawLocationCode']
     } else {
       const setV = {}

src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@@ -377,6 +377,9 @@ export const ProductputawayRequestMainRules = reactive({
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
 })
 
 /**

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -125,7 +125,6 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
-import * as PurchaseDetailApi from "@/api/wms/purchaseDetail";
 
 // 制品收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })