diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index 83f4313..cd88f6d 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -44,9 +44,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select placeholder="请选择已提醒"
-                        v-model="queryParam.remind"
-                        :maxLength='50'
-                        @change="e => {e.target.value = (e.target.value + '').trim()}">
+                        v-model="queryParam.remind">
                 <a-select-option v-for="item in list" :key="item.id" :value="item.id">{{ item.username }}
                 </a-select-option>
               </a-select>
diff --git a/src/views/projectManagement/MemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
similarity index 50%
rename from src/views/projectManagement/MemberUnitMaintenance.vue
rename to src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 5e13b92..5a91832 100644
--- a/src/views/projectManagement/MemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -2,42 +2,49 @@
   <div>
     <page-header-title :is-level-one="false" :level-two-title="workingGroupProject"></page-header-title>
     <a-card :bordered="false">
-      <div class="part-title"><div class="part-title-text">工作组信息</div></div>
-      <!--    工作组信息区域-->
-      <div class="work-group-detail">
-        <div class="work-group-detail-item work-group-detail-item-small"
-             v-for="item in detailTitleList"
-             :key="item.title">
-          <div class="work-group-detail-item-title">{{ item.title }}:</div>
-          <div class="work-group-detail-item-content" v-if="item.fieldName === 'chargeNoticeAId' || item.fieldName === 'chargeNoticeBId'">
-            {{ workingGroupDetail[item.fieldName] }}
-          </div>
-          <div class="work-group-detail-item-content" v-else>{{ workingGroupDetail[item.fieldName] }}</div>
-        </div>
-        <div class="work-group-detail-item">
-          <div class="work-group-detail-item-title">任务及目标:</div>
-          <div class="work-group-detail-item-content">{{ workingGroupDetail.missionAndObjectives }}</div>
-        </div>
-        <div class="work-group-detail-item">
-          <div class="work-group-detail-item-title">备注:</div>
-          <div class="work-group-detail-item-content">{{ workingGroupDetail.remarks }}</div>
-        </div>
+      <div class="part-title">
+        <div class="part-title-text">工作组信息</div>
       </div>
+      <!--    工作组信息区域-->
+      <a-spin :spinning="loading">
+        <div class="work-group-detail">
+          <div class="work-group-detail-item work-group-detail-item-small"
+               v-for="item in detailTitleList"
+               :key="item.title">
+            <div class="work-group-detail-item-title">{{ item.title }}:</div>
+            <div class="work-group-detail-item-content"
+                 v-if="item.fieldName === 'chargeNoticeAId' || item.fieldName === 'chargeNoticeBId'">
+              {{ workingGroupDetail[item.fieldName] }}
+            </div>
+            <div class="work-group-detail-item-content" v-else>{{ workingGroupDetail[item.fieldName] }}</div>
+          </div>
+          <div class="work-group-detail-item">
+            <div class="work-group-detail-item-title">任务及目标:</div>
+            <div class="work-group-detail-item-content">{{ workingGroupDetail.missionAndObjectives }}</div>
+          </div>
+          <div class="work-group-detail-item">
+            <div class="work-group-detail-item-title">备注:</div>
+            <div class="work-group-detail-item-content">{{ workingGroupDetail.remarks }}</div>
+          </div>
+        </div>
+      </a-spin>
       <!--    /工作组信息区域-->
 
       <!--    查询区域-->
-      <div class="part-title"><div class="part-title-text">成员信息</div></div>
+      <div class="part-title">
+        <div class="part-title-text">成员信息</div>
+      </div>
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="成员单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入成员单位" v-model="queryParam.workingGroupProject"></a-input>
+                <a-input placeholder="请输入成员单位" v-model="queryParam.chargeCompanyTemporaryName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-year-date style="width:100%" placeholder="请选择年份" v-model="queryParam.year"></j-year-date>
+                <j-year-date style="width:100%" placeholder="请选择年份" v-model="queryParam.paymentDate"></j-year-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -58,10 +65,10 @@
                   @change="handleImportExcel">
           <a-button type="primary" icon="import">导入</a-button>
         </a-upload>
