修改bug

src/views/batchRecord/components/tables/qualityWorkOrderTable.vue

@@ -186,12 +186,12 @@
             label: '产品报检单',
             code: 'CG-038'
           },
-          { key: 'samplingForm', label: '取样单', code: 'ZL-041' },
-          {
-            key: 'finishedProductOriginalRecord',
-            label: '成品检验原始记录',
-            code: '054-7'
-          }
+          { key: 'samplingForm', label: '取样单', code: 'ZL-041' }
+          // {
+          //   key: 'finishedProductOriginalRecord',
+          //   label: '成品检验原始记录',
+          //   code: '054-7'
+          // }
         ]
       };
     },
@@ -318,10 +318,7 @@
         }
 
         const data = list.map((item, index) => {
-          const selected = this.getSelectedItem(
-            item.basicInfo || item,
-            index
-          );
+          const selected = this.getSelectedItem(item.basicInfo || item, index);
           return key == 'samplingForm'
             ? this.buildSamplingFormData(item, selected)
             : this.buildFinishedProductRecordData(item, selected);
@@ -458,10 +455,7 @@
             selected.productModel
           ),
           packageSpec: basicInfo.packageSpec || '',
-          batchNo: this.getValue(
-            basicInfo.produceBatch,
-            selected.batchNo
-          ),
+          batchNo: this.getValue(basicInfo.produceBatch, selected.batchNo),
           sterilizationBatchNo: basicInfo.sterilizationBatch || '',
           submitQuantity: this.getValue(
             basicInfo.productQuantity,
@@ -494,10 +488,7 @@
             selected.qualityName,
             selected.createUserName
           ),
-          checker: this.getValue(
-            selected.checkerName,
-            selected.reviewerName
-          ),
+          checker: this.getValue(selected.checkerName, selected.reviewerName),
           remark: selected.remark || ''
         };
       },

src/views/batchRecord/components/tables/workOrderTable.vue

@@ -219,12 +219,12 @@
             code: 'SC-041',
             component: 'materialBalance'
           },
-          {
-            key: 'productReleaseApproval',
-            label: '成品放行审批单',
-            code: 'ZL-065',
-            component: 'productReleaseApproval'
-          }
+          // {
+          //   key: 'productReleaseApproval',
+          //   label: '成品放行审批单',
+          //   code: 'ZL-065',
+          //   component: 'productReleaseApproval'
+          // }
         ]
       };
     },

src/views/produce/components/routings.vue

@@ -146,6 +146,7 @@
         } else {
           this.desIndex = index;
           this.newId = this.curTaskObj.taskId;
+          this.sourceTaskId = this.curTaskObj.sourceTaskId || '';
           this.$refs.pickListRef.getList([this.routeObj.id]);
         }
       }

src/views/produce/components/workOrderHandover/index.vue

@@ -207,7 +207,6 @@
               label="交接数量"
               prop="handoverQuantity"
               class="form_item"
-              required
             >
               <el-input
                 v-model="handoverForm.handoverQuantity"
@@ -223,7 +222,6 @@
               label="交接重量"
               prop="handoverWeight"
               class="form_item"
-              required
             >
               <el-input
                 v-model="handoverForm.handoverWeight"
@@ -362,10 +360,10 @@
             { required: true, message: '请选择交接人', trigger: 'change' }
           ],
           handoverQuantity: [
-            { required: true, message: '请选择交接数量', trigger: 'change' }
+            { required: true, message: '请输入交接数量', trigger: 'change' }
           ],
           handoverWeight: [
-            { required: true, message: '请选择交接重量', trigger: 'change' }
+            { required: true, message: '请输入交接重量', trigger: 'change' }
           ]
         },
         teamList: [],
