From dd0ab8590ec049657d5686cf5c6e906a30b457f2 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 4 Jan 2024 09:26:49 +0800
Subject: [PATCH] =?UTF-8?q?[update]=E8=B5=B7=E8=8D=89=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draftingGroup/ConferenceMaintenance.vue   | 395 ++++++++++++++++++
 .../draftingGroup/DraftingGroupManagement.vue |  10 +-
 .../DraftingGroupMemberUnitMaintenance.vue    |   6 +-
 ...> DraftingGroupProjectDataMaintenance.vue} |  16 +-
 ...vue => DraftingGroupUnderStudyProject.vue} |   8 +-
 ....vue => DraftingGroupDistributeModule.vue} |   2 +-
 ...l.vue => DraftingGroupFileUploadModal.vue} |   2 +-
 ....vue => DraftingGroupMemberUnitModule.vue} |   0
 .../modules/DraftingGroupModule.vue           |  39 +-
 ...> DraftingGroupUnderStudyProjectModal.vue} |   2 +-
 10 files changed, 452 insertions(+), 28 deletions(-)
 create mode 100644 src/views/draftingGroup/ConferenceMaintenance.vue
 rename src/views/draftingGroup/{WorkingGroupProjectDataMaintenance.vue => DraftingGroupProjectDataMaintenance.vue} (93%)
 rename src/views/draftingGroup/{WorkingGroupUnderStudyProject.vue => DraftingGroupUnderStudyProject.vue} (94%)
 rename src/views/draftingGroup/modules/{WorkGroupDistributeModule.vue => DraftingGroupDistributeModule.vue} (99%)
 rename src/views/draftingGroup/modules/{WorkGroupFileUploadModal.vue => DraftingGroupFileUploadModal.vue} (98%)
 rename src/views/draftingGroup/modules/{WorkingGroupMemberUnitModule.vue => DraftingGroupMemberUnitModule.vue} (100%)
 rename src/views/draftingGroup/modules/{WorkingGroupUnderStudyProjectModal.vue => DraftingGroupUnderStudyProjectModal.vue} (99%)

