Merge branch 'branch20211008' of http://10.10.10.43:9090/income_payments/income_payments_client into xuqiubangeng1026

 Conflicts:

	src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -502,6 +502,7 @@ export default {
         this.accountsReceivableNum = record.accountsReceivableAmount
         this.amountReceivedNum = record.amountReceived
         this.model = Object.assign({}, record)
+        this.getUserDetailByUserId()
         // 计算未收金额和赊账状态
         this.calculateOutstandingAmount()
         this.$nextTick(() => {
@@ -809,21 +810,16 @@ export default {
       switch (type) {
         // 普通项目
         case 1:
-          this.getUserDetailByUserId().then(res => {
-            this.departId = res
-            // 混入筛选条件
-            this.$refs.selectProjectModule.filters = {
-              chargeCompanyId: this.selectedCompany.id,
-              contractId: this.contractId,
-              departId: this.departId // 一个用户多部门情况下传给后端第一个部门id
-            }
-            // 获取负责人列表
-            this.$refs.selectProjectModule.departChange(this.departId)
-            // 打开弹窗
-            this.$refs.selectProjectModule.open()
-          }).catch((err) => {
-            this.$message.warn(err)
-          })
+          // 混入筛选条件
+          this.$refs.selectProjectModule.filters = {
+            chargeCompanyId: this.selectedCompany.id,
+            contractId: this.contractId
+            // departId: this.departId // 一个用户多部门情况下传给后端第一个部门id
+          }
+          // 获取负责人列表
+          this.$refs.selectProjectModule.departChange(this.departId)
+          // 打开弹窗
+          this.$refs.selectProjectModule.open()
           break
         // 工作组项目
         case 2:
@@ -858,14 +854,12 @@ export default {
       let param = {
         id: this.model.principalId
       }
-      return new Promise((resolve, reject) => {
-        queryUserByDepartId(param).then(res => {
-          if (res.success) {
-            resolve(res.result[0].departIds)
-          } else {
-            reject(res.message)
-          }
-        })
+      queryUserByDepartId(param).then(res => {
+        if (res.success) {
+          this.departId = res.result[0].departIds
+        } else {
+          console.log(res.message)
+        }
       })
     },
     /**