-        <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
-        <a-button type="primary" icon="download" @click="downTemplate('企业管理导入模板')">下载模板</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('工作组成员')">导出</a-button>
+        <a-button type="primary" icon="download" @click="downTemplate('工作组成员导入模板')">下载模板</a-button>
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
-        <a-button type="primary" @click="">设置收费通知</a-button>
+        <a-button type="primary" @click="setChargeNotic">设置收费通知</a-button>
       </div>
       <!--    /操作按钮区域-end-->
 
@@ -81,23 +88,35 @@
             @change="handleTableChange"
             class="j-table-force-nowrap">
 
-          <!--        工作组名称-->
-          <!--        <template slot="projectName" slot-scope="text, record">-->
-          <!--          <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>-->
-          <!--        </template>-->
+          <!--          工作组名称-->
+          <template slot="projectName" slot-scope="text, record">
+            <div class="primary-color" @click="openDetailModal(record)">{{ text }}</div>
+          </template>
+
+          <!--        打包、需要发票、到账、开票、邮寄状态-->
+          <template slot="status" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          </template>
+
+          <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          </template>
 
           <template slot="text" slot-scope="text,record">
             <j-ellipsis :value="text" :length="20"></j-ellipsis>
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="goConferenceMaintenance(record)">会议维护</a>
-          <a @click="handleEdit(record)">编辑</a>
-          <a @click="handleDelete(record.id)">删除</a>
-        </span>
+            <a @click="handleEdit(record)">编辑</a>
+            <a @click="handleDelete(record.id)">删除</a>
+          </span>
         </a-table>
       </div>
     </a-card>
+
+    <project-detail-modal ref="projectDetail"></project-detail-modal>
+    <working-group-member-unit-module ref="modalForm" @ok="modalFormOk"></working-group-member-unit-module>
+    <working-group-member-set-charge-notice ref="setChargeNotic"></working-group-member-set-charge-notice>
   </div>
 </template>
 
