Merge branch 'master' into test

src/api/inspectionReport/index.js

@@ -37,8 +37,8 @@ export async function generateReport(data) {
 }  
 
 // 删除质检报告
-export async function deleteReport(data) {
-  const res = await request.delete(`/qms/quality_work_order/deleteReport`, { data });
+export async function deleteReport(id) {
+  const res = await request.delete(`/qms/quality_work_order/deleteReport/${id}`);
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/inspectionReport/index.vue

@@ -32,48 +32,15 @@
           </el-button> -->
         </template>
 
-        <template v-slot:code="{ row }">
+        <template v-slot:reportNumber="{ row }">
           <el-link
             type="primary"
             :underline="false"
             @click="openDetails(row)"
-            >{{ row.code }}</el-link
+            >{{ row.reportNumber }}</el-link
           >
         </template>
 
-        <template v-slot:sourceCode="{ row }">
-          <div>{{
-            row.qualityPlanCode ? row.qualityPlanCode : row.workOrderCode
-          }}</div>
-        </template>
-
-        <template v-slot:files="scope">
-          <el-link
-            v-for="link in scope.row.files"
-            :key="link.id"
-            type="primary"
-            :underline="false"
-            @click="downloadFile(link)"
-            >{{ link.name }}</el-link
-          >
-        </template>
-
-        <template v-slot:qualityType="{ row }">{{
-          getDictValue('质检计划类型', row.qualityType)
-        }}</template>
-        <template v-slot:qualityMode="{ row }">{{
-          getDictValue('取样类型', row.qualityMode)
-        }}</template>
-        <template v-slot:accessory="scope">
-          <el-link
-            v-for="link in scope.row.accessory"
-            :key="link.id"
-            type="primary"
-            :underline="false"
-            @click="downloadFile(link)"
-            >{{ link.name }}</el-link
-          >
-        </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -190,7 +157,7 @@
           {
             prop: 'reportNumber',
             label: '报告编码',
-            slot: 'code',
+            slot: 'reportNumber',
             align: 'center',
             width: 180,
             showOverflowTooltip: true,
@@ -463,7 +430,7 @@
         this.targetComponent = row.reportTemplateCode;
         this.currentRow = row;
         this.$nextTick(() => {
-          this.detailVisible = true;    
+          this.targetVisible = true;    
         });
       },
       openDetails(row) {
@@ -482,7 +449,7 @@
             this.$message.success('删除成功');
             this.done();
           } catch (err) {
-            this.$message.error('删除失败：' + (err.message || '操作异常'));
+            // this.$message.error('删除失败：' + (err.message || '操作异常'));
           }
       },
       downloadFile(file) {

src/views/inspectionWork/index.vue

@@ -580,6 +580,7 @@
         });
       },
       generateReportApproval(row, item) {
+        console.log('item~~~', item);
         console.log('generateReportApproval', row, item);
         this.targetComponent = item.code;
         this.isView = false;
@@ -589,6 +590,7 @@
         this.$nextTick(() => {
         //   this.$refs.targetComponentRef.open(row, isView);
           this.targetVisible = true;
+          console.log('targetVisible~~~~', this.targetVisible);
         });
       },
       openReport(row) {