From d3682b99fc30032ed69db31a4d03f3f5480be7b5 Mon Sep 17 00:00:00 2001
From: 13218645326 <sjf13651675634@163.com>
Date: Sun, 24 Dec 2023 21:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/claimAndRefund/receive.js     |  8 +++++++
 sgzb-ui/src/api/system/dict/type.js           | 11 +++++++++-
 .../claimAndRefund/return/returnApply.vue     | 21 ++++++++++++++-----
 .../claimAndRefund/return/returnApplyAdd.vue  | 17 ++++++++++-----
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/sgzb-ui/src/api/claimAndRefund/receive.js b/sgzb-ui/src/api/claimAndRefund/receive.js
index 92428a52..4d0a9506 100644
--- a/sgzb-ui/src/api/claimAndRefund/receive.js
+++ b/sgzb-ui/src/api/claimAndRefund/receive.js
@@ -149,6 +149,14 @@ export function auditLeaseByCompany(params = {} ){
   })
 }
 
+//  获取 物品类型
+export function getUseTypeTreee(params = {}){
+  return request({
+    url: '/material/backApply/getUseTypeTree',
+    method: 'post',
+    data: params
+  })
+}
 
 
 
diff --git a/sgzb-ui/src/api/system/dict/type.js b/sgzb-ui/src/api/system/dict/type.js
index 003c9482..5d548111 100644
--- a/sgzb-ui/src/api/system/dict/type.js
+++ b/sgzb-ui/src/api/system/dict/type.js
@@ -71,4 +71,13 @@ export function optionselect() {
     url: '/system/dict/type/optionselect',
     method: 'get'
   })
-}
\ No newline at end of file
+}
+
+// 工机具类型
+export function getUseTypeTree(data) {
+  return request({
+    url: '/material/backApply/getUseTypeTree',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index fb6918bb..65185a6b 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -56,8 +56,8 @@
           :options="deptOptions"
           :props="{
             expandTrigger: 'hover',
-            label: 'label',
-            value: 'id',
+            label: 'typeName',
+            value: 'typeId',
             checkStrictly: true,
           }"
           @change="handleNodeClick"
@@ -531,7 +531,7 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import { listType, getType, delType, addType, updateType, refreshCache ,getUseTypeTree} from "@/api/system/dict/type";
 import { ApiGetBackApplyList, ApiGetView, backApplyDelApi, submitBackApplyApi } from "@/api/claimAndRefund/return.js"
 import {
   getInfo, h
@@ -774,9 +774,10 @@ export default {
         return backApplyDelApi(param);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess('删除成功');
+        // this.$modal.msgSuccess('删除成功');
+        this.$message.success('操作成功!')
       }).catch(() => {
-        this.$modal.msgError('删除失败');
+        // this.$modal.msgError('删除失败');
       });
     },
     handlePrint(row) {
@@ -831,6 +832,7 @@ export default {
         this.companyId = res.user.companyId
         this.getList();
       })
+      // this.initGetUseTypeTree()
     },
     handleNodeClick(ev) {
 
@@ -871,6 +873,7 @@ export default {
       const res = await getAgreementInfoById(params)
       // this.proList = res.data
       this.queryParams.agreementCode = res.data.agreementCode
+      this.initGetUseTypeTree(res.data.agreementId)
     },
     getAgreementByUnitAndProId() {
       this.InitGetAgreementInfoById()
@@ -886,6 +889,14 @@ export default {
     },
     resetQuery1() {
 
+    },
+    async initGetUseTypeTree(id){
+      let params ={
+        agreementId:id
+      }
+     const res = await getUseTypeTree(params)
+     console.log("res-getUseTypeTree",res)
+     this.deptOptions = res.data
     }
 
 
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 9a923987..517188f1 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -372,9 +372,9 @@ export default {
       // 设备 树显示 配置
       deviceTypeTreeProps: {
         children: 'children',
-        label: 'typeName'
+        label: 'typeName',
         // multiple: false,
-        // value: 'typeId'
+        value: 'typeId'
       },
       // 选中的设备类型
       deviceType: null,
@@ -404,7 +404,7 @@ export default {
   created() {
     this.GetUnitData()
     this.GetProData()
-    this.GetDeviceTypeTree()
+    this.GetDeviceTypeTreeFn()
     // this.getList();
     console.log('this.$route.query.taskId', this.$route.query.taskId)
     if (this.$route.query.taskId) {
@@ -440,12 +440,14 @@ export default {
     },
 
     // 获取 设备树结构数据
-    async GetDeviceTypeTree() {
+    async GetDeviceTypeTreeFn(agreementId) {
       const params = {
-        agreementId: 15
+        agreementId: agreementId
         //  this.agreementId
       }
+
       const res = await getUseTypeTreee(params)
+      console.log("resgetUseTypeTreee",res)
       this.deviceTypeTree = res.data
     },
     // 获取 协议id
@@ -465,6 +467,8 @@ export default {
         } else {
           this.queryParams.agreementId = res.data.agreementId
           this.queryParams.agreementCode = res.data.agreementCode
+          this.GetDeviceTypeTreeFn(res.data.agreementId)
+ 
         }
       }
     },
@@ -759,10 +763,13 @@ export default {
     /////// 设备类型树  切换
     deviceTypeChange(val) {
       let nodes = null;
+      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)
       if (nodes[0].level != 4) {
         return
       }
+
       this.leaseApplyDetails.push(
         this.handelTableItemData(nodes[0])
       )