修改bug

src/views/produce/components/footBtn.vue

@@ -286,7 +286,7 @@
             name: '首件两检',
             type: 'qualityInspection',
             bjColor: '#920077',
-            isShow: 'mes:firstarticledualinspection'
+            isShow: 'mes:taskorder:inspection'
           },
           // {
           //   name: '首件两检',
@@ -298,7 +298,7 @@
             name: '报工',
             type: 'job',
             bjColor: '#157A2C',
-            isShow: 'mes:workreport:save'
+            isShow: 'mes:taskreport:save'
           },
 
           // {
@@ -451,6 +451,9 @@
       },
 
       updateBtnList(v) {
+        console.log(this.activeName, 'this.activeName');
+        console.log(v, 'vvvv');
+        console.log(this.$hasPermission('mes:workreport:save'));
         if (this.activeName == '0') {
           if (v == '2' || v == '3' || v == '6') {
             let btnList2 = this.btnList2.filter((item) => {

src/views/taskList/index.vue

@@ -66,6 +66,33 @@
           <el-tag v-if="row.disposalStatus == 2" type="danger">已拒绝</el-tag>
         </template>
 
+        <template v-slot:totalFirstArticleDualInspectionStatus="{ row }">
+          <el-tag
+            v-if="
+              row.hasFirstArticleDualInspection == 1 &&
+              row.totalFirstArticleDualInspectionStatus == 0
+            "
+            type="success"
+            >待自检</el-tag
+          >
+          <el-tag
+            v-if="
+              row.hasFirstArticleDualInspection == 1 &&
+              row.totalFirstArticleDualInspectionStatus == 1
+            "
+            type="success"
+            >待专检</el-tag
+          >
+          <el-tag
+            v-if="
+              row.hasFirstArticleDualInspection == 1 &&
+              row.totalFirstArticleDualInspectionStatus == 2
+            "
+            type="success"
+            >已完成</el-tag
+          >
+        </template>
+
         <template v-slot:action="{ row }">
           <el-link
             v-if="tabValue == '2' && row.disposalStatus == '2'"
@@ -287,6 +314,7 @@
         // isInspection: '0'
       };
     },
+
     computed: {
       // 表格列配置
       columns() {
@@ -514,6 +542,13 @@
             slot: 'disposalStatus',
             width: 120
           },
+          {
+            prop: 'totalFirstArticleDualInspectionStatus',
+            label: '首件两检状态',
+            align: 'center',
+            slot: 'totalFirstArticleDualInspectionStatus',
+            width: 120
+          },
           {
             prop: 'customerName',
             label: '客户名称',