From 56d4919ab97f46ec8f2a9c443efee04f96018900 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 30 Dec 2024 11:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=B7=A5=E7=A8=8B=E6=A0=91=E7=8A=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/stquery/deviceOutBound.vue | 71 ++++++++++++++-----
 .../material/stquery/deviceUsingHistory.vue   | 71 ++++++++++++++-----
 .../material/stquery/deviceUsingRecord.vue    | 71 ++++++++++++++-----
 3 files changed, 162 insertions(+), 51 deletions(-)

diff --git a/src/views/material/stquery/deviceOutBound.vue b/src/views/material/stquery/deviceOutBound.vue
index 0d0078e3..97ba98eb 100644
--- a/src/views/material/stquery/deviceOutBound.vue
+++ b/src/views/material/stquery/deviceOutBound.vue
@@ -21,7 +21,14 @@
           />
         </el-form-item> -->
         <el-form-item label="往来单位" prop="unitId">
-                    <el-cascader v-model="unitId"
+            <treeselect
+                v-model="queryParams.unitId"
+                :options="unitList" :normalizer="normalizer"
+                :show-count="true" style="width: 240px" :disable-branch-nodes="true"
+                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                placeholder="请选择往来单位" @select="unitChange"
+            /> 
+                    <!-- <el-cascader v-model="unitId"
                         :show-all-levels="false"
                         :options="unitList"
                         :props="selectTreeProps"
@@ -30,10 +37,17 @@
                         collapse-tags
                         @change="unitChange"
                         placeholder="请选择往来单位"
-                    ></el-cascader> 
+                    ></el-cascader>  -->
         </el-form-item>
         <el-form-item label="工程名称" prop="proId">
-            <el-cascader v-model="projectId"
+            <treeselect
+                v-model="queryParams.proId"
+                :options="proList" :normalizer="normalizer"
+                :show-count="true" style="width: 240px" :disable-branch-nodes="true"
+                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                placeholder="请选择工程名称" @select="proChange"
+            />
+            <!-- <el-cascader v-model="projectId"
                     :show-all-levels="false"
                     :options="proList"
                     :props="selectTreeProps"
@@ -41,7 +55,7 @@
                     collapse-tags
                     @change="proChange"
                     placeholder="请选择工程名称"
-                ></el-cascader>
+                ></el-cascader> -->
         </el-form-item>
         <el-form-item label="物资名称" prop="typeName">
             <el-input
@@ -145,9 +159,12 @@ import {
     getProjectList,
     getUnitList, 
 } from '@/api/back/index.js'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
     name: '',
     dicts: [],
