From 7942e4a93dac8a46e968353aad0ab4dce640096b Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Thu, 22 Feb 2024 13:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=86=85=E9=83=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/router/index.js                   |  2 +-
 .../claimAndRefund/receive/receiveExamine.vue |  7 ++--
 .../claimAndRefund/receive/receiveManage.vue  | 37 +++++++++++--------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js
index 14b05487..71907b69 100644
--- a/sgzb-ui/src/router/index.js
+++ b/sgzb-ui/src/router/index.js
@@ -43,7 +43,7 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    component: () => import('@/views/loginSso'),
+    component: () => import('@/views/login'),
     hidden: true
   },
   {
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index b63ae302..1a11b6f2 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -267,9 +267,10 @@ export default {
     //审核  同意
     async subAuditLeaseByCompany(){
       const params = JSON.parse(JSON.stringify(this.queryParams))
-      if(params.taskStatus<32){
-         params.taskStatus = params.taskStatus+1
-      }
+      // if(params.taskStatus<32){
+        // params.taskStatus = params.taskStatus+1
+      // }
+      params.taskStatus = params.taskStatus+1
       params.leaseApplyInfoList.forEach(v => {
         this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
         this.$set(v,'companyAuditBy',this.user.id)
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
index 513ce113..e662c3e6 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
@@ -81,7 +81,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" />wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww -->
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
       <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
@@ -97,41 +97,36 @@
       <el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
-            size="mini" 
-            icon="el-icon-zoom-in"
+            size="mini"
             @click="handleView(scope.row)"
           >查看</el-button>
           <el-button
             size="mini"
-            type="primary" 
-            icon="el-icon-edit"
+            type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:fgs']"
             v-if="Number(scope.row.examineStatusId)==30"
           >审批</el-button>
           <el-button
             size="mini"
-            type="primary" 
-            icon="el-icon-edit"
+            type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:fgy']"
             v-if="Number(scope.row.examineStatusId)==31"
           >审批</el-button>
           <el-button
             size="mini"
-            type="primary" 
-            icon="el-icon-edit"
+            type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:nbry-jjfgs']"
-            v-if="Number(scope.row.examineStatusId)==32"
+            v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
           >机具审批</el-button>
           <el-button
             size="mini"
-            type="primary" 
-            icon="el-icon-edit"
+            type="primary"
             @click="handleExamine(scope.row)"
             v-hasPermi="['receive:examine:nbry-sbfgs']"
-            v-if="Number(scope.row.examineStatusId)==32"
+            v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
           >调试审批</el-button>
           <el-button
             size="mini"
@@ -259,7 +254,8 @@ export default {
       unitList:[],
       proList: [],
       leaseAuditList:[],
-
+      showJJExamineBtn:false, //内部审批-机具分公司
+      showSBExamineBtn:false, //内部审批-调试分公司
       // 表单参数
       form: {},
       // 表单校验
@@ -326,9 +322,20 @@ export default {
       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
+            }
+          // }
+          }
+        }
 
       })
+      console.log(this.leaseAuditList)
       this.total = res.data.total;
     },