diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 061cf19..ebc958b 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -464,8 +464,7 @@ export default {
       this.newConvokeTime = [this.model.startTime, this.model.endTime]
       // 后端需要的注册签到时间
       this.newSignInTime = [this.model.startSignInTime, this.model.endSignInTime]
-      // 联系人电话
-      this.model.directorPhone = this.$route.query.directorPhone
+
       this.$nextTick(() => {
         // 加定时器是因为有可能赋值不成功
         setTimeout( () => {
@@ -504,9 +503,10 @@ export default {
           }
           let placeName = values.convokeLocale
           const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
-          // 如果是工作会议维护跳转的需要加上会议类型为工作组会议
+          // 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id
           if(!this.isWorkGroupMeetType) {
             formData.meetingType = '1'
+            formData.workingGroupId = this.$route.query.workingGroupProjectId
           }
           // 转换召开时间
           formData.startTime = this.newConvokeTime[0]
diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue
index 108e729..4171e6d 100644
--- a/src/views/incomePayments/meetManage/MeetManageList.vue
+++ b/src/views/incomePayments/meetManage/MeetManageList.vue
@@ -252,7 +252,6 @@ export default {
         path: '/incomePayments/meetManage/AddOrDetailMeet',
         query: {
           id: record.id,
-          directorPhone: record.directorPhone
         }
       })
     },
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index d4c6fa9..b5d6ffa 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -12,24 +12,22 @@
         <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.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="请选择开始日期"
-                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
-                v-model="queryParam.startTime"
+                v-model="queryParam.meetingStartTime"
                 :disabled-date="disabledStartDate">
               </j-date>
               <span class="query-group-split-cust"></span>
               <j-date
                 placeholder="请选择结束日期"
-                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
-                v-model="queryParam.endTime"
+                v-model="queryParam.meetingEndTime"
                 :disabled-date="disabledEndDate">
               </j-date>
             </a-form-item>
@@ -37,24 +35,22 @@
           <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>
+                           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="请选择开始日期"
-                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
-                v-model="queryParam.startCreateTime"
+                v-model="queryParam.createTime_begin"
                 :disabled-date="disabledStartCreateDate">
               </j-date>
               <span class="query-group-split-cust"></span>
               <j-date
                 placeholder="请选择结束日期"
-                date-format="YYYY-MM-DD HH:mm:ss"
                 class="query-group-cust"
-                v-model="queryParam.endCreateTime"
+                v-model="queryParam.createTime_end"
                 :disabled-date="disabledEndCreateDate">
               </j-date>
             </a-form-item>
@@ -94,8 +90,8 @@
           size="middle"
           bordered
           rowKey="id"
+          :scroll="{x:true}"
           :columns="columns"
-          :scroll="{x: 1500}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -132,6 +128,7 @@ import JDate from '@comp/tools/JDate'
 import moment from 'moment'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
 import PublishRemindModal from '@views/projectManagement/modules/PublishRemindModal'
+import '@/assets/less/TableExpand.less'
 
 export default {
   name: 'ConferenceMaintenance',
@@ -141,6 +138,7 @@ export default {
     return {
       workingGroupProject: '',
       workingGroupProjectId: '',
+      disableMixinCreated:true,
       list: [],
       labelCol: {
         xs: { span: 24 },
@@ -151,8 +149,8 @@ export default {
         sm: { span: 10 }
       },
       dateKeyObj: {
-        beginKey: 'startTime',
-        endKey: 'endTime'
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndtTime'
       },
       columns: [
         {
@@ -164,60 +162,82 @@ export default {
           customRender: function (t, r, index) {
             return parseInt(index) + 1
           }
-        }, {
+        },
+        {
           title: '会议名称',
           align: 'center',
-          dataIndex: '',
-          scopedSlots: { customRender: 'projectName' }
-        }, {
+          dataIndex: 'meetingName',
+          scopedSlots: {customRender: 'htmlSlot'},
+          width: 160,
+        },
+        {
           title: '会议类型',
           align: 'center',
-          width: 140,
-          dataIndex: ''
-        }, {
+          dataIndex: 'meetingType_dictText',
+          width: 100,
+        },
+        {
           title: '负责人',
           align: 'center',
-          dataIndex: '',
-        }, {
+          dataIndex: 'directorName',
+          width: 160,
+        },
+        {
           title: '召开时间',
           align: 'center',
-          dataIndex: '',
-          width: 180,
-        }, {
+          dataIndex: 'startTime',
+          width: 160,
+          customRender: function (text, record) {
+            return `${record.startTime}~${record.endTime}`
+          }
+        },
+        {
+          title: '召开地点',
+          align: 'center',
+          dataIndex: 'venue',
+          width: 160,
+          customRender: function (text, record) {
+            return text + '/' + record.address
+          }
+        },
+        {
           title: '年份',
           align: 'center',
-          dataIndex: '',
-          width: 120,
-        }, {
+          dataIndex: 'particularYear',
+          width: 100,
+        },
+        {
           title: '已提醒',
           align: 'center',
-          width: 80,
-          dataIndex: ''
-        }, {
+          dataIndex: '',
+          width: 100,
+        },
+        {
           title: '创建时间',
           align: 'center',
-          dataIndex: '',
-          width: 180,
-        }, {
+          dataIndex: 'createTime',
+        },
+        {
           title: '操作',
-          dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 180,
-          scopedSlots: { customRender: 'action' }
-        }
+          width: 160,
+          scopedSlots: {customRender: 'action'}
+        },
       ],
       url: {
-        list: '',
-        delete: '',
-        deleteBatch: '',
-        exportXlsUrl: ''
+        list: '/meeting/payMeeting/page',
+        delete: '/meeting/payMeeting/delete',
+        deleteBatch: '/meeting/payMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/payMeeting/exportXls',
       }
     }
   },
   created() {
     this.workingGroupProject = this.$route.query.workingGroupProject
     this.workingGroupProjectId = this.$route.query.workingGroupProjectId
+    this.filters.workingGroupId =  this.workingGroupProjectId
+    this.loadData(1)
   },
   methods: {
     /**
@@ -242,6 +262,20 @@ export default {
       })
     },
     /*
+    * 编辑
+    * */
+    handleEdit(record){
+      // 记录当前的工作组id
+      let currentId = this.$route.query.workingGroupProjectId
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query:{
+          workingGroupProjectId:currentId,
+          id: record.id,
+        }
+      })
+    },
+    /*
     * 发布提醒
     * */
     publishRemind() {
@@ -260,10 +294,10 @@ export default {
     * */
     applyMsg() {},
     /*
-* 创建时间开始禁用
-* */
+    * 创建时间开始禁用
+    * */
     disabledStartCreateDate(startValue){
-      const endValue = this.queryParam.endCreateTime && moment(this.queryParam.endCreateTime, this.rangeDateFormat.end)
+      const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
       if (!startValue || !endValue) {
         return false
       }
@@ -273,12 +307,23 @@ export default {
     * 创建时间结束禁用
     * */
     disabledEndCreateDate(endValue) {
-      const startValue = this.queryParam.startCreateTime && moment(this.queryParam.startCreateTime, this.rangeDateFormat.begin)
+      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>