update 起草组会议部分

src/views/draftingGroup/ConferenceMaintenance.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <page-header-title :is-level-one="false" :level-two-title="workingGroupProject"></page-header-title>
+    <page-header-title :is-level-one="false" :level-two-title="draftingGroupProject"></page-header-title>
     <a-card :bordered="false">
       <!--    查询区域-->
       <div class="table-page-search-wrapper">
@@ -153,8 +153,8 @@ export default {
   mixins: [JeroListMixin, RangeDateMixin],
   data() {
     return {
-      workingGroupProject: '',
+      draftingGroupProject: '',
-      workingGroupProjectId: '',
+      draftingGroupProjectId: '',
       disableMixinCreated: true,
       list: [],
       labelCol: {
@@ -247,19 +247,19 @@ export default {
         }
       ],
       url: {
-        list: '/meeting/workGroupMeeting/page',
+        list: '/meeting/draftGroupMeeting/page',
-        delete: '/meeting/workGroupMeeting/delete',
+        delete: '/meeting/draftGroupMeeting/delete',
-        deleteBatch: '/meeting/workGroupMeeting/deleteBatch',
+        deleteBatch: '/meeting/draftGroupMeeting/deleteBatch',
-        exportXlsUrl: '/meeting/workGroupMeeting/exportXls'
+        exportXlsUrl: '/meeting/draftGroupMeeting/exportXls'
       },
       canOperate: true // 是否可操作（负责人B不可操作）
     }
   },
   created() {
-    this.workingGroupProject = this.$route.query.workingGroupProject
+    this.draftingGroupProject = this.$route.query.draftingGroupProject
-    this.workingGroupProjectId = this.$route.query.workingGroupProjectId
+    this.draftingGroupProjectId = this.$route.query.draftingGroupProjectId
     this.canOperate = this.$route.query.canOperate === 'true' ? true : false
-    this.filters.workingGroupId = this.workingGroupProjectId
+    this.filters.draftingGroupId = this.draftingGroupProjectId
     this.loadData(1)
   },
   methods: {
@@ -268,7 +268,7 @@ export default {
      */
     backWorkingGroupProject() {
       this.$router.push({
-        path: '/projectManagement/WorkingGroupProjectManagement'
+        path: '/draftingGroup/DraftingGroupManagement'
       })
     },
     /*
@@ -276,12 +276,12 @@ export default {
     * */
     handleAdd() {
       // 记录当前的工作组id
-      let currentId = this.$route.query.workingGroupProjectId
+      let currentId = this.$route.query.draftingGroupProjectId
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
-          workingGroupProjectId: currentId,
+          draftingGroupProjectId: currentId,
-          meetingType: '1'
+          meetingType: '7'
         }
       })
     },
@@ -290,11 +290,11 @@ export default {
     * */
     handleEdit(record) {
       // 记录当前的工作组id
-      let currentId = this.$route.query.workingGroupProjectId
+      let currentId = this.$route.query.draftingGroupProjectId
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
-          workingGroupProjectId: currentId,
+          draftingGroupProjectId: currentId,
           id: record.id
         }
       })
@@ -336,7 +336,7 @@ export default {
         query: {
           id: record.id,
           meetingName: record.meetingName,
-          meetingType: '1'
+          meetingType: '7'
         }
       })
     },

src/views/draftingGroup/DraftingGroupManagement.vue

@@ -49,7 +49,7 @@
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" icon="search" @click="searchQuery"
-                          v-has="'workingGroupProject:search'">查询</a-button>
+                          v-has="'draftingGroup:search'">查询</a-button>
                 <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
               </span>
             </a-col>
@@ -60,8 +60,8 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workingGroupProject:add'">新增</a-button>
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'draftingGroup:add'">新增</a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'workingGroupProject:batchDel'">批量删除</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'draftingGroup:batchDel'">批量删除</a-button>
 
       </div>
       <!--    /操作按钮区域-end-->
