From 4a160534dfd5e7ed2d3078f6d902624ce9484d1a Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 16 Sep 2021 19:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=8F=98=E6=9B=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../committee/CommitteeMaintenance.vue        |  18 +-
 .../modules/CommitteeMemberModule.vue         |   4 +-
 .../modules/DistributeModal.vue               |  16 +-
 .../meetManage/AddOrDetailMeet.vue            |  73 +++---
 .../incomePayments/meetManage/Attendance.vue  |   6 +-
 .../memberManage/StardsMemberProjectList.vue  |   5 +-
 .../projectManagement/CommitteeMeeting.vue    | 238 +++++++++---------
 .../InternationalSeminar.vue                  |   5 +-
 src/views/projectManagement/OtherMeeting.vue  |   3 +
 9 files changed, 191 insertions(+), 177 deletions(-)

diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
index 6383226..4c319d9 100644
--- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -7,8 +7,8 @@
         <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.fenBiaoWeiName"></a-input>
+              <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入分标委名称" v-model="queryParam.fenBiaoWeiName"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -34,8 +34,8 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" icon="plus" @click="handleAdd">新增分表委</a-button>
-        <a-button type="primary" icon="export" @click="handleExportXls('分表委维护')">导出</a-button>
+        <a-button type="primary" icon="plus" @click="handleAdd">新增分标委</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('分标委维护')">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
       </div>
       <!--    操作按钮区域-end-->
@@ -84,7 +84,7 @@
       </div>
       <!--    /table表格区域-->
 
-      <!--    新增分表委-->
+      <!--    新增分标委-->
       <committee-module ref="modalForm" @ok="modalFormOk"></committee-module>
       <committee-member-module ref="memberModalForm" @ok="modalFormOk"></committee-member-module>
     </a-card>
