bug修复

src/views/produce/components/prenatalExamination/materialModal.vue

@@ -74,12 +74,6 @@
             columnKey: 'index',
             align: 'center'
           },
-          {
-            label: '批次号',
-            prop: 'batchNo',
-            minWidth: 120
-          },
-
           {
             label: '领料类型',
             prop: 'categoryLevelNamePath',

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -193,12 +193,12 @@
     </el-form>
 
     <header-title
-      v-if="addForm.reportWorkType == '2'"
+      v-if="addForm.reportWorkType == '2' && addForm.produceTaskId"
       title="物料清单"
     ></header-title>
 
     <ele-pro-table
-      v-if="addForm.reportWorkType == '2'"
+      v-if="addForm.reportWorkType == '2' && addForm.produceTaskId"
       ref="table"
       row-key="id"
       :columns="materialColumns"
@@ -253,7 +253,9 @@
 
     <header-title
       title="检查项目"
-      :style="`margin-top: ${addForm.reportWorkType == '2' ? '20px' : '0px'}`"
+      :style="`margin-top: ${
+        addForm.reportWorkType == '2' && addForm.produceTaskId ? '20px' : '0px'
+      }`"
     ></header-title>
 
     <el-tabs
@@ -596,11 +598,6 @@
             columnKey: 'index',
             align: 'center'
           },
-          {
-            label: '批次号',
-            prop: 'batchNo',
-            minWidth: 120
-          },
           {
             label: '领料类型',
             prop: 'categoryLevelNamePath',
@@ -921,12 +918,12 @@
       },
       // 物料信息查询
       async getListByWorkOrderId() {
+        if (!this.productionInfo.produceTaskId) return;
         // 查询物料信息
         const materialList = await queryListByWorkOrderId({
           workOrderId: this.addForm.workOrderId,
           recordId: this.productionInfo.recordId,
-          produceTaskInstanceId:
-            this.workOrderInfo.taskId || this.productionInfo.produceTaskId,
+          produceTaskId: this.productionInfo.produceTaskId,
           ruleId: this.addForm.ruleId
         });