@@ -106,10 +125,21 @@ import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JYearDate from '@comp/jero/JYearDate'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import { getWorkingGroupById } from '@api/incomePaymentsApi'
+import StatusSlot from '../../components/tools/StatusSlot'
+import ProjectDetailModal from '../../components/ProjectDetailModal'
+import WorkingGroupMemberUnitModule from './modules/WorkingGroupMemberUnitModule'
+import WorkingGroupMemberSetChargeNotice from './modules/WorkingGroupMemberSetChargeNotice'
 
 export default {
-  name: 'MemberUnitMaintenance',
-  components: { JYearDate, PageHeaderTitle },
+  name: 'WorkingGroupMemberUnitMaintenance',
+  components: {
+    JYearDate,
+    PageHeaderTitle,
+    StatusSlot,
+    ProjectDetailModal,
+    WorkingGroupMemberUnitModule,
+    WorkingGroupMemberSetChargeNotice
+  },
   mixins: [JeroListMixin],
   computed: {
     importExcelUrl: function () {
@@ -166,12 +196,12 @@ export default {
         sm: { span: 10 }
       },
       url: {
-        list: '',
-        delete: '',
-        deleteBatch: '',
-        exportXlsUrl: '',
-        importExcelUrl: '',
-        downTemplateUrl: ''
+        list: '/project/payWorkingGroupSubitem/list',
+        delete: '/project/payWorkingGroupSubitem/delete',
+        deleteBatch: '/project/payWorkingGroupSubitem/deleteBatch',
+        exportXlsUrl: '/project/payWorkingGroupSubitem/exportXls',
+        importExcelUrl: '/project/payWorkingGroupSubitem/importExcel',
+        downTemplateUrl: '/project/payWorkingGroupSubitem/downloadExcelModel'
       },
       columns: [
         {
@@ -186,49 +216,53 @@ export default {
         }, {
           title: '成员单位',
           align: 'center',
-          dataIndex: 'workingGroupProject',
+          dataIndex: 'chargeCompanyTemporaryName',
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '企业联系人',
           align: 'center',
           width: 180,
-          dataIndex: 'principalNameA'
+          dataIndex: 'contactsTemporaryNameOne'
         }, {
           title: '应收金额',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'receivableAmount',
           width: 180
         }, {
           title: '实收金额',
           align: 'center',
-          dataIndex: '',
+          dataIndex: 'paidAmount',
           width: 180
-        }, {
+        }, , {
           title: '打包',
           align: 'center',
-          width: 100,
-          dataIndex: 'packaging'
+          width: 80,
+          dataIndex: 'pack',
+          scopedSlots: { customRender: 'status-pack' }
         }, {
           title: '需要发票',
           align: 'center',
-          width: 100,
-          dataIndex: 'invoice',
-          scopedSlots: { customRender: 'icon' }
+          width: 80,
+          dataIndex: 'needInvoice',
+          scopedSlots: { customRender: 'status-pack' }
         }, {
           title: '到账',
           align: 'center',
-          width: 100,
-          dataIndex: 'inAccount'
+          width: 80,
+          dataIndex: 'inAccount',
+          scopedSlots: { customRender: 'status' }
         }, {
           title: '开票',
           align: 'center',
-          width: 100,
-          dataIndex: 'makeInvoice'
+          width: 80,
+          dataIndex: 'makeInvoice',
+          scopedSlots: { customRender: 'status' }
         }, {
           title: '邮寄',
           align: 'center',
-          width: 100,
-          dataIndex: 'mail'
+          width: 80,
+          dataIndex: 'mail',
+          scopedSlots: { customRender: 'status' }
         }, {
           title: '操作',
           dataIndex: 'action',
@@ -238,7 +272,8 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
-      workingGroupDetail: {}
+      workingGroupDetail: {},
+      chargeNoticeList: [] // 收费通知号选项
     }
   },
   created() {
@@ -252,12 +287,74 @@ export default {
     initWorkGruopData() {
       this.workingGroupProject = this.$route.query.workingGroupProject
       this.workingGroupProjectId = this.$route.query.workingGroupProjectId
+      this.filters.workingGroupId = this.workingGroupProjectId
+      this.loadData()
       let param = {
         id: this.workingGroupProjectId
       }
       getWorkingGroupById(param).then(res => {
         this.workingGroupDetail = res.result
       })
+    },
+    handleAdd: function () {
+      this.getChargeNoticeList()
+      this.$refs.modalForm.workingGroupId = this.workingGroupProjectId
+      this.$refs.modalForm.chargeNoticeList = this.chargeNoticeList
+      this.$refs.modalForm.add()
+      this.$refs.modalForm.title = '添加成员'
+      this.$refs.modalForm.disableSubmit = false
+    },
+    handleEdit: function (record) {
+      this.getChargeNoticeList()
+      this.$refs.modalForm.chargeNoticeList = this.chargeNoticeList
+      this.$refs.modalForm.edit(record)
+      this.$refs.modalForm.title = '编辑'
+      this.$refs.modalForm.disableSubmit = false
+    },
+    getChargeNoticeList() {
+      this.chargeNoticeList = []
+      let chargeNoticeA, chargeNoticeB
+      if (this.workingGroupDetail.chargeNoticeNoA && this.workingGroupDetail.chargeNoticeNoA !== '') {
+        chargeNoticeA = {
+          type: 'chargeNoticeA',
+          label: `A：${ this.workingGroupDetail.chargeNoticeNoA }`,
+          value: this.workingGroupDetail.chargeNoticeNoA,
+          yearCharge: this.workingGroupDetail.yearChargeA,
+          chargeNoticeId: this.workingGroupDetail.chargeNoticeAId
+        }
+      }
+      if (this.workingGroupDetail.chargeNoticeNoB && this.workingGroupDetail.chargeNoticeNoB !== '') {
+        chargeNoticeB = {
+          type: 'chargeNoticeB',
+          label: `B：${ this.workingGroupDetail.chargeNoticeNoB }`,
+          value: this.workingGroupDetail.chargeNoticeNoB,
+          yearCharge: this.workingGroupDetail.yearChargeB,
+          chargeNoticeId: this.workingGroupDetail.chargeNoticeBId
+        }
+      }
+      if (chargeNoticeA && chargeNoticeA.hasOwnProperty('value')) {
+        this.chargeNoticeList.push(chargeNoticeA)
+      }
+      if (chargeNoticeB && chargeNoticeB.hasOwnProperty('value')) {
+        this.chargeNoticeList.push(chargeNoticeB)
+      }
+    },
+    /**
+     * 设置收费通知
+     */
+    setChargeNotic() {
+      if (!this.workingGroupDetail.chargeNoticeNoA && !this.workingGroupDetail.chargeNoticeNoB) {
+        this.$message.warn('请先补充该工作组的收费通知信息')
+        return
+      }
+      if (this.selectedRowKeys.length === 0) {
+        this.$message.warn('请先选择成员')
+        return
+      }
+      this.getChargeNoticeList()
+      this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList
+      this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys
+      this.$refs.setChargeNotic.handleOpen()
     }
   }
 }
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index b0242e1..800727a 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -74,7 +74,7 @@
 
           <!--        工作组名称-->
           <template slot="projectName" slot-scope="text, record">
-            <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
+            <div class="primary-color" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
           </template>
 
           <!--        进度-->
@@ -161,17 +161,6 @@ export default {
           width: 180,
           scopedSlots: { customRender: 'action' }
         }
-      ],
-      dataSource: [
-        {
-          id: 1,
-          workingGroupProject: '2021标准工作组',
-          post: {
-            payInFull: 10,
-            partialPayment: 8,
-            nonPayment: 12
-          }
-        }
       ]
     }
   },
@@ -191,7 +180,7 @@ export default {
     },
     goMemberUnitMaintenance(record) {
       this.$router.push({
-        path: '/projectManagement/MemberUnitMaintenance',
+        path: '/projectManagement/WorkingGroupMemberUnitMaintenance',
         query: {
           workingGroupProject: record.workingGroupProject,
           workingGroupProjectId: record.id
@@ -205,14 +194,6 @@ export default {
 <style scoped lang="less">
 @import '~@assets/less/common.less';
 
-.project-name {
-  color: #069f99;
-
-  &:hover {
-    cursor: pointer;
-  }
-}
-
 .tooltip {
   float: right;
   width: auto;
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 1f41415..5596f06 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -58,7 +58,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <select-contacts :selected-company="selectedCompany"
-                             :initf-contacts="selectedContact"
+                             :init-contacts="selectedContact"
                              placeholder="请选择联系人"
                              v-decorator="['contactsId',validatorRules.contactsId]"
                              :maxLength='50'
@@ -69,7 +69,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <select-contacts :selected-company="selectedCompany"
-                             :initf-contacts="selectedMailContact"
+                             :init-contacts="selectedMailContact"
                              placeholder="请选择邮寄联系人"
                              v-decorator="['mailContactsId',validatorRules.mailContactsId]"
                              :maxLength='50'
@@ -132,7 +132,12 @@
         </a-col>
         <a-col :xl="12" :sm="24">
           <a-form-item label="收费通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-upload :number="1" file-type="word,pdf" v-decorator="['chargeNoticeId', validatorRules.chargeNoticeId]"
+            <j-upload file-type="pdf"
+                      file-type-error-message="请pdf文件"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeId', validatorRules.chargeNoticeId]"
                       :trigger-change="true"></j-upload>
           </a-form-item>
         </a-col>
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
new file mode 100644
index 0000000..c1e8ede
--- /dev/null
+++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue
@@ -0,0 +1,146 @@
+<template>
+  <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      switchFullscreen
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="关闭">
+    <a-form :form="form">
+      <a-form-item label="收费通知号" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+        <a-radio-group v-decorator="['chargeNoticeNo']" @change="handleChargeNoticeChange"
+                       :options="chargeNoticeList"></a-radio-group>
+      </a-form-item>
+      <a-row v-if="selectedChargeNotice === 'A'">
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="本年应收款A" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入本年应收款A"
+                     v-decorator="['receivableAmount']"
+                     :maxLength='50'
+                     @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="收费通知A" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-upload file-type="pdf"
+                      file-type-error-message="请上传收费通知"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeId']"
+                      :trigger-change="true"></j-upload>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row v-if="selectedChargeNotice === 'B'">
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="本年应收款B" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入本年应收款A"
+                     v-decorator="['receivableAmount']"
+                     :maxLength='50'
+                     @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-upload file-type="pdf"
+                      file-type-error-message="请上传收费通知"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeId']"
+                      :trigger-change="true"></j-upload>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import JUpload from '../../../components/jero/JUpload'
+
+export default {
+  name: 'WorkingGroupMemberSetChargeNotice',
+  components: { JUpload },
+  data() {
+    return {
+      title: '设置收费通知',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      },
+      remarksLabelCol: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      remarksWrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
+      selectedRowKeys: null, // 选中项目的id
+      chargeNoticeList: null, // 收费通知列表
+      selectedChargeNotice: null // 选中的收费通知类型
+    }
+  },
+  methods: {
+    handleOpen() {
+      this.visible = true
+    },
+    handleOk() {
+
+    },
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.visible = false
+    },
+    /**
+     * 收费通知号变化, 回显本年应收款和文件
+     */
+    handleChargeNoticeChange(e) {
+      let chargeNoticeNo = e.target.value
+      this.pickChargeNoticeType(chargeNoticeNo)
+    },
+    /**
+     * 匹配显隐
+     * @param value
+     */
+    pickChargeNoticeType(value) {
+      this.chargeNoticeList.forEach(item => {
+        if (item.value === value) {
+          if (item.type === 'chargeNoticeA') {
+            this.selectedChargeNotice = 'A'
+            this.model.receivableAmount = item.yearCharge
+            this.model.chargeNoticeId = item.chargeNoticeId
+          } else {
+            this.selectedChargeNotice = 'B'
+            this.model.receivableAmount = item.yearCharge
+            this.model.chargeNoticeId = item.chargeNoticeId
+          }
+        }
+      })
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'receivableAmount', 'chargeNoticeId'))
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
new file mode 100644
index 0000000..1c316ca
--- /dev/null
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -0,0 +1,426 @@
+<template>
+  <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      switchFullscreen
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="关闭">
+    <a-form :form="form">
+      <a-row>
+        <a-col>
+          <a-form-item label="成员单位" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+            <company-select placeholder="请选择成员单位"
+                            v-decorator="['chargeCompany',validatorRules.chargeCompany]"
+                            @change="companyChange"
+                            :maxLength='50'>
+            </company-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="企业联系人1" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <select-contacts :selected-company="selectedCompany"
+                             :init-contacts="selectedContact1"
+                             placeholder="请选择企业联系人1"
+                             v-decorator="['contactsIdOne',validatorRules.contactsIdOne]"
+                             :maxLength='50'
+                             ref="selectContacts1"
+                             @ok="addContactsOk"></select-contacts>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="企业联系人2" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <select-contacts :selected-company="selectedCompany"
+                             :init-contacts="selectedContact2"
+                             placeholder="请选择企业联系人2"
+                             v-decorator="['contactsIdTwo']"
+                             :maxLength='50'
+                             ref="selectContacts2"
+                             @ok="addContactsOk"></select-contacts>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="企业联系人3" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <select-contacts :selected-company="selectedCompany"
+                             :init-contacts="selectedContact3"
+                             placeholder="请选择企业联系人3"
+                             v-decorator="['contactsIdThree']"
+                             :maxLength='50'
+                             ref="selectContacts3"
+                             @ok="addContactsOk"></select-contacts>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <select-contacts :selected-company="selectedCompany"
+                             :init-contacts="selectedMailContact"
+                             placeholder="请选择邮寄联系人"
+                             v-decorator="['mailContactsId',validatorRules.mailContactsId]"
+                             :maxLength='50'
+                             ref="selectMailContacts"
+                             @ok="addContactsOk"></select-contacts>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange">
+              <a-radio :value="1">无</a-radio>
+              <a-radio :value="2">合同</a-radio>
+              <a-radio :value="3">收费通知</a-radio>
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24" v-if="chargeWayType === 3">
+          <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-radio-group v-decorator="['chargeNoticeNo',validatorRules.chargeNoticeNo]" @change="handleChargeNoticeChange" :options="chargeNoticeList">
+            </a-radio-group>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row v-if="chargeWayType === 2">
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-row>
+              <a-col :span="20">
+                <a-input placeholder="请输入应收金额"
+                         v-decorator="['receivableAmount',validatorRules.receivableAmount]"
+                         :maxLength='50'
+                         @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+              </a-col>
+              <a-col :span="1">元</a-col>
+            </a-row>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入合同号"
+                     v-decorator="['contractNum',validatorRules.contractNum]"
+                     :maxLength='50'
+                     @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row v-if="chargeWayType === 3 && selectedChargeNotice === 'A'">
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="本年应收款A" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入本年应收款A"
+                     v-decorator="['receivableAmount',validatorRules.receivableAmount]"
+                     :maxLength='50'
+                     @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="收费通知A" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-upload file-type="pdf"
+                      file-type-error-message="请上传收费通知"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeId']"
+                      :trigger-change="true"></j-upload>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row v-if="chargeWayType === 3 && selectedChargeNotice === 'B'">
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="本年应收款B" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-input placeholder="请输入本年应收款A"
+                     v-decorator="['receivableAmount',validatorRules.receivableAmount]"
+                     :maxLength='50'
+                     @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-upload file-type="pdf"
+                      file-type-error-message="请上传收费通知"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeId']"
+                      :trigger-change="true"></j-upload>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :xl="12" :sm="24">
+          <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-dict-select-tag v-decorator="['needInvoice',validatorRules.needInvoice]"
+                               :maxLength='50'
+                               :triggerChange="true"
+                               placeholder="请选择发票类型"
+                               dictCode="invoice_type"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col>
+          <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+            <a-textarea
+                placeholder="请输入备注"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
+                v-decorator="['remarks']"
+                :maxLength='200'
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { httpAction } from '@api/manage'
+import JYearDate from '@comp/jero/JYearDate'
+import JUpload from '@comp/jero/JUpload'
+import CompanySelect from '@comp/company/CompanySelect'
+import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
+import SelectContacts from '@comp/company/SelectContacts'
+
+export default {
+  name: 'WorkingGroupMemberUnitModule',
+  components: { JYearDate, JUpload, CompanySelect, ContactManagementModule, SelectPrincipal, SelectContacts },
+  data() {
+    return {
+      title: '操作',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      },
+      remarksLabelCol: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      remarksWrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
+      validatorRules: {
+        chargeCompany: {
+          rules: [{ required: true, message: '请选择成员单位' }],
+          validateTrigger: 'change'
+        },
+        contactsIdOne: {
+          rules: [{ required: true, message: '请选择企业联系人1' }],
+          validateTrigger: 'blur'
+        },
+        mailContactsId: {
+          rules: [{ required: true, message: '请选择邮寄联系人' }],
+          validateTrigger: 'blur'
+        },
+        chargeWay: {
+          rules: [{ required: true, message: '请选择来款方式' }],
+          validateTrigger: 'blur'
+        },
+        receivableAmount: {
+          rules: [{ required: true, message: '请输入应收金额' }],
+          validateTrigger: 'blur'
+        },
+        contractNum: {
+          rules: [{ required: true, message: '请输入合同号' }],
+          validateTrigger: 'blur'
+        },
+        chargeNoticeNo: {
+          rules: [{ required: true, message: '请输入收费通知号' }],
+          validateTrigger: 'blur'
+        },
+        needInvoice: {
+          rules: [{ required: true, message: '请选择发票类型' }],
+          validateTrigger: 'blur'
+        }
+      },
+      chargeWayType: null,
+      selectedCompany: null, // 当前选中的企业
+      selectedContact1: null, // 编辑时的联系人
+      selectedContact2: null, // 编辑时的联系人
+      selectedContact3: null, // 编辑时的联系人
+      selectedMailContact: null, // 编辑时的邮寄联系人
+      chargeNoticeList: [], // 收费通知号list
+      selectedChargeNotice: null, // 选中的收费通知号
+      workingGroupId: null,
+      url: {
+        add: '/project/payWorkingGroupSubitem/add',
+        edit: '/project/payWorkingGroupSubitem/edit'
+      }
+    }
+  },
+  methods: {
+    add() {
+      this.edit({})
+    },
+    edit(record) {
+      record.chargeCompany = {
+        id: record.chargeCompanyId,
+        companyName: record.chargeCompanyTemporaryName
+      }
+      // 回显选中的企业
+      this.selectedCompany = record.chargeCompany
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      if (this.model.id) {
+        this.selectedContact1 = {
+          id: this.model.contactsTemporaryIdOne,
+          name: this.model.contactsTemporaryNameOne
+        }
+        this.selectedContact2 = {
+          id: this.model.contactsTemporaryIdTwo,
+          name: this.model.contactsTemporaryNameTwo
+        }
+        this.selectedContact3 = {
+          id: this.model.contactsTemporaryIdThree,
+          name: this.model.contactsTemporaryNameThree
+        }
+        this.selectedMailContact = {
+          id: this.model.mailContactsTemporaryId,
+          name: this.model.mailContactsTemporaryName
+        }
+      }
+      this.chargeWayType = record.chargeWay
+      this.pickChargeNoticeType(record.chargeNoticeNo)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'chargeNoticeNo', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks'))
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.chargeWayType = null
+      this.selectedCompany = null
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.chargeCompanyTemporaryName = values.chargeCompany.companyName
+          values.chargeCompanyId = values.chargeCompany.id
+          let httpurl = ''
+          let method = 'post'
+          if (!this.model.id) {
+            httpurl += this.url.add
+          } else {
+            httpurl += this.url.edit
+          }
+          values.workingGroupId = this.workingGroupId
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          httpAction(httpurl, formData, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    /**
+     * 来款方式变化
+     * @param e
+     */
+    handlechargeWayChange(e) {
+      if (e.target.value === 3) {
+        if (this.chargeNoticeList.length === 0) {
+          this.$message.warn('请先补充该工作组的收费通知信息')
+          return
+        }
+      }
+      this.chargeWayType = e.target.value
+    },
+    /**
+     * 收费通知号变化, 回显本年应收款和文件
+     */
+    handleChargeNoticeChange(e) {
+      let chargeNoticeNo = e.target.value
+      this.pickChargeNoticeType(chargeNoticeNo)
+    },
+    /**
+     * 匹配显隐
+     * @param value
+     */
+    pickChargeNoticeType(value) {
+      this.chargeNoticeList.forEach(item => {
+        if (item.value === value) {
+          if (item.type === 'chargeNoticeA') {
+            this.selectedChargeNotice = 'A'
+            this.model.receivableAmount = item.yearCharge
+            this.model.chargeNoticeId = item.chargeNoticeId
+          } else {
+            this.selectedChargeNotice = 'B'
+            this.model.receivableAmount = item.yearCharge
+            this.model.chargeNoticeId = item.chargeNoticeId
+          }
+        }
+      })
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'receivableAmount', 'chargeNoticeId'))
+      })
+    },
+    /**
+     * 选中企业变化，将联系人的值清空
+     * @param value
+     */
+    companyChange(value) {
+      this.selectedCompany = value
+      this.model.contactsId = undefined
+      this.model.mailContactsId = undefined
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId'))
+      })
+    },
+    /**
+     * 企业必填校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkCompany(rules, value, callback) {
+      if (value.id && value.companyName) {
+        callback()
+        return
+      }
+      callback('请选择企业')
+    },
+    /**
+     * 在新增成功后重新获取联系人列表
+     */
+    addContactsOk() {
+      this.$refs.selectContacts1.getContactsList()
+      this.$refs.selectContacts2.getContactsList()
+      this.$refs.selectContacts3.getContactsList()
+      this.$refs.selectMailContacts.getContactsList()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
index 09416a1..d294467 100644
--- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
@@ -14,7 +14,7 @@
     </span>
     <a-form :form="form">
       <a-row>
-        <a-col :span="24" >
+        <a-col :span="24">
           <a-form-item label="工作组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
             <a-input placeholder="请输入项目名称"
                      v-decorator="['workingGroupProject',validatorRules.workingGroupProject]"
@@ -91,8 +91,12 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="收费通知A" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1" :return-id="true"
-                      bizPath="payment" v-decorator="['chargeNoticeAId']"
+            <j-upload file-type="pdf"
+                      file-type-error-message="请上传pdf文件"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeAId']"
                       :trigger-change="true"></j-upload>
           </a-form-item>
         </a-col>
@@ -123,8 +127,12 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="收费通知B" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1" :return-id="true"
-                      bizPath="payment" v-decorator="['chargeNoticeBId']"
+            <j-upload file-type="pdf"
+                      file-type-error-message="请上传pdf文件"
+                      :multiple="false"
+                      :return-id="true"
+                      bizPath="payment"
+                      v-decorator="['chargeNoticeBId']"
                       :trigger-change="true"></j-upload>
           </a-form-item>
         </a-col>
@@ -259,7 +267,7 @@ export default {
     },
     handleCancel() {
       this.close()
-    },
+    }
   }
 }
 </script>