diff --git a/src/views/draftingGroup/ConferenceMaintenance.vue b/src/views/draftingGroup/ConferenceMaintenance.vue
new file mode 100644
index 0000000..75ffdbe
--- /dev/null
+++ b/src/views/draftingGroup/ConferenceMaintenance.vue
@@ -0,0 +1,395 @@
+<template>
+  <div>
+    <page-header-title :is-level-one="false" :level-two-title="workingGroupProject"></page-header-title>
+    <a-card :bordered="false">
+      <!--    查询区域-->
+      <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.meetingName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="12" :md="12" :sm="24">
+              <a-form-item label="会议时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingStartTime"
+                  :disabled-date="disabledStartDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingEndTime"
+                  :disabled-date="disabledEndDate">
+                </j-date>
+              </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.particularYear"></j-year-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="12" :md="12" :sm="24">
+              <a-form-item label="创建时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.createTime_begin"
+                  :disabled-date="disabledStartCreateDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.createTime_end"
+                  :disabled-date="disabledEndCreateDate">
+                </j-date>
+              </a-form-item>
+            </a-col>
+
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="已提醒" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <j-dict-select-tag style="width: 100%"
+                                   dict-code="yn"
+                                   v-model="queryParam.remind"
+                                   placeholder="请选择提醒类型"></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery"
+                        v-has="'workGroupMeeting:search'">查询</a-button>
+              <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--    /查询区域-->
+
+      <!--    操作按钮区域-->
+      <div class="table-operator">
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workGroupMeeting:add'" v-if="canOperate">新增
+        </a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('工作组会议')"
+                  v-has="'workGroupMeeting:export'">导出
+        </a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'workGroupMeeting:batchDel'" v-if="canOperate">
+          批量删除
+        </a-button>
+        <a-button type="primary" @click="publishRemind" v-has="'workGroupMeeting:publish'" v-if="canOperate">发布
+        </a-button>
+      </div>
+      <!--    /操作按钮区域-end-->
+
+      <!--    table表格区域-->
+      <div>
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :scroll="{x:true}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+          <!-- 会议名称 点击去参会情况-->
+          <template slot="htmlSlot" slot-scope="text, record">
+            <j-ellipsis v-if="!!text" class="primary-color" :value="text" :length="20"
+                        @click="toAttendance(record)"></j-ellipsis>
+          </template>
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          </template>
+
+          <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
+               <a @click="uploadFile(record,'1')" v-has="'workGroupMeeting:uploadCouncil'">会议纪要</a>
+          <a @click="uploadFile(record,'2')" v-has="'workGroupMeeting:upload'">上传文件</a>
+            <!--          <a @click="applyMsg">报名信息</a>-->
+          <a @click="handleEdit(record)" v-has="'workGroupMeeting:edit'">编辑</a>
+          <a @click="handleDelete(record.id)" v-has="'workGroupMeeting:delete'">删除</a>
+        </span>
+        </a-table>
+      </div>
+      <publish-remind-modal ref="publishRemindModal" @ok="modalFormOk"></publish-remind-modal>
+      <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import { RangeDateMixin } from '@/mixins/RangeDateMixin'
+import JYearDate from '@comp/jero/JYearDate'
+import JDate from '@comp/tools/JDate'
+import moment from 'moment'
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import PublishRemindModal from '@views/projectManagement/modules/PublishRemindModal'
+import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal'
+import '@/assets/less/TableExpand.less'
+import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
+
+export default {
+  name: 'ConferenceMaintenance',
+  components: {
+    JYearDate,
+    JDate,
+    JDictSelectTag,
+    PublishRemindModal,
+    UploadMeetFileModal,
+    PageHeaderTitle
+  },
+  mixins: [JeroListMixin, RangeDateMixin],
+  data() {
+    return {
+      workingGroupProject: '',
+      workingGroupProjectId: '',
+      disableMixinCreated: true,
+      list: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      dateKeyObj: {
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndtTime'
+      },
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '会议名称',
+          align: 'center',
+          dataIndex: 'meetingName',
+          scopedSlots: { customRender: 'htmlSlot' },
+          width: 160
+
+        },
+        {
+          title: '会议类型',
+          align: 'center',
+          dataIndex: 'meetingType_dictText',
+          width: 100,
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName',
+          width: 160,
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '召开时间',
+          align: 'center',
+          dataIndex: 'startTime',
+          width: 200,
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.startTime + '~' + record.endTime } length={ 20 }></j-ellipsis>)
+        },
+        {
+          title: '召开地点',
+          align: 'center',
+          dataIndex: 'venue',
+          width: 200,
+          customRender: (text, record) => (
+            <j-ellipsis value={ text + '/' + record.address } length={ 20 }></j-ellipsis>)
+        },
+        {
+          title: '年份',
+          align: 'center',
+          dataIndex: 'particularYear',
+          width: 120,
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '已提醒',
+          align: 'center',
+          dataIndex: 'remind_dictText',
+          width: 100,
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: { customRender: 'text' }
+        },
+        {
+          title: '操作',
+          align: 'center',
+          fixed: 'right',
+          width: 160,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: '/meeting/workGroupMeeting/page',
+        delete: '/meeting/workGroupMeeting/delete',
+        deleteBatch: '/meeting/workGroupMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/workGroupMeeting/exportXls'
+      },
+      canOperate: true // 是否可操作（负责人B不可操作）
+    }
+  },
+  created() {
+    this.workingGroupProject = this.$route.query.workingGroupProject
+    this.workingGroupProjectId = this.$route.query.workingGroupProjectId
+    this.canOperate = this.$route.query.canOperate === 'true' ? true : false
+    this.filters.workingGroupId = this.workingGroupProjectId
+    this.loadData(1)
+  },
+  methods: {
+    /**
+     * 返回工作组项目列表
+     */
+    backWorkingGroupProject() {
+      this.$router.push({
+        path: '/projectManagement/WorkingGroupProjectManagement'
+      })
+    },
+    /*
+    * 新增
+    * */
+    handleAdd() {
+      // 记录当前的工作组id
+      let currentId = this.$route.query.workingGroupProjectId
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          workingGroupProjectId: currentId,
+          meetingType: '1'
+        }
+      })
+    },
+    /*
+    * 编辑
+    * */
+    handleEdit(record) {
+      // 记录当前的工作组id
+      let currentId = this.$route.query.workingGroupProjectId
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          workingGroupProjectId: currentId,
+          id: record.id
+        }
+      })
+    },
+    /*
+    * 发布
+    * */
+    publishRemind() {
+      if (this.selectionRows.length === 0) {
+        this.$message.warn('请选择一个会议')
+        return
+      } else {
+        // 传入选中的会议id
+        this.$refs.publishRemindModal.open(this.selectedRowKeys)
+        this.$refs.publishRemindModal.title = '发布'
+      }
+
+    },
+    /*
+    * 上传文件
+    * */
+    uploadFile(record,type) {
+      this.$refs.modalForm.edit(record,type)
+    },
+    /*
+    * 报名信息
+    * */
+    applyMsg() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/SignUpInfoList'
+      })
+    },
+    /*
+     * 参会情况
+     * */
+    toAttendance(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AttendanceWorkGroupMeeting',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName,
+          meetingType: '1'
+        }
+      })
+    },
+    /*
+    * 创建时间开始禁用
+    * */
+    disabledStartCreateDate(startValue) {
+      const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
+      if (!startValue || !endValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+    /*
+    * 创建时间结束禁用
+    * */
+    disabledEndCreateDate(endValue) {
+      const startValue = this.queryParam.createTime_begin && moment(this.queryParam.createTime_begin, this.rangeDateFormat.begin)
+      if (!endValue || !startValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+    /*
+     * 修改查询条件
+     * */
+    searchQuery() {
+      this.queryParam.meetingStartTime = this.queryParam.meetingStartTime ? this.queryParam.meetingStartTime + ' ' + '00:00:00' : undefined
+      this.queryParam.meetingEndTime = this.queryParam.meetingEndTime ? this.queryParam.meetingEndTime + ' ' + '23:59:59' : undefined
+      this.queryParam.createTime_begin = this.queryParam.createTime_begin ? this.queryParam.createTime_begin + ' ' + '00:00:00' : undefined
+      this.queryParam.createTime_end = this.queryParam.createTime_end ? this.queryParam.createTime_end + ' ' + '23:59:59' : undefined
+      this.lastQueryParam = { ...this.queryParam }
+      this.loadData(1)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.title {
+
+  &-text {
+    padding-left: 1rem;
+    font-size: 18px;
+    line-height: 22px;
+  }
+}
+
+.divider {
+  height: 1px;
+  background-color: #cccccc;
+  margin: 15px -24px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/draftingGroup/DraftingGroupManagement.vue b/src/views/draftingGroup/DraftingGroupManagement.vue
index 4711b1d..dcb7bf2 100644
--- a/src/views/draftingGroup/DraftingGroupManagement.vue
+++ b/src/views/draftingGroup/DraftingGroupManagement.vue
@@ -113,10 +113,10 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png'
 import { copyWorkingGroup } from '../../api/incomePaymentsApi'
 import { getAction } from '../../api/manage'
-import DraftingGroupModule from "./modules/DraftingGroupModule";
+import DraftingGroupModule from './modules/DraftingGroupModule';
 
 export default {
-  name: 'WorkingGroupProjectManagement',
+  name: 'DraftingGroupManagement',
   components: { JYearDate, DraftingGroupModule, SelectPrincipal, ProgressBar, PageHeaderTitle },
   mixins: [JeroListMixin],
   data() {
@@ -245,7 +245,7 @@ export default {
     goFilesMaintenance(record) {
       console.log(record)
       this.$router.push({
-        path: '/projectManagement/WorkingGroupProjectDataMaintenance',
+        path: '/draftingGroup/DraftingGroupProjectDataMaintenance',
         query: {
           workingGroupId: record.id,
           canOperate: record.checkoutOperation === 1
@@ -258,7 +258,7 @@ export default {
      */
     goConferenceMaintenance(record) {
       this.$router.push({
-        path: '/projectManagement/ConferenceMaintenance',
+        path: '/draftingGroup/ConferenceMaintenance',
         query: {
           workingGroupProject: record.workingGroupProject,
           workingGroupProjectId: record.id,
@@ -310,7 +310,7 @@ export default {
      */
     goUnderStudyProject(record) {
       this.$router.push({
-        path: '/projectManagement/WorkingGroupProjectManagement/UnderStudyProject',
+        path: '/draftingGroup/DraftingGroupUnderStudyProject',
         query: {
           title: record.workingGroupProject,
           id: record.id
diff --git a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
index ffc83df..f66c6fc 100644
--- a/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
+++ b/src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue
@@ -145,7 +145,7 @@
     </a-card>
 
     <project-detail-modal ref="projectDetail"></project-detail-modal>
-    <working-group-member-unit-module ref="modalForm" @ok="modalFormOk"></working-group-member-unit-module>
+    <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>
 
@@ -162,7 +162,7 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import { getWorkingGroupById, dunningReminder } from '@api/incomePaymentsApi'
 import StatusSlot from '../../components/tools/StatusSlot'
 import ProjectDetailModal from '../../components/ProjectDetailModal'
-import WorkingGroupMemberUnitModule from './modules/WorkingGroupMemberUnitModule'
+import DraftingGroupMemberUnitModule from './modules/DraftingGroupMemberUnitModule'
 import WorkingGroupMemberSetChargeNotice from './modules/WorkingGroupMemberSetChargeNotice'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '../../store/mutation-types'
@@ -180,7 +180,7 @@ export default {
     PageHeaderTitle,
     StatusSlot,
     ProjectDetailModal,
-    WorkingGroupMemberUnitModule,
+    DraftingGroupMemberUnitModule,
     WorkingGroupMemberSetChargeNotice,
     PreviewFile,
     EmailErrorMsgModal,
diff --git a/src/views/draftingGroup/WorkingGroupProjectDataMaintenance.vue b/src/views/draftingGroup/DraftingGroupProjectDataMaintenance.vue
similarity index 93%
rename from src/views/draftingGroup/WorkingGroupProjectDataMaintenance.vue
rename to src/views/draftingGroup/DraftingGroupProjectDataMaintenance.vue
index 081a56b..7f65f78 100644
--- a/src/views/draftingGroup/WorkingGroupProjectDataMaintenance.vue
+++ b/src/views/draftingGroup/DraftingGroupProjectDataMaintenance.vue
@@ -66,33 +66,33 @@
     </a-card>
 
     <!--    上传-->
-    <work-group-file-upload-modal
+    <drafting-group-file-upload-modal
       ref="modalForm"
       @ok="modalFormOk"
       :project-id="projectId"
-      :project-type="projectType"></work-group-file-upload-modal>
+      :project-type="projectType"></drafting-group-file-upload-modal>
     <!--    分发-->
-    <work-group-distribute-module
+    <drafting-group-distribute-module
       ref="distributeModal"
       :visible.sync="distributeModalVisible"
       :project-id="projectId"
       :project-type="projectType"
       :is-batch="isBatchDistribute"
       :record-id="dataId"
-      @ok="modalFormOk"></work-group-distribute-module>
+      @ok="modalFormOk"></drafting-group-distribute-module>
   </div>
 </template>
 
 <script>
 import { JeroListMixin } from '../../mixins/JeroListMixin'
 import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
-import WorkGroupFileUploadModal from './modules/WorkGroupFileUploadModal'
-import WorkGroupDistributeModule from './modules/WorkGroupDistributeModule'
+import DraftingGroupFileUploadModal from './modules/DraftingGroupFileUploadModal'
+import DraftingGroupDistributeModule from './modules/DraftingGroupDistributeModule'
 import { downloadFile } from '../../api/manage'
 
 export default {
-  name: 'WorkingGroupProjectDataMaintenance',
-  components: { PageHeaderTitle, WorkGroupFileUploadModal, WorkGroupDistributeModule },
+  name: 'DraftingGroupProjectDataMaintenance',
+  components: { PageHeaderTitle, DraftingGroupFileUploadModal, DraftingGroupDistributeModule },
   mixins: [JeroListMixin],
   data() {
     return {
diff --git a/src/views/draftingGroup/WorkingGroupUnderStudyProject.vue b/src/views/draftingGroup/DraftingGroupUnderStudyProject.vue
similarity index 94%
rename from src/views/draftingGroup/WorkingGroupUnderStudyProject.vue
rename to src/views/draftingGroup/DraftingGroupUnderStudyProject.vue
index 2b796e0..e2d68bc 100644
--- a/src/views/draftingGroup/WorkingGroupUnderStudyProject.vue
+++ b/src/views/draftingGroup/DraftingGroupUnderStudyProject.vue
@@ -57,19 +57,19 @@
       </div>
     </a-card>
 
-    <working-group-under-study-project-modal ref="modalForm" @ok="modalFormOk"></working-group-under-study-project-modal>
+    <drafting-group-under-study-project-modal ref="modalForm" @ok="modalFormOk"></drafting-group-under-study-project-modal>
   </div>
 </template>
 
 <script>
 import PageHeaderTitle from '../../components/layouts/PageHeaderTitle'
 import { JeroListMixin } from '../../mixins/JeroListMixin'
-import WorkingGroupUnderStudyProjectModal from './modules/WorkingGroupUnderStudyProjectModal'
+import DraftingGroupUnderStudyProjectModal from './modules/DraftingGroupUnderStudyProjectModal'
 import { getAction } from '../../api/manage'
 
 export default {
-  name: 'WorkingGroupUnderStudyProject',
-  components: { PageHeaderTitle, WorkingGroupUnderStudyProjectModal },
+  name: 'DraftingGroupUnderStudyProject',
+  components: { PageHeaderTitle, DraftingGroupUnderStudyProjectModal },
   mixins: [JeroListMixin],
   data() {
     return {
diff --git a/src/views/draftingGroup/modules/WorkGroupDistributeModule.vue b/src/views/draftingGroup/modules/DraftingGroupDistributeModule.vue
similarity index 99%
rename from src/views/draftingGroup/modules/WorkGroupDistributeModule.vue
rename to src/views/draftingGroup/modules/DraftingGroupDistributeModule.vue
index 74d04dc..037f060 100644
--- a/src/views/draftingGroup/modules/WorkGroupDistributeModule.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupDistributeModule.vue
@@ -176,7 +176,7 @@ const councilColumns = [
 ]
 
 export default {
-  name: 'WorkGroupDistributeModule',
+  name: 'DraftingGroupDistributeModule',
   components: { EmailErrorMsgModal },
   props: {
     // 项目id
diff --git a/src/views/draftingGroup/modules/WorkGroupFileUploadModal.vue b/src/views/draftingGroup/modules/DraftingGroupFileUploadModal.vue
similarity index 98%
rename from src/views/draftingGroup/modules/WorkGroupFileUploadModal.vue
rename to src/views/draftingGroup/modules/DraftingGroupFileUploadModal.vue
index bde82cd..6e513a3 100644
--- a/src/views/draftingGroup/modules/WorkGroupFileUploadModal.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupFileUploadModal.vue
@@ -34,7 +34,7 @@ import { postAction } from '../../../api/manage'
 import JUpload from '@comp/jero/JUpload'
 
 export default {
-  name: 'WorkGroupFileUploadModal',
+  name: 'DraftingGroupFileUploadModal',
   components: { JUpload },
   props: {
     // 项目id
diff --git a/src/views/draftingGroup/modules/WorkingGroupMemberUnitModule.vue b/src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
similarity index 100%
rename from src/views/draftingGroup/modules/WorkingGroupMemberUnitModule.vue
rename to src/views/draftingGroup/modules/DraftingGroupMemberUnitModule.vue
diff --git a/src/views/draftingGroup/modules/DraftingGroupModule.vue b/src/views/draftingGroup/modules/DraftingGroupModule.vue
index 4dc0cde..2cc3a26 100644
--- a/src/views/draftingGroup/modules/DraftingGroupModule.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupModule.vue
@@ -26,10 +26,16 @@
         <a-row>
           <a-col :span="24">
             <a-form-item label="关联工作组" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
-              <a-input placeholder="请选择关联工作组"
-                       v-decorator="['workingGroupProject',validatorRules.workingGroupProject]"
-                       :maxLength='50'
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+              <a-select
+                placeholder="请选择关联工作组"
+                show-search
+                v-decorator="['workingGroupId',validatorRules.workingGroupId]"
+                :filter-option="filterOption"
+              >
+                <a-select-option v-for="item in workingGroupList" :key="item.id" :value="item.id">
+                  {{ item.workingGroupProject }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -113,6 +119,7 @@ import SelectPrincipal from '@comp/company/SelectPrincipal'
 import { isRepeat } from '../../../utils/util'
 import { money } from '../../../utils/validate'
 import { addZero } from '../../../utils/util'
+import {getAllWorkProjects} from '@api/incomeMeetingApi'
 
 export default {
   name: 'DraftingGroupModule',
@@ -146,6 +153,10 @@ export default {
           rules: [{ required: true, message: '请输入项目名称' }],
           validateTrigger: 'blur'
         },
+        workingGroupId: {
+          rules: [{ required: true, message: '请选择关联工作组' }],
+          validateTrigger: 'change'
+        },
         year: {
           rules: [{ required: true, message: '请选择运行年份' }],
           validateTrigger: 'change'
@@ -166,7 +177,9 @@ export default {
       url: {
         add: '/project/payWorkingGroup/add',
         edit: '/project/payWorkingGroup/edit'
-      }
+      },
+      // 工作组下拉列表
+      workingGroupList: [],
     }
   },
   methods: {
@@ -175,6 +188,8 @@ export default {
       this.edit({})
     },
     edit(record) {
+      // 获取工作组下拉列表
+      this.loadWorkingGroupList()
       this.form.resetFields()
       // 防止下拉选项出现问题
       record.principalIdA = record.principalIdA || undefined
@@ -188,6 +203,14 @@ export default {
         }
       })
     },
+    // 获取工作组下拉列表
+    loadWorkingGroupList () {
+      getAllWorkProjects().then(res => {
+        if (res.success) {
+          this.workingGroupList = res.result || []
+        }
+      })
+    },
     close() {
       this.$emit('close')
       this.visible = false
@@ -233,6 +256,12 @@ export default {
         }
       })
     },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
     handleCancel() {
       this.close()
     },
diff --git a/src/views/draftingGroup/modules/WorkingGroupUnderStudyProjectModal.vue b/src/views/draftingGroup/modules/DraftingGroupUnderStudyProjectModal.vue
similarity index 99%
rename from src/views/draftingGroup/modules/WorkingGroupUnderStudyProjectModal.vue
rename to src/views/draftingGroup/modules/DraftingGroupUnderStudyProjectModal.vue
index e68aa20..919102f 100644
--- a/src/views/draftingGroup/modules/WorkingGroupUnderStudyProjectModal.vue
+++ b/src/views/draftingGroup/modules/DraftingGroupUnderStudyProjectModal.vue
@@ -64,7 +64,7 @@ import { postAction } from '../../../api/manage'
 import JUpload from '../../../components/jero/JUpload'
 
 export default {
-  name: 'WorkingGroupUnderStudyProjectModal',
+  name: 'DraftingGroupUnderStudyProjectModal',
   components: { JUpload },
   data() {
     return {