Merge remote-tracking branch 'origin/master'

src/api/incomePaymentsApi.js

@@ -1,7 +1,10 @@
 import { getAction } from '@api/manage'
 
 const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/queryById', params)
+// 判断工作组成员是否设置来款通知
+const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param)
 
 export {
-	getWorkingGroupById
+	getWorkingGroupById,
+	getChargeNotice
 }

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -123,7 +123,7 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JYearDate from '@comp/jero/JYearDate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
-import { getWorkingGroupById } from '@api/incomePaymentsApi'
+import { getWorkingGroupById, getChargeNotice } from '@api/incomePaymentsApi'
 import StatusSlot from '../../components/tools/StatusSlot'
 import ProjectDetailModal from '../../components/ProjectDetailModal'
 import WorkingGroupMemberUnitModule from './modules/WorkingGroupMemberUnitModule'
@@ -353,10 +353,21 @@ export default {
         this.$message.warn('请先选择成员')
         return
       }
-      this.getChargeNoticeList()
+      let param = {
-      this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList
+        ids: this.selectedRowKeys.join(',')
-      this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys
+      }
-      this.$refs.setChargeNotic.handleOpen()
+      // 判断选中的成员是否存在来款方式非收费通知的
+      getChargeNotice(param).then(res => {
+        if (res.success) {
+          this.getChargeNoticeList()
+          this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList
+          this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys
+          this.$refs.setChargeNotic.handleOpen()
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+
     }
   }
 }