From cbaec067a0450c1560043869d58a76ba03c39313 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 15 Jul 2024 14:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/picking/outbound/index.vue | 27 +++++++++++++++----
 sgzb-ui/src/views/stquery/projUsingRecord.vue | 19 ++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index aff91a59..ef365f6c 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -24,6 +24,7 @@
                     placeholder="请选择单位名称"
                     clearable
                     filterable
+                    @change="unitChange"
                 >
                     <el-option
                         v-for="item in unitList"
@@ -265,6 +266,13 @@
                     prop="typeModelName"
                     :show-overflow-tooltip="true"
                 />
+                <el-table-column
+                    label="工程"
+                    align="center"
+                    :show-overflow-tooltip="true"
+                >
+                    {{ detailsProName }}
+                </el-table-column>
                 <el-table-column
                     label="待出库数量"
                     align="center"
@@ -766,6 +774,8 @@ export default {
                 outerVisible: false,
                 center: true,
             },
+            // 弹框内工程名称
+            detailsProName: '',
         }
     },
 
@@ -790,10 +800,9 @@ export default {
             })
         },
         //获取单位
-        getProList() {
-            getProData().then((response) => {
-                this.proList = response.data
-            })
+        async getProList(id) {
+            const { data: res } = await getProData({ id })
+            this.proList = res
         },
         getTypeList() {
             getTypeList({ level: '3' }).then((response) => {
@@ -838,6 +847,7 @@ export default {
         resetQuery() {
             this.resetForm('queryForm')
             this.handleQuery()
+            this.getProList()
         },
         /** 查询列表 */
         getList() {
@@ -850,11 +860,12 @@ export default {
         },
         //查看按钮
         handleView(row) {
+            this.detailsProName = row.proName
             this.openLeaseDevices = true
             this.isView = true
             this.dialogQuery.id = row.id
             this.resetDialogQuery()
-            // this.getDialogList();
+            this.getDialogList()
         },
         /** 查询列表 */
         getDialogList() {
@@ -874,6 +885,7 @@ export default {
         },
         /** 出库按钮操作 */
         handleOut(row) {
+            this.detailsProName = row.proName
             this.openLeaseDevices = true
             this.isView = false
             this.dialogQuery.id = row.id
@@ -1071,6 +1083,11 @@ export default {
         handlePrinting() {
             this.$refs.remarksPrintRef.print()
         },
+
+        // 单位名称选择后 获取对应的工程
+        unitChange(val) {
+            this.getProList(val)
+        },
     },
 }
 </script>
diff --git a/sgzb-ui/src/views/stquery/projUsingRecord.vue b/sgzb-ui/src/views/stquery/projUsingRecord.vue
index 029502a4..8f83e8da 100644
--- a/sgzb-ui/src/views/stquery/projUsingRecord.vue
+++ b/sgzb-ui/src/views/stquery/projUsingRecord.vue
@@ -16,6 +16,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
+                    style="width: 240px"
                 >
                 </el-date-picker>
             </el-form-item>
@@ -24,7 +25,7 @@
                     v-model="queryParams.unitId"
                     filterable
                     clearable
-                    @change="GetProData"
+                    @change="unitChange"
                     style="width: 240px"
                     placeholder="请选择"
                 >
@@ -42,7 +43,6 @@
                     v-model="queryParams.proId"
                     filterable
                     clearable
-                    @change="GetUnitData"
                     style="width: 240px"
                     placeholder="请选择"
                 >
@@ -290,13 +290,9 @@ export default {
             console.log('GetUnitData ======================', res)
         },
         // 获取 工程名称 列表数据
-        async getProList() {
-            const params = {
-                id: this.queryParams.unitId,
-            }
-            const res = await getProData(params)
-            this.proList = res.data
-            console.log('GetProData ======================', res)
+        async getProList(id) {
+            const { data: res } = await getProData({ id })
+            this.proList = res
         },
 
         // 表单重置
@@ -317,6 +313,7 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
+            this.getProList()
             this.queryParams.time = []
             this.queryParams.unitId = ''
             this.queryParams.proId = ''
@@ -334,6 +331,10 @@ export default {
                 `综合查询_退料记录_${new Date().getTime()}.xlsx`,
             )
         },
+        // 单位名称选择后 获取对应的工程
+        unitChange(val) {
+            this.getProList(val)
+        },
     },
 }
 </script>