@@ -584,33 +582,35 @@
 
       submitHandover(isRelease) {
         if (this.submitHandoverLoading) return;
-        const param = {
-          ...this.handoverForm,
-          ...this.workOrderInfo,
-          detailList: this.getSafeDetailList(),
-          isRelease,
-          categoryCode: this.workOrderInfo.productCode,
-          categoryName: this.workOrderInfo.productName,
-          initiateId: this.$store.state.user.info.id,
-          initiateName: this.$store.state.user.info.name,
-          initiateTaskId: this.workOrderInfo.currentTaskDiagram.taskId,
-          initiateTaskName: this.workOrderInfo.currentTaskDiagram.taskTypeName,
-          workOrderId: this.workOrderInfo.id,
-          workOrderCode: this.workOrderInfo.code
-        };
-
-        // return;
+        this.$refs.handoverForm.validate((valid) => {
+          if (!valid) return;
+          const param = {
+            ...this.handoverForm,
+            ...this.workOrderInfo,
+            detailList: this.getSafeDetailList(),
+            isRelease,
+            categoryCode: this.workOrderInfo.productCode,
+            categoryName: this.workOrderInfo.productName,
+            initiateId: this.$store.state.user.info.id,
+            initiateName: this.$store.state.user.info.name,
+            initiateTaskId: this.workOrderInfo.currentTaskDiagram.taskId,
+            initiateTaskName: this.workOrderInfo.currentTaskDiagram.taskTypeName,
+            workOrderId: this.workOrderInfo.id,
+            workOrderCode: this.workOrderInfo.code
+          };
 
-        this.submitHandoverLoading = true;
-        this.submitHandoverAction = isRelease;
-        saveHandover(param)
-          .then((res) => {
-            this.$message.success(isRelease === 1 ? '提交成功' : '保存成功');
-          })
-          .finally(() => {
-            this.submitHandoverLoading = false;
-            this.submitHandoverAction = null;
-          });
+          this.submitHandoverLoading = true;
+          this.submitHandoverAction = isRelease;
+          saveHandover(param)
+            .then((res) => {
+              this.$message.success(isRelease === 1 ? '提交成功' : '保存成功');
+              this.$emit('success', res);
+            })
+            .finally(() => {
+              this.submitHandoverLoading = false;
+              this.submitHandoverAction = null;
+            });
+        });
       },
       onCancel() {
         this.$emit('cancel');

src/views/produce/index.vue

@@ -218,6 +218,7 @@
                     :workData="workData"
                     ref="workOrderHandoverRef"
                     @cancel="closeWorkOrderHandover"
+                    @success="workOrderHandoverSuccess"
                   ></workOrderHandover>
                 </div>
 
@@ -1955,6 +1956,11 @@
         this.workOrderDetailPreviewSuppressed = false;
       },
 
+      workOrderHandoverSuccess() {
+        this.closeWorkOrderHandover();
+        this.successTask();
+      },
+
       successTask() {
         this.isFinalCheckProduction = false;
         this.$nextTick(() => {

src/views/produceOrder/workReport.vue

@@ -155,6 +155,7 @@
                         :workData="workOrderInfo"
                         ref="workOrderHandoverRef"
                         @cancel="closeWorkOrderHandover"
+                        @success="workOrderHandoverSuccess"
                       ></workOrderHandover>
                     </div>
 
@@ -1410,6 +1411,12 @@
         this.operationType = null;
       },
 
+      async workOrderHandoverSuccess() {
+        this.closeWorkOrderHandover();
+        await this.getOrderData();
+        await this.getTaskFn();
+      },
+
       refreshPlease() {
         this.$nextTick(() => {
           this.$refs.outsourcingListRef.getPleaseData(

src/views/workOrderHandover/components/edit.vue

@@ -202,7 +202,6 @@
                 label="交接数量"
                 prop="handoverQuantity"
                 class="form_item"
-                required
               >
                 <el-input
                   v-model="workOrderInfo.handoverQuantity"
@@ -222,7 +221,6 @@
                 label="交接重量"
                 prop="handoverWeight"
                 class="form_item"
-                required
               >
                 <el-input
                   v-model="workOrderInfo.handoverWeight"
@@ -421,10 +419,10 @@
             { required: true, message: '请选择交接人', trigger: 'change' }
           ],
           handoverQuantity: [
-            { required: true, message: '请选择交接数量', trigger: 'change' }
+            { required: true, message: '请输入交接数量', trigger: 'change' }
           ],
           handoverWeight: [
-            { required: true, message: '请选择交接重量', trigger: 'change' }
+            { required: true, message: '请输入交接重量', trigger: 'change' }
           ]
         },
         teamList: [],
@@ -515,7 +513,7 @@
             minWidth: 110
           },
           {
-            prop: 'categoryLevelPath',
+            prop: 'categoryLevelName',
             label: '分类',
             align: 'center',
             showOverflowTooltip: true
@@ -539,7 +537,7 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'measureUnit',
+            prop: 'measuringUnit',
             label: '计量单位',
             showOverflowTooltip: true,
             minWidth: 90

src/views/workOrderHandover/index.vue

@@ -125,7 +125,7 @@
   const EDITABLE_STATUS_LIST = [STATUS.DRAFT, STATUS.REJECTED];
 
   const HANDOVER_TYPE_MAP = {
-    1: '班组移交',
+    1: '物品移交',
     2: '班次交接'
   };
 
@@ -146,8 +146,8 @@
         editDetail: false,
         selection: [],
         handoverTypeOptions: [
-          { label: '班组移交', value: 1 },
-          { label: '班次交接', value: 2 }
+          { label: '物品移交', value: 1 }
+          // { label: '班次交接', value: 2 }
         ],
         stutasTypeOptions: [
           { label: '待提交', value: 0 },
@@ -349,10 +349,12 @@
           },
           {
             label: '交接时间：',
-            value: 'planType',
+            value: 'initiateTime',
             type: 'date',
             dateType: 'daterange',
-            placeholder: ''
+            placeholder: '',
+            valueFormat: 'yyyy-MM-dd',
+            valueAr: ['initiateTimeStart', 'initiateTimeEnd']
           }
         ];
       }