+    components: { Treeselect },
     data() {
         return {
             // 遮罩层
@@ -184,6 +201,8 @@ export default {
                 pageSize: 10,
                 time: null,
                 keyWord: null,
+                unitId: null,
+                proId: null,
                 typeName: null, //物资名称 
                 typeModelName: null, //
                 outStyle:null
@@ -199,35 +218,53 @@ export default {
           this.GetUnitData()
           this.GetProData()
       },
+      /** 转换菜单数据结构 */
+      normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children;
+            }
+            return {
+                id: node.id,
+                label: node.name,
+                children: node.children,
+            };
+        }, 
       // 获取 来往单位 列表数据
       async GetUnitData() {
               const params = {
-                  projectId: this.queryParams.proId /*  */,
+                //   projectId: this.queryParams.proId /*  */,
               }
               const res = await getUnitList(params)
               this.unitList = res.data
       },
       unitChange(val){
-          if(val&&val.length>0){
-              this.queryParams.unitId=this.unitId[this.unitId.length - 1]
-          }else if(val&&val.length==0){
-              this.queryParams.unitId=""
-          }
-          this.GetProData()
+        //   if(val&&val.length>0){
+        //       this.queryParams.unitId=this.unitId[this.unitId.length - 1]
+        //   }else if(val&&val.length==0){
+        //       this.queryParams.unitId=""
+        //   }
+        //   this.GetProData()
+        setTimeout(()=>{
+            this.GetProData()
+        },500)  
       }, 
       // 获取 工程名称 列表数据
       async GetProData() {
               const params = { unitId: this.queryParams.unitId}
               const res = await getProjectList(params)
               this.proList = res.data
+              this.queryParams.proId=null
       },
       proChange(val){
-          if(val&&val.length>0){
-              this.queryParams.proId=this.projectId[this.projectId.length - 1]
-          }else if(val&&val.length==0){
-              this.queryParams.proId=""
-          }
-          this.GetUnitData()
+        //   if(val&&val.length>0){
+        //       this.queryParams.proId=this.projectId[this.projectId.length - 1]
+        //   }else if(val&&val.length==0){
+        //       this.queryParams.proId=""
+        //   }
+        //   this.GetUnitData()
+        setTimeout(()=>{
+            this.GetUnitData()
+        },500)
       },
       //跳转领料
       jumpLease(code){
diff --git a/src/views/material/stquery/deviceUsingHistory.vue b/src/views/material/stquery/deviceUsingHistory.vue
index 35cc71a6..f973e1c6 100644
--- a/src/views/material/stquery/deviceUsingHistory.vue
+++ b/src/views/material/stquery/deviceUsingHistory.vue
@@ -21,7 +21,14 @@
           />
         </el-form-item>
         <el-form-item label="往来单位" prop="unitId">
-                    <el-cascader v-model="unitId"
+            <treeselect
+                v-model="queryParams.unitId"
+                :options="unitList" :normalizer="normalizer"
+                :show-count="true" style="width: 240px" :disable-branch-nodes="true"
+                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                placeholder="请选择往来单位" @select="unitChange"
+            /> 
+                    <!-- <el-cascader v-model="unitId"
                         :show-all-levels="false"
                         :options="unitList"
                         :props="selectTreeProps"
@@ -30,10 +37,17 @@
                         collapse-tags
                         @change="unitChange"
                         placeholder="请选择往来单位"
-                    ></el-cascader> 
+                    ></el-cascader>  -->
         </el-form-item>
         <el-form-item label="工程名称" prop="proId">
-            <el-cascader v-model="projectId"
+            <treeselect
+                v-model="queryParams.proId"
+                :options="proList" :normalizer="normalizer"
+                :show-count="true" style="width: 240px" :disable-branch-nodes="true"
+                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                placeholder="请选择工程名称" @select="proChange"
+            />
+            <!-- <el-cascader v-model="projectId"
                     :show-all-levels="false"
                     :options="proList"
                     :props="selectTreeProps"
@@ -41,7 +55,7 @@
                     collapse-tags
                     @change="proChange"
                     placeholder="请选择工程名称"
-                ></el-cascader>
+                ></el-cascader> -->
         </el-form-item>
         <el-form-item label="物资名称" prop="typeName">
             <el-input
@@ -131,9 +145,12 @@ import {
     getProjectList,
     getUnitList, 
 } from '@/api/back/index.js'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
     name: '',
     dicts: [],
+    components: { Treeselect },
     data() {
         return {
             // 遮罩层
@@ -169,6 +186,8 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 time: null,
+                unitId: null,
+                proId: null,
                 keyWord: null,
                 typeName: null, //物资名称 
                 statusName: null //状态
@@ -184,35 +203,53 @@ export default {
           this.GetUnitData()
           this.GetProData()
       },
+      /** 转换菜单数据结构 */
+      normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children;
+            }
+            return {
+                id: node.id,
+                label: node.name,
+                children: node.children,
+            };
+        }, 
       // 获取 来往单位 列表数据
       async GetUnitData() {
               const params = {
-                  projectId: this.queryParams.proId /*  */,
+                //   projectId: this.queryParams.proId /*  */,
               }
               const res = await getUnitList(params)
               this.unitList = res.data
       },
       unitChange(val){
-          if(val&&val.length>0){
-              this.queryParams.unitId=this.unitId[this.unitId.length - 1]
-          }else if(val&&val.length==0){
-              this.queryParams.unitId=""
-          }
-          this.GetProData()
+        //   if(val&&val.length>0){
+        //       this.queryParams.unitId=this.unitId[this.unitId.length - 1]
+        //   }else if(val&&val.length==0){
+        //       this.queryParams.unitId=""
+        //   }
+        //   this.GetProData()
+        setTimeout(()=>{
+            this.GetProData()
+        },500)  
       }, 
       // 获取 工程名称 列表数据
       async GetProData() {
               const params = { unitId: this.queryParams.unitId}
               const res = await getProjectList(params)
               this.proList = res.data
+              this.queryParams.proId=null
       },
       proChange(val){
-          if(val&&val.length>0){
-              this.queryParams.proId=this.projectId[this.projectId.length - 1]
-          }else if(val&&val.length==0){
-              this.queryParams.proId=""
-          }
-          this.GetUnitData()
+        //   if(val&&val.length>0){
+        //       this.queryParams.proId=this.projectId[this.projectId.length - 1]
+        //   }else if(val&&val.length==0){
+        //       this.queryParams.proId=""
+        //   }
+        //   this.GetUnitData()
+        setTimeout(()=>{
+            this.GetUnitData()
+        },500)
       },
 
       // 获取列表
diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue
index 3a0e77f2..79df15f9 100644
--- a/src/views/material/stquery/deviceUsingRecord.vue
+++ b/src/views/material/stquery/deviceUsingRecord.vue
@@ -21,7 +21,14 @@
           />
         </el-form-item>
         <el-form-item label="往来单位" prop="unitId">
-                    <el-cascader v-model="unitId"
+            <treeselect
+                v-model="queryParams.unitId"
+                :options="unitList" :normalizer="normalizer"
+                :show-count="true" style="width: 240px" :disable-branch-nodes="true"
+                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                placeholder="请选择往来单位" @select="unitChange"
+            /> 
+                    <!-- <el-cascader v-model="unitId"
                         :show-all-levels="false"
                         :options="unitList"
                         :props="selectTreeProps"
@@ -30,10 +37,17 @@
                         collapse-tags
                         @change="unitChange"
                         placeholder="请选择往来单位"
-                    ></el-cascader> 
+                    ></el-cascader>  -->
         </el-form-item>
         <el-form-item label="工程名称" prop="proId">
-            <el-cascader v-model="projectId"
+            <treeselect
+                v-model="queryParams.proId"
+                :options="proList" :normalizer="normalizer"
+                :show-count="true" style="width: 240px" :disable-branch-nodes="true"
+                noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
+                placeholder="请选择工程名称" @select="proChange"
+            />
+            <!-- <el-cascader v-model="projectId"
                     :show-all-levels="false"
                     :options="proList"
                     :props="selectTreeProps"
@@ -41,7 +55,7 @@
                     collapse-tags
                     @change="proChange"
                     placeholder="请选择工程名称"
-                ></el-cascader>
+                ></el-cascader> -->
         </el-form-item>
         <el-form-item label="物资名称" prop="typeName">
             <el-input
@@ -133,9 +147,12 @@ import {
     getProjectList,
     getUnitList, 
 } from '@/api/back/index.js'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
     name: '',
     dicts: [],
+    components: { Treeselect },
     data() {
         return {
             // 遮罩层
@@ -171,6 +188,8 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 time: null,
+                unitId: null,
+                proId: null,
                 keyWord: null,
                 typeName: null, //物资名称 
                 isSlt: null //结算状态
@@ -186,35 +205,53 @@ export default {
           this.GetUnitData()
           this.GetProData()
       },
+       /** 转换菜单数据结构 */
+        normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children;
+            }
+            return {
+                id: node.id,
+                label: node.name,
+                children: node.children,
+            };
+        }, 
       // 获取 来往单位 列表数据
       async GetUnitData() {
               const params = {
-                  projectId: this.queryParams.proId /*  */,
+                //   projectId: this.queryParams.proId /*  */,
               }
               const res = await getUnitList(params)
               this.unitList = res.data
       },
       unitChange(val){
-          if(val&&val.length>0){
-              this.queryParams.unitId=this.unitId[this.unitId.length - 1]
-          }else if(val&&val.length==0){
-              this.queryParams.unitId=""
-          }
-          this.GetProData()
+        //   if(val&&val.length>0){
+        //       this.queryParams.unitId=this.unitId[this.unitId.length - 1]
+        //   }else if(val&&val.length==0){
+        //       this.queryParams.unitId=""
+        //   }
+        //   this.GetProData()
+        setTimeout(()=>{
+            this.GetProData()
+        },500)  
       }, 
       // 获取 工程名称 列表数据
       async GetProData() {
               const params = { unitId: this.queryParams.unitId}
               const res = await getProjectList(params)
               this.proList = res.data
+              this.queryParams.proId=null
       },
       proChange(val){
-          if(val&&val.length>0){
-              this.queryParams.proId=this.projectId[this.projectId.length - 1]
-          }else if(val&&val.length==0){
-              this.queryParams.proId=""
-          }
-          this.GetUnitData()
+        //   if(val&&val.length>0){
+        //       this.queryParams.proId=this.projectId[this.projectId.length - 1]
+        //   }else if(val&&val.length==0){
+        //       this.queryParams.proId=""
+        //   }
+        //   this.GetUnitData()
+        setTimeout(()=>{
+            this.GetUnitData()
+        },500)
       },
 
       // 获取列表