From 76ce215d1f3d957192e58fc3358eb2c6254d754f Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Mon, 26 Feb 2024 20:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/receive/receiveExamine.vue | 19 ++++--------
 .../claimAndRefund/receive/receiveManage.vue  | 30 ++++++++-----------
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index 02176472..046542fc 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -140,10 +140,10 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="refuseVisible=false">取 消</el-button>
         <el-button type="primary" @click="refuseAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定5</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定7</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定1</el-button>
-        <el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定3</el-button>
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定6</el-button>
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定8</el-button>
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定2</el-button>
+        <el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定4</el-button>
 
       </div>
     </el-dialog>
@@ -335,15 +335,8 @@ export default {
       params.leaseApplyInfoList.forEach(v => {
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
-        this.$set(v,'examineStatusId',params.examineStatusId)
-        if(params.examineStatusId=='32'){
-          if(v.companyId==101){
-            this.$set(v,'status',2)
-          }
-          if(v.companyId==102){
-            this.$set(v,'status',4)
-          }
-        }
+        this.$set(v,'examineStatusId',Number(params.examineStatusId))
+        this.$set(v,'status',type)
       })
       console.log(params)
       const res = await rejectLeaseByCompany(params)
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 98c5bb6d..18893966 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -112,28 +112,28 @@
             type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:sgb']"
-            v-if="Number(scope.row.examineStatusId)==31"
+            v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')"
           >施管审批</el-button>
           <el-button
             size="mini"
             type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:ajb']"
-            v-if="Number(scope.row.examineStatusId)==31"
+            v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='6'||scope.row.leaseApplyInfoList[0].status=='8')"
           >安监审批</el-button>
           <el-button
             size="mini"
             type="primary"
             @click="handleExamine(scope.row,'jjfgs')"
             v-hasPermi="['receive:examine:nbry-jjfgs']"
-            v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
+            v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
           >机具审批</el-button>
           <el-button
             size="mini"
             type="primary"
             @click="handleExamine(scope.row,'sbfgs')"
             v-hasPermi="['receive:examine:nbry-sbfgs']"
-            v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
+            v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')"
           >调试审批</el-button>
           <el-button
             size="mini"
@@ -328,20 +328,16 @@ export default {
       this.loading = false;
       console.log('getList ============',res)
       this.leaseAuditList = res.data.rows;
-      this.leaseAuditList.forEach((item,index)=>{
-        console.log(item.leaseApplyInfoList)
-        if(item.leaseApplyInfoList.length>0){
-          if(item.leaseApplyInfoList[0].leaseApplyDetails.length>0){
-           
-          // if(item.leaseApplyInfoList[0].companyId==101){
-            if(item.leaseApplyInfoList[0].leaseApplyDetails[0].status=="0"){
-              item.showExamineBtn = true
-            }
-          // }
-          }
-        }
+      // this.leaseAuditList.forEach((item,index)=>{
+      //   console.log(item.leaseApplyInfoList)
+      //   if(item.leaseApplyInfoList.length>0){
+      //       // item.showExamineBtn = true;
+      //       if(item.leaseApplyInfoList[0].status=="0"||item.leaseApplyInfoList[0].status=="5"||item.leaseApplyInfoList[0].status=="7"||item.leaseApplyInfoList[0].status=="8"){
+      //         item.showExamineBtn = true;
+      //       }
+      //   }
 
-      })
+      // })
       console.log(this.leaseAuditList)
       this.total = res.data.total;
     },