@@ -95,15 +95,15 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="goUnderStudyProject(record)" v-has="'workingGroupProject:underStudyProject'"
+            <a @click="goUnderStudyProject(record)" v-has="'draftingGroup:underStudyProject'"
                v-if="record.checkoutOperation === 1">在研项目</a>
-            <a @click="goFilesMaintenance(record)" v-has="'workingGroupProject:fileMaintenance'">其他分发资料</a>
+            <a @click="goFilesMaintenance(record)" v-has="'draftingGroup:fileMaintenance'">其他分发资料</a>
-            <a @click="goConferenceMaintenance(record)" v-has="'workingGroupProject:meetingMaintenance'">起草组会议</a>
+            <a @click="goConferenceMaintenance(record)" v-has="'draftingGroup:meetingMaintenance'">起草组会议</a>
-            <a @click="copyWorkGroup(record.id)" v-has="'workingGroupProject:copy'"
+            <a @click="copyDraftGroup(record.id)" v-has="'draftingGroup:copy'"
                v-if="record.checkoutOperation === 1">复制</a>
-            <a @click="handleEdit(record)" v-has="'workingGroupProject:edit'"
+            <a @click="handleEdit(record)" v-has="'draftingGroup:edit'"
                v-if="record.checkoutOperation === 1">基本信息维护</a>
-            <a @click="handleDelete(record.id)" v-has="'workingGroupProject:delete'"
+            <a @click="handleDelete(record.id)" v-has="'draftingGroup:delete'"
                v-if="record.checkoutOperation === 1">删除</a>
           </span>
         </a-table>
