禅道bug修复

src/components/pro-tabs/bns-timeline-tabs.vue

@@ -48,7 +48,11 @@
           style="position: absolute; top: 94%; left: 80%; z-index: 999 !important; width: 250px"
         >
           <template v-if="auditTitle.includes('违章')">
-            <el-button type="warning" @click="finalInstanceBtn" v-if="finalCheck != '0' && userType != '01'">
+            <el-button
+              type="warning"
+              @click="finalInstanceBtn"
+              v-if="auditPersonArr[currentCheckIndexNew].finalJudgment == 1"
+            >
               终审
             </el-button>
           </template>
@@ -342,6 +346,7 @@ export default {
       auditRecordList: [],
       endAuditingIndex: -1,
       userType: '',
+      currentCheckIndexNew: 0,
     }
   },
   mounted() {
@@ -382,6 +387,7 @@ export default {
             this.currentCheckIndex = this.auditPersonArr.length
           }
 
+          this.currentCheckIndexNew = this.auditPersonArr.findIndex(item => item.auditStatus == 4)
           this.auditPersonArr.forEach(e => {
             if (e.isActive == 10) {
               e.isResult = true
@@ -389,6 +395,7 @@ export default {
               e.isResult = false
             }
           })
+
           console.log('this.auditPersonArr.===' + JSON.stringify(this.auditPersonArr))
           console.log('this.currentCheckIndex===' + this.currentCheckIndex)
         }

src/views/violationManagenment/violation/violationApprovalList.vue

@@ -83,7 +83,7 @@
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button>
 
-          <template v-if="userType == '01'">
+          <!-- <template v-if="userType == '01'">
             <template v-if="(scope.row.intoStatus == '1' || scope.row.intoStatus == '2') && scope.row.type != 1">
               <el-button type="text" size="mini" style="color: #f56c6c" @click="handleRectify(scope.row, 1)">
                 审批
@@ -92,16 +92,18 @@
           </template>
 
           <template v-else>
-            <el-button
-              type="text"
-              size="mini"
-              style="color: #f56c6c"
-              @click="handleRectify(scope.row, 1)"
-              v-if="scope.row.intoStatus == '1' || scope.row.intoStatus == '2'"
-            >
-              审批
-            </el-button>
-          </template>
+
+          </template> -->
+
+          <el-button
+            type="text"
+            size="mini"
+            style="color: #f56c6c"
+            @click="handleRectify(scope.row, 1)"
+            v-if="scope.row.intoStatus == '1'"
+          >
+            审批
+          </el-button>
 
           <el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)">
             审批记录
@@ -148,7 +150,7 @@ export default {
         keyWord: '', // 关键字
         violationCode: '', // 违章编号
         signerName: '', // 签发人姓名
-        status: '', // 审批状态
+        status: '1', // 审批状态
       },
       // 审批状态-下拉
       approvalStatusOpts: [
@@ -259,6 +261,7 @@ export default {
           isApprove,
           isRecord,
           active,
+          finalCheck: row.finalCheck,
         },
       })
     },