@@ -133,7 +133,7 @@ export default {
             return parseInt(index) + 1
           }
         }, {
-          title: '分表委名称',
+          title: '分标委名称',
           align: 'center',
           dataIndex: 'name',
           scopedSlots: {customRender: 'text'}
@@ -196,7 +196,7 @@ export default {
     },
     handleAdd() {
       this.$refs.modalForm.add()
-      this.$refs.modalForm.title = '新增分表委'
+      this.$refs.modalForm.title = '新增分标委'
       this.$refs.modalForm.disableSubmit = false
     },
     /**
@@ -249,7 +249,9 @@ export default {
       this.$router.push({
         path:'/projectManagement/CommitteeMeeting',
         query:{
-          id:record.id
+          id:record.id,
+          title:record.name,
+          meetingType:'5'
         }
       })
     }
diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
index 75740c8..4915b14 100644
--- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
+++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
@@ -12,8 +12,8 @@
       <a-form :form="form">
         <a-row>
           <a-col :xl="12" :sm="24">
-            <a-form-item label="分表委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入分表委名称"
+            <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入分标委名称"
                        v-decorator="['name',validatorRules.name]"
                        :disabled="true"
                        :maxLength='50'
diff --git a/src/views/dataNetworkDiskManagement/dataMaintenance/modules/DistributeModal.vue b/src/views/dataNetworkDiskManagement/dataMaintenance/modules/DistributeModal.vue
index e782102..f41e944 100644
--- a/src/views/dataNetworkDiskManagement/dataMaintenance/modules/DistributeModal.vue
+++ b/src/views/dataNetworkDiskManagement/dataMaintenance/modules/DistributeModal.vue
@@ -23,11 +23,11 @@
         </a-row>
         <a-row>
           <a-col>
-            <a-form-item label="分表委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-select
                 v-decorator="['name', validatorRules.name]"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                placeholder="请选择分表委名称"
+                placeholder="请选择分标委名称"
                 @select="select"
               >
                 <a-select-option v-for="item in list" :key="item.id" :value="item.id">
@@ -90,7 +90,7 @@ export default {
         sm: { span: 17 }
       },
       fileList: [], // 文件数据
-      list: [], // 分表委名称
+      list: [], // 分标委名称
       memberList: [], // 成员树
       checkedKeys: [], // 已选中的成员数组
       businessSelectedRowKeys: [],
@@ -102,7 +102,7 @@ export default {
       },
       validatorRules: {
         name: {
-          rules: [{ required: true, message: '请选择分表委名称' }],
+          rules: [{ required: true, message: '请选择分标委名称' }],
           validateTrigger: 'change'
         },
         dataId: {
@@ -115,15 +115,15 @@ export default {
         }
       },
       url: {
-        list: 'payCaseCommittee/payCaseCommittee/list', // 分标委列表---分表委列表
-        memberList: 'payCaseCommitteeSubitem/payCaseCommitteeSubitem/list', // 分表委成员列表
+        list: 'payCaseCommittee/payCaseCommittee/list', // 分标委列表---分标委列表
+        memberList: 'payCaseCommitteeSubitem/payCaseCommitteeSubitem/list', // 分标委成员列表
         distribute: 'payDataFile/payDataFile/distribute', // 分发
         distributeBatch: 'payDataFile/payDataFile/distributes' // 批量分发
       }
     }
   },
   created(){
-    // 获取分表委名称
+    // 获取分标委名称
     getAction(this.url.list).then(res => {
       if (res.success) {
         this.list = res.result.records
@@ -132,7 +132,7 @@ export default {
   },
   methods: {
     select(value) {
-      // 分表委value===id去获取成员数据
+      // 分标委value===id去获取成员数据
       if (value) {
         getAction(this.url.memberList, { id: value }).then(res=>{
           if (res.success) {
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 18468aa..ed0a154 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -10,14 +10,15 @@
           <a-row :gutter="24">
 
             <!--如果是工作组项目的会议维护跳转的 需要隐藏会议类型-->
-            <a-col :xxl="8" :xl="12" :sm="24" v-if="isWorkGroupMeetType">
-              <a-form-item label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-dict-select-tag style="width: 100%" v-decorator="['meetingType',validatorRules.meetingType]"
-                                   @change="changeMeetingType"
-                                   :trigger-change="true" dict-code="meeting_type"
-                                   placeholder="请选择会议类型"></j-dict-select-tag>
-              </a-form-item>
-            </a-col>
+            <!--            会议拆分不需要会议类型了 需要在调接口的时候传相应的会议类型-->
+            <!--            <a-col :xxl="8" :xl="12" :sm="24" v-if="isWorkGroupMeetType">-->
+            <!--              <a-form-item label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+            <!--                <j-dict-select-tag style="width: 100%" v-decorator="['meetingType',validatorRules.meetingType]"-->
+            <!--                                   @change="changeMeetingType"-->
+            <!--                                   :trigger-change="true" dict-code="meeting_type"-->
+            <!--                                   placeholder="请选择会议类型"></j-dict-select-tag>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
 
             <a-col :xxl="8" :xl="12" :sm="24">
               <a-form-item label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -221,7 +222,7 @@
             <a-col :xxl="8" :xl="12" :sm="24" v-if="QRcodeBool">
               <a-form-item label="收款二维码" :labelCol="{ xs: {span: 24},sm: {span: 8}}"
                            :wrapperCol="{ xs: {span: 24},xl:{span:14},sm: {span: 16}}">
-                <j-image-upload :return-id="true"  v-decorator="[ 'QRcode']"></j-image-upload>
+                <j-image-upload :return-id="true" v-decorator="[ 'QRcode']"></j-image-upload>
               </a-form-item>
             </a-col>
           </a-row>
@@ -340,7 +341,7 @@
 </template>
 
 <script>
-import {getUserInfo, getMeetInfoById, getAllWorkProjects} from '@api/incomeMeetingApi'
+import {getUserInfo, getMeetInfoById} from '@api/incomeMeetingApi'
 import {isRepeat} from '@/utils/util'
 import {httpAction} from '@api/manage'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
@@ -404,8 +405,6 @@ export default {
       },
       // 详细地址
       address: '',
-      // 会议类型 新增时默认为其他会议
-      meetingType: '4',
       validatorRules: meetingValidate,
       validateInviteCode: {
         invitationCode: {
@@ -452,6 +451,8 @@ export default {
       workGroupList: [],
       // 收费二维码显示
       QRcodeBool: true,
+      // 会议类型
+      meetingType:'',
     }
   },
   computed: {
@@ -466,13 +467,16 @@ export default {
   },
   mounted() {
     this.pcaData = new AreaPca()
-    // 编辑获取会议信息
+    // 编辑获取会议信息 有id就是编辑走编辑
     if (this.$route.query.id) {
       getMeetInfoById({id: this.$route.query.id}).then(res => {
         if (res.success) {
           this.edit(res.result)
         }
       })
+    }else {
+      // 没有id走新增
+      this.add()
     }
   },
   methods: {
@@ -493,19 +497,29 @@ export default {
       let dateFormat = 'YYYY-MM-DD HH:mm:ss'
       if (this.model.id) {
         this.title = '编辑会议'
+        // 修改会议类型 控制dom显示 编辑取接口查到的会议类型
+        this.meetingType = record.meetingType + ''
       } else {
         this.title = '新增会议'
+        // 如果是标协会会议需要显示酒店联系人
+        if (this.$route.query.meetingType && this.$route.query.meetingType === '2') {
+          this.model.hotelContactsList = [{
+            hotelContacts: '',
+            hotelContactsPhone: ''
+          }]
+        }
+        // 新增取路由参数
+        this.meetingType = this.$route.query.meetingType
       }
-      // 修改会议类型 控制dom显示
-      this.meetingType = record.meetingType + ''
-      // 当为工作组会议的时候 需要获取工作组
-      if (this.meetingType === '1') {
-        this.getWorkSelectList()
-      }
+      console.log(this.model)
       // 召开时间回显
-      this.model.convokeTime = [moment(this.model.startTime, dateFormat), moment(this.model.endTime, dateFormat)]
+      if(this.model.startTime){
+        this.model.convokeTime = [moment(this.model.startTime, dateFormat), moment(this.model.endTime, dateFormat)]
+      }
       // 注册签到时间回显
-      this.model.signInTime = [moment(this.model.startSignInTime, dateFormat), moment(this.model.endSignInTime, dateFormat)]
+      if( this.model.startSignInTime){
+        this.model.signInTime = [moment(this.model.startSignInTime, dateFormat), moment(this.model.endSignInTime, dateFormat)]
+      }
       // 后端需要的召开时间
       this.newConvokeTime = [this.model.startTime, this.model.endTime]
       // 后端需要的注册签到时间
@@ -756,23 +770,6 @@ export default {
         callback('请输入合法的金额数字，最多2位小数,10位正数')
       }
     },
-    /*
-    * 获取所有的工作组
-    * */
-    getWorkSelectList() {
-      getAllWorkProjects().then(res => {
-        if (res.success) {
-          this.workGroupList = [...res.result]
-        }
-      })
-    },
-    moenyQRcode() {
-      let meetingCosts = this.form.getFieldValue('meetingCosts')
-      let meetingCostsVip = this.form.getFieldValue('meetingCostsVip')
-      console.log('meetingCostsVip', meetingCostsVip)
-      console.log('meetingCostsVip', meetingCosts)
-    },
-
   }
 }
 </script>
diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 31402e1..310e7e3 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -123,10 +123,10 @@
                                    dictCode="signup_status"/>
               </a-form-item>
             </a-col>
-
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+<!--            只有工作组会议与分标委会议才有审核信息-->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24"  v-show="currentMeetingInfo.meetingType === '1' || currentMeetingInfo.meetingType === '5' ">
               <a-form-item label="审核报名信息">
-                <j-dict-select-tag v-model="queryParam.checkSingInResult" placeholder="请选择"
+                <j-dict-select-tag  v-model="queryParam.checkSingInResult" placeholder="请选择"
                                    dictCode="signup_status"/>
               </a-form-item>
             </a-col>
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index 3788ed6..5b4a891 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -55,7 +55,7 @@
           </template>
 
           <span slot="action" slot-scope="text, record" class="action-span-cell">
-          <a @click="handleStandardMeeting(record.id)">会议维护</a>
+          <a @click="handleStandardMeeting(record)">会议维护</a>
         </span>
 
         </a-table>
@@ -132,7 +132,8 @@ export default {
         path:'/projectManagement/CommitteeMeeting',
         query:{
           id:record.id,
-          title:record.projectName
+          title:record.projectName,
+          meetingType:'2'
         }
       })
     }
diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue
index b74d5fd..b89bff2 100644
--- a/src/views/projectManagement/CommitteeMeeting.vue
+++ b/src/views/projectManagement/CommitteeMeeting.vue
@@ -1,122 +1,123 @@
 <template>
