diff --git a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
index f66c6fc..aa8e51a 100644
--- a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
+++ b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
@@ -146,12 +146,12 @@
 
     <project-detail-modal ref="projectDetail"></project-detail-modal>
     <drafting-group-member-unit-module ref="modalForm" @ok="modalFormOk"></drafting-group-member-unit-module>
-    <working-group-member-set-charge-notice ref="setChargeNotic"
-                                            @ok="modalFormOk"></working-group-member-set-charge-notice>
+    <drafting-group-member-set-charge-notice ref="setChargeNotic"
+                                            @ok="modalFormOk"></drafting-group-member-set-charge-notice>
 
     <email-error-msg-modal ref="emailError"></email-error-msg-modal>
 
-    <work-group-set-label ref="workGroupSetLabel" @ok="modalFormOk"></work-group-set-label>
+    <drafting-group-set-label ref="workGroupSetLabel" @ok="modalFormOk"></drafting-group-set-label>
   </div>
 </template>
 
@@ -163,11 +163,11 @@ import { getWorkingGroupById, dunningReminder } from '@api/incomePaymentsApi'
 import StatusSlot from '../../components/tools/StatusSlot'
 import ProjectDetailModal from '../../components/ProjectDetailModal'
 import DraftingGroupMemberUnitModule from './modules/DraftingGroupMemberUnitModule'
-import WorkingGroupMemberSetChargeNotice from './modules/WorkingGroupMemberSetChargeNotice'
+import DraftingGroupMemberSetChargeNotice from './modules/DraftingGroupMemberSetChargeNotice'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '../../store/mutation-types'
 import PreviewFile from '../../components/jero/PreviewFile'
-import WorkGroupSetLabel from './modules/WorkGroupSetLabel'
+import DraftingGroupSetLabel from '@views/draftingGroup/modules/DraftingGroupSetLabel'
 import EmailErrorMsgModal from '../projectManagement/modules/EmailErrorMsgModal'
 
 // eslint-disable-next-line no-undef,no-unused-vars
@@ -181,10 +181,10 @@ export default {
     StatusSlot,
     ProjectDetailModal,
     DraftingGroupMemberUnitModule,
-    WorkingGroupMemberSetChargeNotice,
+    DraftingGroupMemberSetChargeNotice,
     PreviewFile,
     EmailErrorMsgModal,
-    WorkGroupSetLabel
+    DraftingGroupSetLabel
   },
   mixins: [JeroListMixin],
   computed: {
diff --git a/src/views/draftingGroup/modules/DraftingGroupMemberSetChargeNotice.vue b/src/views/draftingGroup/modules/DraftingGroupMemberSetChargeNotice.vue
new file mode 100644
index 0000000..84eface
--- /dev/null
+++ b/src/views/draftingGroup/modules/DraftingGroupMemberSetChargeNotice.vue
@@ -0,0 +1,202 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item label="收费通知号" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+          <a-radio-group
+            class="charge-notice-no"
+            v-decorator="['charge']"
+            @change="handleChargeNoticeChange">
+            <a-radio v-for="item in chargeNoticeList" :key="item.key" :value="item.key">
+              <a-tooltip :title="item.label">
+                {{ item.label }}
+              </a-tooltip>
+            </a-radio>
+          </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'
+                       @blur="addZero"
+                       @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 :multiple="false"
+                        :return-id="true"
+                        bizPath="payment"
+                        :number="1"
+                        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="请输入本年应收款B"
+                       v-decorator="['receivableAmount']"
+                       :maxLength='50'
+                       @blur="addZero"
+                       @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 :multiple="false"
+                        :return-id="true"
+                        :number="1"
+                        bizPath="payment"
+                        v-decorator="['chargeNoticeId']"
+                        :trigger-change="true"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+    <email-error-msg-modal ref="emailError"></email-error-msg-modal>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+      <a-button @click="handleOk" type="primary" v-preventclick>确定</a-button>
+    </template>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import JUpload from '@/components/jero/JUpload'
+import { postAction } from '@/api/manage'
+import { addZero } from '../../../utils/util'
+// import {msgWarn} from '@comp/_util/MessageClose'
+import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgModal'
+
+export default {
+  name: 'DraftingGroupMemberSetChargeNotice',
+  components: { JUpload, EmailErrorMsgModal },
+  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, // 选中的收费通知类型
+      url: {
+        setCharge: '/project/payWorkingGroupSubitem/setCharge'
+      }
+    }
+  },
+  methods: {
+    addZero,
+    handleOpen() {
+      this.visible = true
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          this.confirmLoading = true
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          formData.ids = this.selectedRowKeys.join(',')
+          postAction(this.url.setCharge, formData).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              // 是否有邮件发送失败 有就给出提示信息
+              if (Array.isArray(res.result) && res.result.length > 0) {
+                // msgWarn(this,res.result,0)
+                that.$refs.emailError.open()
+                that.$refs.emailError.msgList = res.result
+                console.log(that.$refs.emailError.msgList, 'that.$refs.emailError.msgList ')
+
+              }
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.visible = false
+      this.model = {}
+      this.form.resetFields()
+      this.selectedRowKeys = null
+      this.chargeNoticeList = null
+      this.selectedChargeNotice = null
+    },
+    /**
+     * 收费通知号变化, 回显本年应收款和文件
+     */
+    handleChargeNoticeChange(e) {
+      let key = e.target.value
+      this.pickChargeNoticeType(key)
+    },
+    /**
+     * 匹配显隐
+     * @param key
+     */
+    pickChargeNoticeType(key) {
+      this.chargeNoticeList.forEach(item => {
+        if (item.type === 'chargeNoticeA' && key === 'a') {
+          this.selectedChargeNotice = 'A'
+          this.model.receivableAmount = item.yearCharge
+          this.model.chargeNoticeId = item.chargeNoticeId
+          this.model.chargeNoticeNo = item.value
+        } else if (item.type === 'chargeNoticeB' && key === 'b') {
+          this.selectedChargeNotice = 'B'
+          this.model.receivableAmount = item.yearCharge
+          this.model.chargeNoticeId = item.chargeNoticeId
+          this.model.chargeNoticeNo = item.value
+        }
+      })
+      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/draftingGroup/modules/DraftingGroupSetLabel.vue b/src/views/draftingGroup/modules/DraftingGroupSetLabel.vue
new file mode 100644
index 0000000..a2ba923
--- /dev/null
+++ b/src/views/draftingGroup/modules/DraftingGroupSetLabel.vue
@@ -0,0 +1,113 @@
+<!--工作组 设置标签-->
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="标签名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入标签名称"
+                       v-decorator="['label',validatorRules.label]"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import { httpAction } from '@api/manage'
+
+export default {
+  name: 'DraftingGroupSetLabel',
+  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: 14 }
+      },
+      validatorRules: {
+        label: {
+          rules: [{ required: true, message: '请输入标签名称' }],
+          validateTrigger: 'blur'
+        }
+      },
+      url: {
+        setLabel: '/project/payWorkingGroupSubitem/setLabel'
+      }
+    }
+  },
+  methods: {
+    show(ids) {
+      this.form.resetFields()
+      this.selectedIds = ids
+      this.visible = true
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      if (this.confirmLoading) {
+        return
+      }
+      this.confirmLoading = true
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          that.confirmLoading = true
+          let httpUrl = this.url.setLabel
+          let method = 'post'
+          const formData = Object.assign(this.model, values)
+          formData.subIds = that.selectedIds.join(',')
+          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(() => {
+            setTimeout(() => {
+              this.confirmLoading = false
+            }, 1000)
+          })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file