From 34aafe30953d89580449ba1abee59b362dc76505 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Sat, 20 Apr 2024 15:20:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8-?=
 =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/return/returnExamine.vue   | 35 +++++++++--------
 .../views/claimAndRefund/return/returnIn.vue  | 38 ++++++++++---------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 8357d056..ef28f518 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -41,18 +41,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="工机具类型" prop="typeId">
-        <el-cascader
-          v-model="queryParams.typeId"
-          :options="deptOptions"
-          :props="{
-                        expandTrigger: 'hover',
-                        label: 'label',
-                        value: 'id',
-                        checkStrictly: true,
-                    }"
-          @change="handleNodeClick"
-          aria-placeholder="请选择极具类型"
-        ></el-cascader>
+        <Tree
+            ref="mychildSon"
+            :width="240"
+            :dataList="deptList"
+            @changeId="selectDrop"
+        ></Tree>
       </el-form-item>
       <el-form-item label="协议号" prop="agreementCode">
         <el-input
@@ -434,12 +428,14 @@ import {
 import { getInfo, h } from '@/api/login'
 import { getUnitData, getProData, getAgreementInfoById } from '@/api/claimAndRefund/receive.js'
 import dialogForm from './dialogFormExame.vue'
+import { listPartTypeApi } from '@/api/repairTest/repair'
+import Tree from './tree.vue'
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
   // name: "ReturnExamine",
   dicts: ['sys_normal_disable'],
-  components: { dialogForm },
+  components: { dialogForm, Tree },
   data() {
     return {
       checkResultOne: false,
@@ -511,7 +507,7 @@ export default {
       openTextTwo: '',
       openTextThree: '',
       companyId: '',
-      deptOptions: [],
+      deptList: [],
       unitList: [],
       proList: [],
       taskStatusList: [
@@ -546,6 +542,7 @@ export default {
     this.initSelectData()
     this.InitIGetInfo()
     this.getList()
+    this.getTree()
   },
   methods: {
     // claimAndRefund/return/returnApplyAdd
@@ -568,6 +565,11 @@ export default {
         this.loading = false
       } catch (error) {}
     },
+    getTree() {
+      listPartTypeApi().then((response) => {
+        this.deptList = response.data
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -595,6 +597,7 @@ export default {
       this.timeRange = []
       // this.resetForm("queryForm");
       this.$refs.queryForm.resetFields()
+      this.$refs.mychildSon.inputValue = ''
       this.initSelectData()
       this.handleQuery()
     },
@@ -795,7 +798,9 @@ export default {
         this.getList()
       })
     },
-    handleNodeClick(ev) {},
+    selectDrop(value) {
+      this.queryParams.typeId = value
+    },
     initSelectData() {
       this.GetUnitData()
       this.GetProData()
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
index 5d171155..13d70856 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -62,19 +62,12 @@
                 />
             </el-form-item>
             <el-form-item label="工机具类型" prop="typeId">
-                <el-cascader
-                    v-model="queryParams.typeId"
-                    :options="deptOptions"
-                    :props="{
-                        expandTrigger: 'hover',
-                        label: 'label',
-                        value: 'id',
-                        checkStrictly: true,
-                    }"
-                    @change="handleNodeClick"
-                    aria-placeholder="请选择极具类型"
-                >
-                </el-cascader>
+              <Tree
+                  ref="mychildSon"
+                  :width="240"
+                  :dataList="deptList"
+                  @changeId="selectDrop"
+              ></Tree>
             </el-form-item>
 
             <el-form-item label="退料状态" prop="taskStatus">
@@ -205,9 +198,11 @@
   import { getInfo } from "@/api/login";
   import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
   import dialogForm from "./dialogFormExame.vue";
+  import { listPartTypeApi } from '@/api/repairTest/repair'
+  import Tree from './tree.vue'
   export default {
     // name: "ReturnExamine",
-    components: { dialogForm, },
+    components: { dialogForm, Tree },
     data() {
       return {
         type: '',
@@ -248,7 +243,7 @@
           endTime: ''
         },
         companyId: '',
-        deptOptions: [],
+        deptList: [],
         unitList: [],
         proList: [],
         taskStatusList: [
@@ -279,6 +274,7 @@
     created() {
       this.initSelectData()
       this.InitIGetInfo()
+      this.getTree()
     },
     methods: {
       InitIGetInfo() {
@@ -287,9 +283,15 @@
           this.getList();
         })
       },
+      getTree() {
+        listPartTypeApi().then((response) => {
+          console.log('🚀 ~ listPartTypeApi ~ response.data:', response.data);
+          this.deptList = response.data
+        })
+      },
       //机具类型下拉点击
-      handleNodeClick(ev) {
-  
+      selectDrop(value) {
+        this.queryParams.typeId = value
       },
       //获取渲染下拉数据
       initSelectData() {
@@ -367,8 +369,8 @@
       resetQuery() {
         this.dateRange = [];
         // this.resetForm("queryForm");
-        
         this.$refs.queryForm.resetFields()
+        this.$refs.mychildSon.inputValue = ''
         this.initSelectData()
         this.handleQuery();
       },