From 7e37debfb146c567e34281d794051c635fe1ae9e Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 17 Jul 2025 18:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/home1.vue         |  2 +-
 .../claimAndreturn/picking/outbound/index.vue | 56 ++++++++++++++-----
 .../return/receive/component/addReturn1.vue   |  6 ++
 3 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/views/claimAndreturn/picking/apply/component/home1.vue b/src/views/claimAndreturn/picking/apply/component/home1.vue
index 87ca225..d373d15 100644
--- a/src/views/claimAndreturn/picking/apply/component/home1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/home1.vue
@@ -8,7 +8,7 @@
             v-show="showSearch"
             label-width="80px"
         >
-            <el-form-item label="申请日期">
+            <el-form-item label="申请日期1">
                 <el-date-picker
                     v-model="queryParams.time"
                     type="daterange"
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 7db7113..4a62a62 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -12,12 +12,12 @@
         />
       </el-form-item>
       <el-form-item label="单位名称" prop="unitId">
-        <el-select v-model="queryParams.unitId" placeholder="请选择单位名称" clearable>
+        <el-select v-model="queryParams.unitId" placeholder="请选择单位名称"  @change="GetProData" clearable>
           <el-option v-for="item in unitList" filterable :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工程名称" prop="proId">
-        <el-select v-model="queryParams.proId" filterable clearable placeholder="请选择工程名称">
+        <el-select v-model="queryParams.proId" filterable clearable placeholder="请选择工程名称" @change="GetUnitData">
           <el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -671,10 +671,12 @@ export default {
   },
   created() {
     this.getTypeList()
-    this.getUnitList()
-    this.getProList()
+    // this.getUnitList()
+    // this.getProList()
     this.equipmentType()
     this.getList()
+    this.GetUnitData()
+    this.GetProData()
   },
   computed: {
     formattedOutTime() {
@@ -708,17 +710,37 @@ export default {
       return "";
     },
     //获取单位
-    getUnitList() {
-      getUnitData().then((response) => {
-        this.unitList = response.data
-      })
-    },
-    //获取单位
-    getProList() {
-      getProData().then((response) => {
-        this.proList = response.data
-      })
-    },
+    // getUnitList() {
+    //   getUnitData().then((response) => {
+    //     this.unitList = response.data
+    //   })
+    // },
+    // //获取单位
+    // getProList() {
+    //   getProData().then((response) => {
+    //     this.proList = response.data
+    //   })
+    // },
+
+      // 获取 来往单位 列表数据
+      async GetUnitData() {
+          const params = {
+              id: this.queryParams.proId,
+          }
+          const res = await getUnitData(params)
+          this.unitList = res.data
+          console.log('GetUnitData ======================', res)
+      },
+      // 获取 工程名称 列表数据
+      async GetProData() {
+          const params = {
+              id: this.queryParams.unitId,
+          }
+          const res = await getProData(params)
+          this.proList = res.data
+          console.log('GetProData ======================', res)
+      },
+
     getTypeList() {
       getTypeList({ level: '3' }).then((response) => {
         this.typeList = response.data
@@ -756,6 +778,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
+      this.queryParams.unitId = ''
+      this.queryParams.proId = ''
+      this.GetUnitData()
+      this.GetProData()
       this.handleQuery()
     },
     /** 查询列表 */
diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
index 0dc7e54..47bbf53 100644
--- a/src/views/claimAndreturn/return/receive/component/addReturn1.vue
+++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
@@ -88,6 +88,7 @@
                             placeholder="请选择规格型号"
                             ref="deviceTypeCascader"
                             popper-class="popper-select"
+                            popper-append-to-body="false"
                             @change="deviceTypeChange"
                         ></el-cascader>
                 </el-form-item>
@@ -556,6 +557,7 @@ export default {
             deviceTypeTree: [], // 设备 树结构数据
             // 设备 树显示 配置
             deviceTypeTreeProps: {
+                checkStrictly: true, 
                 children: 'children',
                 label: 'typeName',
                 multiple: false,
@@ -659,6 +661,7 @@ export default {
         ...mapState(['user']),
     },
     methods: {
+
         // 获取 来往单位 列表数据
         async GetUnitData() {
             const params = {
@@ -1176,6 +1179,7 @@ export default {
                 // }
                 // console.log('🚀 ~ deviceTypeChange ~ this.selectParams:', this.selectParams)
                 this.getMaTypeDataByIdFun(val[val.length-1])
+
             })
             // console.log(val, '*******************')
 
@@ -1453,4 +1457,6 @@ export default {
     display: block !important;
   }
 }
+
+
 </style>