From 8027d196b2a1b2f86b0eaddf54d7ed2ff8c99c95 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 19 Jul 2024 16:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=A5=97=E8=AE=BE=E5=A4=87=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/addCompleteTools.vue            | 27 +++++++++++++++++
 .../completeParts/component/config.js         |  2 +-
 .../completeParts/component/home.vue          |  3 ++
 .../component/addCompleteTools.vue            | 30 ++++++++++++++++++-
 .../completeTools/component/config.js         |  2 +-
 .../completeTools/component/home.vue          |  3 ++
 6 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
index a75b18ec..15b2da4e 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
@@ -57,6 +57,7 @@
 
         <el-table :data="tempList" border>
             <el-table-column align="center" label="序号" type="index" />
+            <el-table-column prop="typeName" align="center" label="设备名称" />
             <el-table-column
                 prop="deviceType"
                 align="center"
@@ -156,6 +157,7 @@ export default {
                 deviceInfo: [],
             },
             isEdit: false,
+            deviceName: '',
         }
     },
     async created() {
@@ -182,6 +184,10 @@ export default {
         //主体设备选择
         selMainDevice(val) {
             const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(
+                this.deviceTypeTreeNew,
+                val[val.length - 2],
+            )
 
             if (checkNode.length < 1) return
 
@@ -191,6 +197,7 @@ export default {
                 deviceNum: '', // 数量
                 deviceAscription: '主体设备', // 所属类型
                 ascriptionType: 1, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
             }
 
             if (this.tempList.length === 0) {
@@ -215,6 +222,10 @@ export default {
         // 配套设备选择
         selAssortDevice(val) {
             const checkNode = this.$refs['assortDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(
+                this.deviceTypeTreeNew,
+                val[val.length - 2],
+            )
 
             if (checkNode.length < 1) return
 
@@ -224,6 +235,7 @@ export default {
                 deviceNum: '', // 数量
                 deviceAscription: '配套设备', // 所属类型
                 ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
             }
 
             // 先判断当前所选的配套设备是否已选择为主体设备
@@ -331,6 +343,21 @@ export default {
             this.$emit('openHomePage')
             this.tempList = []
         },
+        // 递归获取设备名称
+        recursionGetDeviceName(list, id) {
+            try {
+                list.map((e) => {
+                    if (e.id == id) {
+                        this.deviceName = e.label
+                        throw new Error()
+                    } else {
+                        if (e.children && e.children.length > 0) {
+                            this.recursionGetDeviceName(e.children, id)
+                        }
+                    }
+                })
+            } catch (error) {}
+        },
     },
 }
 </script>
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/config.js b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/config.js
index 191e66a1..d5861c11 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/config.js
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/config.js
@@ -15,7 +15,7 @@ export const config = {
     columnsList: [
         { t_width: '', t_props: 'wholeTypeName', t_label: '成套设备名称', },
         { t_width: '', t_props: 'typeModelName', t_label: '主体设备', },
-        { t_width: '', t_props: 'totalNum', t_label: '配套设备种类数量' },
+        { t_width: '', t_label: '配套设备种类数量', t_slot: 'totalNum' },
         { t_width: '', t_props: 'nickName', t_label: '创建人', },
         { t_width: '', t_props: 'createTime', t_label: '创建日期', },
     ],
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/home.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/home.vue
index 2d5fffe5..c2d723b5 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/home.vue
@@ -17,6 +17,9 @@
                     >
                 </el-row>
             </template>
+            <template slot-scope="{ data }" slot="totalNum">
+                {{ data.totalNum }}
+            </template>
 
             <!-- 列表操作栏 -->
             <template slot="handle" slot-scope="{ data }">
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
index 8ae6e12f..584d210d 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
@@ -57,6 +57,7 @@
 
         <el-table :data="tempList" border>
             <el-table-column align="center" label="序号" type="index" />
+            <el-table-column prop="typeName" align="center" label="设备名称" />
             <el-table-column
                 prop="deviceType"
                 align="center"
@@ -156,6 +157,7 @@ export default {
                 deviceInfo: [],
             },
             isEdit: false,
+            deviceName: '',
         }
     },
     async created() {
@@ -183,14 +185,19 @@ export default {
         selMainDevice(val) {
             const checkNode = this.$refs['mainDeviceRef'].getCheckedNodes()
 
+            this.recursionGetDeviceName(
+                this.deviceTypeTreeNew,
+                val[val.length - 2],
+            )
             if (checkNode.length < 1) return
 
             const mainDeviceObj = {
-                deviceType: checkNode[0].label, // 设备名称
+                deviceType: checkNode[0].label, // 设备型号
                 deviceTypeId: val[val.length - 1], // 设备Id
                 deviceNum: '', // 数量
                 deviceAscription: '主体设备', // 所属类型
                 ascriptionType: 1, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
             }
 
             if (this.tempList.length === 0) {
@@ -215,6 +222,10 @@ export default {
         // 配套设备选择
         selAssortDevice(val) {
             const checkNode = this.$refs['assortDeviceRef'].getCheckedNodes()
+            this.recursionGetDeviceName(
+                this.deviceTypeTreeNew,
+                val[val.length - 2],
+            )
 
             if (checkNode.length < 1) return
 
@@ -224,6 +235,7 @@ export default {
                 deviceNum: '', // 数量
                 deviceAscription: '配套设备', // 所属类型
                 ascriptionType: 2, // 所属类型 1 主体设备 2 配套设备
+                typeName: this.deviceName,
             }
 
             // 先判断当前所选的配套设备是否已选择为主体设备
@@ -331,6 +343,22 @@ export default {
             this.$emit('openHomePage')
             this.tempList = []
         },
+
+        // 递归获取设备名称
+        recursionGetDeviceName(list, id) {
+            try {
+                list.map((e) => {
+                    if (e.id == id) {
+                        this.deviceName = e.label
+                        throw new Error()
+                    } else {
+                        if (e.children && e.children.length > 0) {
+                            this.recursionGetDeviceName(e.children, id)
+                        }
+                    }
+                })
+            } catch (error) {}
+        },
     },
 }
 </script>
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/config.js b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/config.js
index 2bf91fae..897e6214 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/config.js
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/config.js
@@ -15,7 +15,7 @@ export const config = {
     columnsList: [
         { t_width: '', t_props: 'wholeTypeName', t_label: '成套设备名称', },
         { t_width: '', t_props: 'typeModelName', t_label: '主体设备', },
-        { t_width: '', t_props: 'totalNum', t_label: '配套设备种类数量' },
+        { t_width: '', t_label: '配套设备种类数量', t_slot: 'totalNum' },
         { t_width: '', t_props: 'nickName', t_label: '创建人', },
         { t_width: '', t_props: 'createTime', t_label: '创建日期', },
     ],
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
index 7418e4e6..a1cf0d83 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/home.vue
@@ -17,6 +17,9 @@
                     >
                 </el-row>
             </template>
+            <template slot-scope="{ data }" slot="totalNum">
+                {{ data.totalNum }}
+            </template>
 
             <!-- 列表操作栏 -->
             <template slot="handle" slot-scope="{ data }">