-<div>
-  <page-header-title :is-level-one="false" :level-two-title="pageTitle"></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"></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>
+  <div>
+    <page-header-title :is-level-one="false" :level-two-title="pageTitle"></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"></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">
+            <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">查询</a-button>
               <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
             </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!--    /查询区域-->
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--    /查询区域-->
 
-    <!--    操作按钮区域-->
-    <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-      <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')">导出</a-button>
-      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
-      <a-button type="primary" @click="publishRemind">发布</a-button>
-    </div>
-    <!--    /操作按钮区域-end-->
+      <!--    操作按钮区域-->
+      <div class="table-operator">
+        <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('工作组会议维护')">导出</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+        <!--只有工作会议与分标委会议才有-->
+        <a-button type="primary" @click="publishRemind" v-if="meetingType === '5' ">发布</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">
+      <!--    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="projectName" slot-scope="text, record">
-          <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
-        </template>
+          <!--        工作组名称-->
+          <template slot="projectName" slot-scope="text, record">
+            <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
+          </template>
 
-        <template slot="text" slot-scope="text">
-          <j-ellipsis :value="text" :length="20"></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">
+          <span slot="action" class="action-span-cell" slot-scope="text, record">
           <a @click="uploadFile(record)">上传文件</a>
-          <!--          <a @click="applyMsg">报名信息</a>-->
+            <!--          <a @click="applyMsg">报名信息</a>-->
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</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>
+        </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>
@@ -144,8 +145,6 @@ export default {
   mixins: [JeroListMixin, RangeDateMixin],
   data() {
     return {
-      workingGroupProject: '',
-      workingGroupProjectId: '',
       disableMixinCreated: true,
       list: [],
       labelCol: {
@@ -238,18 +237,28 @@ export default {
         delete: '/meeting/payMeeting/delete',
         deleteBatch: '/meeting/payMeeting/deleteBatch',
         exportXlsUrl: '/meeting/payMeeting/exportWorkingGroupXls',
-      }
+      },
+
     }
   },
   created() {
-    this.workingGroupProject = this.$route.query.workingGroupProject
-    this.workingGroupProjectId = this.$route.query.workingGroupProjectId
-    this.filters.workingGroupId = this.workingGroupProjectId
+    this.filters.meetingType = this.meetingType
     this.loadData(1)
+    // 不是分标委会议去掉提醒字段
+    if (this.meetingType !== 5) {
+      console.log(this.columns)
+      // 找出提醒字段的索引
+      let index = this.columns.findIndex(item => item.dataIndex === 'remind_dictText')
+      this.columns.splice(index, 1)
+    }
   },
-  computed:{
-    pageTitle(){
+  computed: {
+    pageTitle() {
       return `${this.$route.query.title}`
+    },
+    // 会议类型
+    meetingType() {
+      return this.$route.query.meetingType + ''
     }
   },
   methods: {
@@ -257,12 +266,11 @@ export default {
     * 新增
     * */
     handleAdd() {
-      // 记录当前的工作组id
-      let currentId = this.$route.query.workingGroupProjectId
+      // 分表委的新增应该是需要分表委的i
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
-          workingGroupProjectId: currentId
+          meetingType:this.meetingType
         }
       })
     },
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index c33ac78..f6df130 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -90,7 +90,7 @@
           <span v-else></span>
         </template>
 
-        <template slot="meetingName" slot-scope="text">
+        <template slot="meetingName" slot-scope="text,record">
           <j-ellipsis class="primary-color" v-if="text" :value="text" @click="toAttendance(record)" :length="20"></j-ellipsis>
           <span v-else></span>
         </template>
@@ -260,6 +260,9 @@ export default {
     handleAdd() {
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query:{
+          meetingType:'3'
+        }
       })
     },
     /*
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index f98ec4a..5fe8be3 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -265,6 +265,9 @@ name: 'OtherMeeting',
     handleAdd() {
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query:{
+          meetingType:'4'
+        }
       })
     },
     /*