From 8fffbb4c675ca667bc0a6eaec6cfaddf531ca526 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 13 Jun 2024 14:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=86=E6=96=99=E6=97=B6?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=20?=
 =?UTF-8?q?=E5=B9=B6=E8=BF=87=E6=BB=A4=E5=87=BA=E6=8C=87=E5=AE=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9C=BA=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking.vue    | 26 ++++++++++++++++---
 sgzb-ui/vue.config.js                         |  4 +--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index 3f7ea4b1..62d806ac 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -54,8 +54,15 @@
                         style="width: 240px"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="设备类型">
-                    <el-select>
+                <el-form-item label="设备类型" prop="selDeviceTypeChangeValue">
+                    <el-select
+                        @change="selDeviceTypeChange"
+                        style="width: 240px"
+                        v-model="selDeviceTypeChangeValue"
+                        :disabled="leaseApplyDetails.length > 0"
+                        placeholder="请选择设备类型"
+                        clearable
+                    >
                         <el-option label="机具设备" value="101"></el-option>
                         <el-option label="调试设备" value="102"></el-option>
                     </el-select>
@@ -63,7 +70,7 @@
                 <el-form-item label="物品类型" prop="status">
                     <el-cascader
                         placeholder="请输入物品类型"
-                        :options="deviceTypeTree"
+                        :options="deviceTypeTreeNew"
                         :props="deviceTypeTreeProps"
                         v-model="deviceType"
                         @change="deviceTypeChange"
@@ -447,6 +454,8 @@ export default {
                     },
                 ],
             },
+            selDeviceTypeChangeValue: '',
+            deviceTypeTreeNew: [],
         }
     },
     mounted() {
@@ -813,6 +822,17 @@ export default {
 
             return template
         },
+
+        // 设备类型选择 过滤对应的数据
+        selDeviceTypeChange(val) {
+            console.log(val, '设备类型选择-----')
+
+            console.log(this.deviceTypeTree, '树形数据源--')
+
+            this.deviceTypeTreeNew = this.deviceTypeTree.filter(
+                (e) => e.companyId == val,
+            )
+        },
     },
 }
 </script>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index e52e86cc..b6509030 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
         // target: `http://10.40.92.51:28080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        // target: `http://10.40.92.138:28080`, //帅
-        target: `http://10.40.92.253:28080`, //福
+        target: `http://10.40.92.138:28080`, //帅
+        // target: `http://10.40.92.253:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;