From 7d4bc7a281236c824559d48e5ec499d3cb25727d Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 8 Sep 2021 20:24:32 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E5=85=B3=E8=81=94=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/RevenueContractModule.vue         | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
index 161e48d..90cd0b8 100644
--- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
@@ -790,24 +790,32 @@ export default {
      * @param type
      */
     selectProjectTypeOk(type) {
-      let title = ''
       switch (type) {
         // 普通项目
         case 1:
           this.$refs.selectProjectModule.columns = generalProjectColumns
-          this.getUserDetailByUserId()
-          this.$refs.selectProjectModule.filters = {
-            chargeCompanyId: this.selectedCompany.id,
-              pack: this.model.pack,
-            // contractId: this.contractId
-          }
-          this.$refs.selectProjectModule.url.list = this.url.generalProjectList
-          title = '普通项目列表'
-          this.$refs.selectProjectModule.pack = this.model.pack
-          this.$refs.selectProjectModule.contractId = this.model.id
-          this.$refs.selectProjectModule.projectType = type
-          this.$refs.selectProjectModule.title = title
-          this.$refs.selectProjectModule.open()
+          this.getUserDetailByUserId().then(res => {
+            console.log(res)
+            // 混入筛选条件
+            this.$refs.selectProjectModule.filters = {
+              chargeCompanyId: this.selectedCompany.id,
+              contractId: this.contractId,
+              departId: res.split(',')[0]
+            }
+            this.$refs.selectProjectModule.queryParam.departId = res.split(',')
+            // 获取数据list
+            this.$refs.selectProjectModule.url.list = this.url.generalProjectList
+            // 打包状态
+            this.$refs.selectProjectModule.pack = this.model.pack
+            // 合同id
+            this.$refs.selectProjectModule.contractId = this.model.id
+            // 项目类型
+            this.$refs.selectProjectModule.projectType = type
+            // 标题
+            this.$refs.selectProjectModule.title = '普通项目列表'
+            // 打开弹窗
+            this.$refs.selectProjectModule.open()
+          })
           break
         // 工作组项目
         case 2:
@@ -819,9 +827,8 @@ export default {
           this.$refs.selectProjectModule.pack = this.model.pack
           this.$refs.selectProjectModule.contractId = this.model.id
           this.$refs.selectProjectModule.projectType = type
-          this.$refs.selectProjectModule.title = title
+          this.$refs.selectProjectModule.title = '工作组项目列表'
           this.$refs.selectProjectModule.open()
-          title = '工作组项目列表'
           break
         // 会议项目
         case 3:
@@ -842,8 +849,10 @@ export default {
       let param = {
         id: this.model.principalId
       }
-      queryUserByDepartId(param).then(res => {
-        console.log(res)
+      return new Promise(resolve => {
+        queryUserByDepartId(param).then(res => {
+          resolve(res.result[0].departIds)
+        })
       })
     },
     /**