优化质检报告相关操作按钮显示条件，新增状态校验并调整数据合并顺序，添加调试日志

src/components/workList/wokePopup.vue

@@ -46,6 +46,7 @@
       openTwo(req) {
         this.visible = true;
         this.$nextTick(() => {
+          console.log('req', req);
           this.$refs.wokePopupListRef.openTwo(req);
         });
       },

src/views/inspectionProjectRequest/index.vue

@@ -100,7 +100,7 @@
           <el-dropdown
             trigger="click"
             v-if="
-              (!row.reportApprovalStatus || row.reportApprovalStatus == 0) &&
+              (!row.reportApprovalStatus || row.reportApprovalStatus == 0) &&row.status == 2&&
               isEmptyObject(row.reportTemplateJson) &&
               [2].includes(row.approvalStatus) &&
               pageName == 'inspectionProjectEntrusted' &&
@@ -129,7 +129,7 @@
             v-if="
               row.reportApprovalStatus &&
               row.reportApprovalStatus != 3 &&
-              !isEmptyObject(row.reportTemplateJson) &&
+              !isEmptyObject(row.reportTemplateJson) &&row.status == 2&&
               [2].includes(row.approvalStatus) &&
               pageName == 'inspectionProjectEntrusted' &&
               $hasPermission('qms:quality_work_order:generateReport')
@@ -142,7 +142,7 @@
 
           <el-link
             v-if="
-              (!row.reportApprovalStatus || row.reportApprovalStatus == 3) &&
+              (!row.reportApprovalStatus || row.reportApprovalStatus == 3) &&row.status == 2&&
               [2].includes(row.approvalStatus) &&
               pageName == 'inspectionProjectEntrusted' &&
               $hasPermission('qms:quality_work_order:qualityReportApproval')

src/views/inspectionProjectTask/index.vue

@@ -34,7 +34,7 @@
           <el-dropdown
             trigger="click"
             v-if="
-              (!row.reportApprovalStatus || row.reportApprovalStatus == 0) &&
+              (!row.reportApprovalStatus || row.reportApprovalStatus == 0) &&row.status == 2&&
               isEmptyObject(row.reportTemplateJson) &&
               $hasPermission('qms:quality_work_order:generateReport')
             "
@@ -61,7 +61,7 @@
             v-if="
               row.reportApprovalStatus &&
               row.reportApprovalStatus != 3 &&
-              !isEmptyObject(row.reportTemplateJson) &&
+              !isEmptyObject(row.reportTemplateJson) &&row.status == 2&&
               $hasPermission('qms:quality_work_order:generateReport')
             "
             type="primary"
@@ -72,7 +72,7 @@
 
           <el-link
             v-if="
-              (!row.reportApprovalStatus || row.reportApprovalStatus == 3) &&
+              (!row.reportApprovalStatus || row.reportApprovalStatus == 3) &&row.status == 2&&
               $hasPermission('qms:quality_work_order:qualityReportApproval')
             "
             type="primary"

src/views/inspectionWork/components/inspectionProjectReport.vue

@@ -816,7 +816,7 @@
           this.title = '质检项受托单';
         }
         if (type == 'report') {
-          let data = { ...workData, ...row };
+          let data = {  ...row,...workData };
           data.sampleQuantity = row.sampleQuantity || data.remainingSampleCount;
           data.sampleNoQualifiedNumber = row.sampleNoQualifiedNumber || 0;
           data.sampleQualifiedNumber =