报工bug

src/views/produceOrder/components/report/Common.vue

@@ -38,9 +38,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -150,7 +154,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -238,7 +243,7 @@
           qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',

src/views/produceOrder/components/report/Drying.vue

@@ -39,9 +39,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -163,7 +167,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -257,7 +262,7 @@
           qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',

src/views/produceOrder/components/report/Extrusion.vue

@@ -34,9 +34,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -162,7 +166,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -305,7 +310,7 @@
           qualityStandard: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',
@@ -359,6 +364,26 @@
             this.getReportCount();
           }
         }
+      },
+      infoData: {
+        immediate: true,
+        handler () {
+          if (this.infoData.id) {
+            // 设备
+            this.workReportDeviceList = Object.assign(
+              {},
+              this.workReportDeviceList,
+              {
+                code: this.infoData.deviceCode,
+                name: this.infoData.deviceName
+                // path: this.infoData.,
+                // model: this.infoData.,
+                // rootCategoryLevelId: this.infoData.,
+                // specification: this.infoData.
+              }
+            );
+          }
+        }
       }
     },
     created () {
@@ -390,7 +415,7 @@
 
           realTimeStorage({
             categoryCode: res.categoryCode,
-            factoryCode: this.infoData.werks || '14T1'
+            factoryCode: this.infoData.werks
           }).then((res) => {
             this.batchList = res;
           });

src/views/produceOrder/components/report/Furnace.vue

@@ -28,9 +28,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -115,7 +119,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           productInfo: {
             standardNum: '',
             standardWeight: '',

src/views/produceOrder/components/report/HalfAdded.vue

@@ -38,9 +38,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -162,7 +166,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -252,7 +257,7 @@
           qualityItem: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',

src/views/produceOrder/components/report/Heating.vue

@@ -38,9 +38,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -162,7 +166,8 @@
             :controls="false"
             :value="
               (workReport.productInfo.noStandardWeight =
-                workReport.noStandardNum * (infoData.productUnitWeight || 1))
+                workReport.productInfo.noStandardNum *
+                (infoData.productUnitWeight || 1))
             "
             :min="0"
             clearable
@@ -258,7 +263,7 @@
           qualityStandard: '',
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           remark: '',
           productInfo: {
             standardNum: '',

src/views/produceOrder/components/report/Package.vue

@@ -37,9 +37,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -234,7 +238,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           packInfo: {
             packUnit: '',
             minPackNum: '',

src/views/produceOrder/components/report/Sinter.vue

@@ -101,7 +101,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: '',
+          executeTime: '',
           packInfo: {
             packNum: '',
             netWeight: ''

src/views/produceOrder/components/report/Warehousing.vue

@@ -31,9 +31,13 @@
               (val, item) => (workReport.executorJobNum = item.jobNumber)
             "
         /></el-form-item>
-        <el-form-item label="执行日期" prop="executorTime" label-width="100px"
+        <el-form-item
+          label="执行日期"
+          required
+          prop="executeTime"
+          label-width="100px"
           ><el-date-picker
-            v-model="workReport.executorTime"
+            v-model="workReport.executeTime"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -133,7 +137,7 @@
         workReport: {
           executorId: '',
           executorJobNum: '',
-          executorTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
+          executeTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm'),
           storageInfo: {
             batchNum: '',
             inStorageNum: '',