From 8dc56bcde98b6630ebb35abbe7b3ade9c139b967 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Sat, 20 Apr 2024 14:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A2=86=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receive/receiveApplyAdd.vue               |  2 +-
 .../claimAndRefund/receive/receiveExamine.vue |  6 +--
 .../receiveByCq/receiveApply.vue              |  2 +-
 .../receiveByCq/receiveApplyAddByCq.vue       |  6 ++-
 .../receiveByCq/receiveExamineByCq.vue        | 42 ++++++++++---------
 .../receiveByCq/receiveManage.vue             |  4 +-
 .../claimAndRefund/return/returnApplyAdd.vue  | 14 ++++++-
 .../return/returnApplyAddByCq.vue             | 15 ++++++-
 .../claimAndRefund/return/returnInDetail.vue  |  2 +-
 .../cost/csotSettlement/costApplyAdd.vue      |  2 +-
 sgzb-ui/src/views/monitor/job/log.vue         |  2 +-
 .../newBuy/newDevices/newDevicesCode.vue      |  2 +-
 sgzb-ui/src/views/store/newBuy/planAdd.vue    |  2 +-
 13 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index 47af551d..13954c3b 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -327,7 +327,7 @@ export default {
       },
     }
   },
-  created() {
+  mounted() {
     this.GetUserInfo()
 
     this.GetUnitData()
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
index 11c14d42..00efea36 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="app-container" id="receiveExamine">
+    <div class="app-container" id="ReceiveExamine">
         <el-row :gutter="10" class="mb8">
             <h3>{{ queryParams.applyFor }}提交的领料申请</h3>
             <div>领料单号：{{ queryParams.code }}</div>
@@ -315,7 +315,7 @@
     } from '@/api/claimAndRefund/receive'
     import { mapState } from 'vuex'
     export default {
-        name: 'ReceiveExamine',
+        name: 'receiveExamine',
         data() {
             return {
                 flowPath: [
@@ -423,7 +423,7 @@
         computed: {
             ...mapState(['user']),
         },
-        created() {
+        mounted() {
             let taskId = this.$route.query.taskId
             let isView = this.$route.query.isView
             this.isView = false
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
index 547b7de1..40b8f62a 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
@@ -197,7 +197,7 @@
                 label="任务状态"
                 align="center"
                 prop="taskName"
-                :show-overflow-tooltip="true"
+                :show-overflow-tooltip="true" width="150"
             />
             <el-table-column
                 label="审批意见 "
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
index 6ca054db..08fc6c9e 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
@@ -356,7 +356,7 @@ export default {
       }
     };
   },
-  created() {
+  mounted() {
     this.GetUserInfo()
 
     this.GetUnitData()
@@ -604,7 +604,9 @@ export default {
                 v = Object.assign(v,this.queryParams.leaseApplyInfo)
                 this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
               })
-              
+              if(this.$route.query.isBack){
+                this.queryParams.souceByRefuse=1
+              }
               const params = {
                 ...this.queryParams,taskId:this.taskId,
                 leaseApplyInfoList:this.leaseApplyInfoList
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
index d5da4d40..d07bb763 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
@@ -175,14 +175,7 @@
               <p class="time">申请时间：{{queryParams.updateTimes}}</p>
             </el-card>
           </el-timeline-item>
-          <el-timeline-item
-            v-for="(v,i) in flowPath"
-            :type="v.type"
-            :color="v.color"
-            :icon="v.icon"
-            :key="i"
-            placement="top"
-          >
+          <el-timeline-item v-for="(v,i) in flowPath" :type="v.type" :color="v.color" :icon="v.icon" :key="i" placement="top">
             <el-card>
               <p class="title">{{v.name}}</p>
               <p class="author" v-if="queryParams[v.authorKey]">审核人：{{queryParams[v.authorKey]}}</p>
@@ -285,7 +278,7 @@ import {
 } from '@/api/claimAndRefund/receive'
 import { mapState } from 'vuex'
 export default {
-  name: 'ReceiveExamine',
+  name: 'receiveExamine',
   data() {
     return {
       flowPath: [
@@ -313,9 +306,9 @@ export default {
         {
           id: 117,
           name: '机具分公司确认',
-          remarkKey: 'directAuditRemark',
-          authorKey: 'directAuditBy',
-          timeKey: 'directAuditTime',
+          // remarkKey: 'deptAuditRemark',
+          // authorKey: 'deptAuditBy',
+          // timeKey: '',
         },
       ],
       isView: false,
@@ -382,14 +375,14 @@ export default {
   computed: {
     ...mapState(['user']),
   },
-  created() {
+  mounted() {
     let taskId = this.$route.query.taskId
     let isView = this.$route.query.isView
+    console.log("mounted")
     this.isView = false
     if (isView) {
       this.isView = true
     }
-    // console.log(isView)
     if (taskId) {
       this.getData(taskId)
     }
@@ -482,7 +475,9 @@ export default {
     },
     /** 查询 */
     async getData(taskId) {
+      this.loading=true;
       const res = await getLeaseListAllCq({ taskId })
+      this.loading=false;
       this.queryParams = { ...this.queryParams, ...res.rows[0] }
       this.$set(this.queryParams, 'leaseApplyInfo', this.queryParams.leaseApplyInfoList[0])
       this.queryParams.leaseApplyDetails.forEach(v => {
@@ -520,7 +515,7 @@ export default {
         this.flowPath[2].icon = 'el-icon-check'
       }
       // console.log(this.flowPath)
-      if (this.queryParams.examineStatusId == 98) {
+      if (this.queryParams.examineStatusId == 99) {
         this.flowPath[0].color = 'red'
         this.flowPath[0].icon = 'el-icon-close'
         this.flowPath[1].color = ''
@@ -529,16 +524,25 @@ export default {
         this.flowPath[2].color = ''
         this.flowPath[2].icon = ''
       }
-      if (this.queryParams.examineStatusId == 99) {
+      if (this.queryParams.examineStatusId == 100) {
         this.flowPath[1].color = 'red'
         this.flowPath[1].icon = 'el-icon-close'
         this.flowPath[2].color = ''
         this.flowPath[2].icon = ''
       }
-      if (this.queryParams.examineStatusId == 100) {
-        this.flowPath[2].color = 'red'
-        this.flowPath[2].icon = 'el-icon-close'
+      // if (this.queryParams.examineStatusId == 100) {
+      //   this.flowPath[2].color = 'red'
+      //   this.flowPath[2].icon = 'el-icon-close'
+      // }
+
+      if(this.queryParams.leaseType=='1'){
+        this.flowPath = [this.flowPath[2]]
+      }else{
+        this.flowPath = this.flowPath
       }
+
+
+
     },
     // 取消按钮
     cancel() {
diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
index 3178c2a8..145dba18 100644
--- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
@@ -117,7 +117,7 @@
         prop="createTimes"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
+      <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" width="150"/>
       <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
       <el-table-column label="备注" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -503,6 +503,7 @@ export default {
       // this.title = "添加字典类型";
     },
     handleExamine(row, type) {
+      this.$tab.closePage({path: '/claimAndRefund/receiveByCq/receiveExamine'})
       this.$tab.closeOpenPage({
         path: '/claimAndRefund/receiveByCq/receiveExamine',
         query: {
@@ -511,6 +512,7 @@ export default {
       })
     },
     handleView(row) {
+      this.$tab.closePage({path: '/claimAndRefund/receiveByCq/receiveExamine?isView=true'})
       this.$tab.closeOpenPage({
         path: '/claimAndRefund/receiveByCq/receiveExamine?isView=true',
         query: {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index c14464b7..7c944823 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -412,7 +412,7 @@ export default {
       rowId:''
     };
   },
-  created() {
+  mounted() {
     this.GetUnitData()
     this.GetProData()
     this.GetDeviceTypeTreeFn()
@@ -780,7 +780,7 @@ export default {
     /////// 设备类型树  切换
     async deviceTypeChange(val) {
       let nodes = null;
-      console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)])
+      // console.log("vall1211221122", this.$refs.deviceTypeCascader.getCheckedNodes().length, this.$refs.deviceTypeCascader.getCheckedNodes(), [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)])
       nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
       console.log("nodes", nodes)
       const res = await getUseNumByTypeId({ typeId: nodes[0].data.typeId })
@@ -788,6 +788,16 @@ export default {
       if (nodes[0].level != 4) {
         return
       }
+      if (nodes[0].data.useNum < 1) {
+        this.$modal.msgError("所选机具类型当前无在用!");
+        return
+      }
+      for (let i = 0; i < this.leaseApplyDetails.length; i++) {
+        if (this.leaseApplyDetails[i].typeId == nodes[0].data.typeId) {
+          this.leaseApplyDetails.splice(i, 1)
+          break
+        }
+      }
       this.leaseApplyDetails.push(
         this.handelTableItemData(nodes[0])
       )
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
index 5e3e6fc0..f6bb2dc8 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAddByCq.vue
@@ -412,7 +412,7 @@ export default {
       rowId:''
     };
   },
-  created() {
+  mounted() {
     this.GetUnitData()
     this.GetProData()
     this.GetDeviceTypeTreeFn()
@@ -651,6 +651,8 @@ export default {
             this.$message.error('退料数量不能为空！');
             return;
           }
+          
+
           this.queryParams.createBy = this.user.name
           this.queryParams.companyId = this.companyId
           this.queryParams.backApplyInfo = {
@@ -777,7 +779,16 @@ export default {
       if (nodes[0].level != 4) {
         return
       }
-
+      if (nodes[0].data.useNum < 1) {
+        this.$modal.msgError("所选机具类型当前无在用!");
+        return
+      }
+      for (let i = 0; i < this.leaseApplyDetails.length; i++) {
+        if (this.leaseApplyDetails[i].typeId == nodes[0].data.typeId) {
+          this.leaseApplyDetails.splice(i, 1)
+          break
+        }
+      }
       this.leaseApplyDetails.push(
         this.handelTableItemData(nodes[0])
       )
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
index c8056c1b..5cc6f751 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
@@ -477,7 +477,7 @@ export default {
       numList: [], //数量弹窗表格数据
     }
   },
-  created() {
+  mounted() {
     if (this.$route.query.isView) {
       this.isView = this.$route.query.isView
     } else {
diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
index 4d6ab32d..7b297823 100644
--- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
+++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
@@ -593,7 +593,7 @@
                 applyList: [],
             }
         },
-        created() {
+        mounted() {
             let arr = JSON.parse(this.$route.query.rowData)
             this.rowData = arr
             this.getDataAll()
diff --git a/sgzb-ui/src/views/monitor/job/log.vue b/sgzb-ui/src/views/monitor/job/log.vue
index 1977d7f6..c4e034a2 100644
--- a/sgzb-ui/src/views/monitor/job/log.vue
+++ b/sgzb-ui/src/views/monitor/job/log.vue
@@ -216,7 +216,7 @@ export default {
       }
     };
   },
-  created() {
+  mounted() {
     const jobId = this.$route.params && this.$route.params.jobId;
     if (jobId !== undefined && jobId != 0) {
       getJob(jobId).then(response => {
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index f568c133..710c4156 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -249,7 +249,7 @@ export default {
       }
     };
   },
-  created() {
+  mounted() {
     const taskId = this.$route.query && this.$route.query.taskId;
     this.taskId = taskId;
     console.log(this.taskId)
diff --git a/sgzb-ui/src/views/store/newBuy/planAdd.vue b/sgzb-ui/src/views/store/newBuy/planAdd.vue
index d14368ea..84cdabbc 100644
--- a/sgzb-ui/src/views/store/newBuy/planAdd.vue
+++ b/sgzb-ui/src/views/store/newBuy/planAdd.vue
@@ -251,7 +251,7 @@ export default {
       }
     }
   },
-  created() {
+  mounted() {
     const planId = this.$route.query && this.$route.query.planId;
     this.planId = planId;
     if (this.planId == '' || !this.planId) {