@@ -282,8 +282,8 @@ export default {
       this.$router.push({
         path: '/draftingGroup/ConferenceMaintenance',
         query: {
-          workingGroupProject: record.workingGroupProject,
+          draftingGroupProject: record.draftingGroupProject,
-          workingGroupProjectId: record.id,
+          draftingGroupProjectId: record.id,
           canOperate: record.checkoutOperation === 1
         }
       })
@@ -292,7 +292,7 @@ export default {
      * 复制
      * @param id
      */
-    copyWorkGroup(id) {
+    copyDraftGroup(id) {
       copyDraftingGroup({ id: id }).then(res => {
         if (res.success) {
           this.$message.success(res.message)

src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue

@@ -54,7 +54,7 @@
             <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="'workingGroupMember:search'">查询</a-button>
+                        v-has="'draftingGroupMember:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
             </a-col>
@@ -65,21 +65,21 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workingGroupMember:add'" v-if="canOperate">
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'draftingGroupMember:add'" v-if="canOperate">
           添加成员
         </a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :data="importParam"
-                  :action="importExcelUrl" @change="handleImportExcel" v-has="'workingGroupMember:import'"
+                  :action="importExcelUrl" @change="handleImportExcel" v-has="'draftingGroupMember:import'"
                   v-if="canOperate">
           <a-button type="primary" icon="import">导入</a-button>
         </a-upload>
-        <a-button type="primary" icon="export" @click="handleExportXls('起草组成员')" v-has="'workingGroupMember:export'">
+        <a-button type="primary" icon="export" @click="handleExportXls('起草组成员')" v-has="'draftingGroupMember:export'">
           导出
         </a-button>
         <a-button type="primary" icon="download" @click="downTemplate('起草组成员导入模板')"
-                  v-has="'workingGroupMember:downTemplate'" v-if="canOperate">下载模板
+                  v-has="'draftingGroupMember:downTemplate'" v-if="canOperate">下载模板
         </a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'workingGroupMember:batchDel'" v-if="canOperate">
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'draftingGroupMember:batchDel'" v-if="canOperate">
           批量删除
         </a-button>
         <!--<a-button type="primary" @click="setLabel" v-has="'workingGroupMember:setLabel'">设置标签</a-button>-->
@@ -137,8 +137,8 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" v-if="canOperate">
-            <a @click="handleEdit(record)" v-has="'workingGroupMember:edit'">编辑</a>
+            <a @click="handleEdit(record)" v-has="'draftingGroupMember:edit'">编辑</a>
-            <a @click="handleDelete(record.id)" v-has="'workingGroupMember:delete'">删除</a>
+            <a @click="handleDelete(record.id)" v-has="'draftingGroupMember:delete'">删除</a>
           </span>
         </a-table>
       </div>

src/views/draftingGroup/DraftingGroupUnderStudyProject.vue

@@ -13,7 +13,7 @@
             </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="'workingGroup:underStudy:search'">查询</a-button>
+              <a-button type="primary" icon="search" @click="searchQuery" v-has="'draftingGroup:underStudy:search'">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
             </a-col>
@@ -24,8 +24,8 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'workingGroup:underStudy:add'">新增</a-button>
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'draftingGroup:underStudy:add'">新增</a-button>
-        <a-button type="danger" icon="delete" @click="batchDel" v-has="'workingGroup:underStudy:batchDel'">批量删除</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'draftingGroup:batchDel'">批量删除</a-button>
       </div>
       <!--    操作按钮区域-end-->
 
@@ -50,8 +50,8 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-            <a @click="handleEdit(record)" v-has="'workingGroup:underStudy:edit'">编辑</a>
+            <a @click="handleEdit(record)" v-has="'draftingGroup:underStudy:edit'">编辑</a>
-            <a @click="handleDelete(record.id)" v-has="'workingGroup:underStudy:delete'">删除</a>
+            <a @click="handleDelete(record.id)" v-has="'draftingGroup:underStudy:delete'">删除</a>
           </span>
         </a-table>
       </div>

src/views/incomePayments/meetManage/AddOrDetailMeet.vue

@@ -314,10 +314,12 @@
             <template v-if="!isWasic">
               <a-col :xxl="8" :xl="12" :sm="24">
                 <a-form-item label="会议费用" :labelCol="labelCol" :wrapperCol="{ xs: {span: 24},sm: {span: 16}}">
+                  <!-- 起草组会议费用默认0不可修改 -->
                   <a-input placeholder="请输入会议费用"
                            :maxLength='50'
                            @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"
                            @blur="addZero"
+                           :disabled="meetingType === '7'"
                            v-decorator="[ 'meetingCosts',validateInviteCode.meetingCosts]"></a-input>
                   <span class="yuan">元/人</span>
                 </a-form-item>
@@ -702,6 +704,14 @@ export default {
       } else {
         return false
       }
+    },
+    // 是否从起草组会议维护来的
+    isDraftGroupMeetType() {
+      if (this.$route.query.draftingGroupProjectId) {
+        return true
+      } else {
+        return false
+      }
     }
   },
   mounted() {
@@ -800,6 +810,11 @@ export default {
       // 后端需要的注册签到时间
       this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime]
 
+      // 起草组会议费用默认0
+      if (this.meetingType === '7') {
+        this.model.meetingCosts = '0.00'
+        this.QRcodeBool = false
+      }
       this.$nextTick(() => {
         // 加定时器是因为有可能赋值不成功
         setTimeout(() => {
@@ -901,6 +916,10 @@ export default {
             formData.meetingType = '2'
             formData.standardsId = this.$route.query.standardsId
           }
+          if (this.isDraftGroupMeetType) {
+            formData.meetingType = '7'
+            formData.draftingGroupId = this.$route.query.draftingGroupProjectId
+          }
           // 转换召开时间
           formData.startTime = this.newConvokeTime[0]
           formData.endTime = this.newConvokeTime[1]
@@ -1256,6 +1275,12 @@ export default {
             add: '/meeting/councilMeeting/add',
             edit: '/meeting/councilMeeting/edit'
           }
+        // 起草组会议
+        case '7':
+          return {
+            add: '/meeting/draftGroupMeeting/add',
+            edit: '/meeting/draftGroupMeeting/edit'
+          }
       }
     },
     /*

src/views/incomePayments/meetManage/Attendance.vue

@@ -630,6 +630,18 @@ export default {
         auditSignUpInfo: 'councilMeetingSituation:auditSignUp',
         guestsUploadFileFlag: 'councilMeetingSituation:guestsUploadFileFlag'
       },
+      // 起草组会议的参会情况的权限编码
+      draftGroupMeetingCode: {
+        search: 'draftGroupMeetingSituation:search',
+        add: 'draftGroupMeetingSituation:add',
+        export: 'draftGroupMeetingSituation:export',
+        batchDel: 'draftGroupMeetingSituation:batchDel',
+        edit: 'draftGroupMeetingSituation:edit',
+        delete: 'draftGroupMeetingSituation:delete',
+        auditRecord: 'draftGroupMeetingSituation:auditCredentials',
+        auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp',
+        guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag'
+      },
       disableMixinCreated: true,
       // url: {
       //   list: '/meeting/payMeetingSituation/page',
@@ -686,6 +698,14 @@ export default {
         exportXlsUrl: '/meeting/councilMeetingSituation/exportXls',
         importExcelUrl: '/meeting/councilMeetingSituation/importExcel'
       },
+      // 起草组会议的url
+      draftGroupMeetingUrl: {
+        list: '/meeting/draftGroupMeetingSituation/page',
+        delete: '/meeting/draftGroupMeetingSituation/delete',
+        deleteBatch: '/meeting/draftGroupMeetingSituation/deleteBatch',
+        exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls',
+        importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel'
+      },
       // 当前的会议信息详情
       currentMeetingInfo: {},
       meetingType: '',
@@ -796,6 +816,8 @@ export default {
           return this.committeeMeetingUrl
         case '6':
           return  this.councilMeetingUrl
+        case '7':
+          return this.draftGroupMeetingUrl
         // 为了解决控制台报错写的
        default:return this.workGroupMeetingUrl
       }
@@ -997,6 +1019,8 @@ export default {
           return '分标委会议'
         case '6':
           return '理事会会议'
+        case '7':
+          return '起草组会议'
         default:
           return '其他会议'
       }
@@ -1096,6 +1120,9 @@ export default {
         case '6':
           this.authorCode = Object.assign({}, this.councilMeetingCode)
           break
+        case '7':
+          this.authorCode = Object.assign({}, this.draftGroupMeetingCode)
+          break
       }
     }
   }

src/views/incomePayments/meetManage/SignUpInfoEdit.vue

@@ -282,6 +282,11 @@ export default {
         add: '/meeting/councilMeetingSituation/add',
         edit:'/meeting/councilMeetingSituation/edit'
       },
+      // 起草组会议的url
+      draftGroupMeetingUrl: {
+        add: '/meeting/draftGroupMeetingSituation/add',
+        edit:'/meeting/draftGroupMeetingSituation/edit'
+      },
       title:'添加参会人',
       // 当前参会企业是否是内部企业
       isInternalEnterprise: false,
@@ -329,6 +334,8 @@ export default {
           return this.committeeMeetingUrl
         case '6':
           return this.councilMeetingUrl
+        case '7':
+          return this.draftGroupMeetingUrl
       }
     },
   },

src/views/projectManagement/AllMeetingList.vue

@@ -291,6 +291,7 @@ export default {
       pathMap.set('4','/incomePayments/meetManage/AttendanceOhterMeeting')
       pathMap.set('5','/incomePayments/meetManage/AttendanceCommitteeMeeting')
       pathMap.set('6','/incomePayments/meetManage/AttendanceCouncilMeeting')
+      pathMap.set('7','/incomePayments/meetManage/AttendanceDraftGroupMeeting')
       this.$router.push({
         path: pathMap.get(record.meetingType+''),
         query: {