From 273519b1897925da4938a231f4d522c93e782115 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 7 Sep 2021 16:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0[2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetManage/MeetManageList.vue             | 79 ++++++++++---------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/views/incomePayments/meetManage/MeetManageList.vue b/src/views/incomePayments/meetManage/MeetManageList.vue
index f252243..108e729 100644
--- a/src/views/incomePayments/meetManage/MeetManageList.vue
+++ b/src/views/incomePayments/meetManage/MeetManageList.vue
@@ -15,7 +15,6 @@
               <a-form-item label="会议时间">
                 <j-date
                   placeholder="请选择开始日期"
-                  date-format="YYYY-MM-DD HH:mm:ss"
                   class="query-group-cust"
                   v-model="queryParam.meetingStartTime"
                   :disabled-date="disabledStartDate">
@@ -23,7 +22,6 @@
                 <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.meetingEndTime"
                   :disabled-date="disabledEndDate">
@@ -39,7 +37,6 @@
               <a-form-item label="创建时间">
                 <j-date
                   placeholder="请选择开始日期"
-                  date-format="YYYY-MM-DD HH:mm:ss"
                   class="query-group-cust"
                   v-model="queryParam.createTime_begin"
                   :disabled-date="disabledStartCreateDate">
@@ -47,7 +44,6 @@
                 <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.createTime_end"
                   :disabled-date="disabledEndCreateDate">
@@ -76,18 +72,18 @@
       <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}"
-            class="j-table-force-nowrap"
-            @change="handleTableChange">
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :scroll="{x:true}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          class="j-table-force-nowrap"
+          @change="handleTableChange">
 
           <template slot="htmlSlot" slot-scope="text,record">
             <div class="primary-color" @click="toAttendance(record)">{{ text }}</div>
@@ -125,7 +121,7 @@ import moment from 'moment'
 
 export default {
   name: 'MeetManageList',
-  mixins: [JeroListMixin, mixinDevice,RangeDateMixin],
+  mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
   components: {
     JYearDate,
     UploadMeetFileModal,
@@ -171,8 +167,8 @@ export default {
           align: 'center',
           dataIndex: 'startTime',
           width: 160,
-          customRender:function (text,record) {
-            return  `${record.startTime}~${record.endTime}`
+          customRender: function (text, record) {
+            return `${record.startTime}~${record.endTime}`
           }
         },
         {
@@ -180,8 +176,8 @@ export default {
           align: 'center',
           dataIndex: 'venue',
           width: 160,
-          customRender:function (text,record){
-            return  text +'/'+record.address
+          customRender: function (text, record) {
+            return text + '/' + record.address
           }
         },
         {
@@ -198,14 +194,14 @@ export default {
         {
           title: '操作',
           align: 'center',
-          fixed:'right',
+          fixed: 'right',
           width: 160,
           scopedSlots: {customRender: 'action'}
         },
       ],
       dateKeyObj: {
-        beginKey: 'startTime',
-        endKey: 'endTime'
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndtTime'
       },
       url: {
         list: '/meeting/payMeeting/page',
@@ -233,19 +229,30 @@ export default {
     * */
     handleSignup() {
       this.$router.push({
-        path:'/incomePayments/meetManage/SignUpInfoList'
+        path: '/incomePayments/meetManage/SignUpInfoList'
       })
     },
     /*
+    * 修改查询条件
+    * */
+    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)
+    },
+    /*
     *  编辑
     * /incomePayments/meetManage/AddOrDetailMeet
     * */
     handleEdit(record) {
       this.$router.push({
         path: '/incomePayments/meetManage/AddOrDetailMeet',
-        query:{
-          id:record.id,
-          directorPhone:record.directorPhone
+        query: {
+          id: record.id,
+          directorPhone: record.directorPhone
         }
       })
     },
@@ -260,20 +267,20 @@ export default {
     /*
     * 参会情况
     * */
-    toAttendance(record){
+    toAttendance(record) {
       this.$router.push({
-        path:'/incomePayments/meetManage/Attendance',
-        query:{
-          id:record.id,
-          meetingName:record.meetingName
+        path: '/incomePayments/meetManage/Attendance',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName
         }
       })
     },
     /*
     * 创建时间开始禁用
     * */
-    disabledStartCreateDate(startValue){
-      const endValue = this.queryParam.endCreateTime && moment(this.queryParam.endCreateTime, this.rangeDateFormat.end)
+    disabledStartCreateDate(startValue) {
+      const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
       if (!startValue || !endValue) {
         return false
       }
@@ -283,7 +290,7 @@ 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
       }