From 97bf1809b5cfecd4c43a82675977922cc0af1423 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 17 Jan 2025 10:51:05 +0800
Subject: [PATCH] =?UTF-8?q?1/17=20=E9=80=89=E5=85=A5=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=8A=A0=E5=85=A5=E9=83=A8=E9=97=A8=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/workplace/addCollectWorkplace.vue    | 18 +++++++++++++++---
 .../basic/workplace/cargowWorkplaceManage.vue  |  5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/basic/workplace/addCollectWorkplace.vue b/src/views/basic/workplace/addCollectWorkplace.vue
index 52b07622..803acd5f 100644
--- a/src/views/basic/workplace/addCollectWorkplace.vue
+++ b/src/views/basic/workplace/addCollectWorkplace.vue
@@ -86,6 +86,7 @@
 import { filterListByWorkplace, getWorkBindBusTypes } from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 import { bindCollect } from '@/api/basic/collectPoint/cargowWorkplaceManage'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   props: {
@@ -100,7 +101,11 @@ export default {
     collectWorks: {
       type: Array,
       required: true
-    }
+    },
+    deptCode: {
+      type: Object,
+      required: true
+    },
   },
   components: {},
   data() {
@@ -112,7 +117,9 @@ export default {
         documentTypeCode: null,
         workPlaceClass: 1,
         page: 1,
-        limit: 10
+        limit: 10,
+        deptCode: null
+
       },
       DeptList: [],
       list: [],
@@ -177,6 +184,9 @@ export default {
       this.rowList = row
     },
     getList() {
+      if (!isBlank(this.deptCode)){
+        this.query.deptCode = this.deptCode
+      }
       filterListByWorkplace(this.query).then(res => {
         if (res.code == 20000) {
           this.list = res.data.list
@@ -192,7 +202,8 @@ export default {
         workPlaceClass: 1,
         key: val,
         page: 1,
-        limit: 10
+        limit: 10,
+        deptCode : this.deptCode
       }
       filterWorkOptimize(query)
         .then((response) => {
@@ -257,6 +268,7 @@ export default {
     }
   },
   created() {
+    console.log("GYgY",this.deptCode)
     this.getList()
     this.findWorkPlace('')
     this.getWorkBindBusTypes('')
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index d38b3bcb..9173ec45 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -278,6 +278,7 @@
           @close=""
         >
           <addCollectWorkplace
+            :deptCode="deptCode"
             :workplaceId="workplaceId"
             :collectWorks="collectWorks"
             :closeDialog="closeDialog"
@@ -736,7 +737,8 @@ export default {
         // workplaceType: [
         //   { required: true, message: '请选择工位类型', trigger: 'blur' }
         // ]
-      }
+      },
+      deptCode: null,
 
     }
   },
@@ -903,6 +905,7 @@ export default {
         if (res.code != 20000) {
           return this.$message.error('获取失败')
         }
+        this.deptCode = this.rowData.deptCode
         this.collectList1 = res.data.list || []
         this.collectWorks = this.collectList1.map(item => item.collectAndTypeCodes)
         this.chooseCollectDialogVisible = true