Merge remote-tracking branch 'origin/master' into master

src/views/admin/meeting/ReservationInfo.vue

@@ -76,6 +76,13 @@
             {{ form.statusName }}
           </a-form-item>
         </a-col>
+        <a-col :span='10' v-if='form.statusName == "已取消"'>
+          <a-form-item label='取消原因' :labelCol='labelCol' :wrapperCol='wrapperCol'>
+            {{ form.cancelResaon }}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
         <a-col :span='10'>
           <a-form-item label='使用优惠劵' :labelCol='labelCol' :wrapperCol='wrapperCol'>
             {{ form.ticketName }}

src/views/admin/meeting/ReservationList.vue

@@ -10,12 +10,11 @@
           </a-col>
           <a-col :md='5' :sm='15'>
             <a-form-item label='预约状态'>
-              <a-input placeholder='请输入预约状态' v-model='queryParam.stauts' />
-            </a-form-item>
-          </a-col>
-          <a-col :md='5' :sm='15'>
-            <a-form-item label='订单号'>
-              <a-input placeholder='请输入订单号' v-model='queryParam.oderNumber' />
+              <a-select v-model='queryParam.statusValue' placeholder='请选择会议室'>
+                <a-select-option v-for='item in meetingStatusList' :key='item.value' :value='item.value'>
+                  {{ item.label }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :md='8' :sm='24'>
@@ -47,18 +46,35 @@
         <a v-if='editEnabel' @click='handleEdit(record)'>编辑</a>
         <a-divider type='vertical' />
         <a v-if='removeEnable' @click='delByIds([record.id])'>删除</a>
-         <a-tag v-if='record.statusValue == 0' color='green'>通过</a-tag>
-         <a-tag v-if='record.statusValue == 0 || record.statusValue == 1' color='volcano'>驳回</a-tag>
+         <a-tag @click='verifySuccess(record.id)' v-if='record.statusValue == 0' color='green'>通过</a-tag>
+         <a-tag @click='verifyReject(record.id)' v-if='record.statusValue == 0 || record.statusValue == 1'
+                color='volcano'>驳回</a-tag>
       </span>
     </s-table>
     <reservation-modal ref='modal' @ok='handleOk' />
+
+
+    <a-modal
+      title='驳回'
+      :visible='rejectModalVisible'
+      :confirm-loading='rejectConfirmLoading'
+      @ok='rejectHandleOk'
+      @cancel='rejectHandleCancel'
+      cancelText='取消'
+      okText='确认'
+    >
+      <div class='rejectView'>
+        <div class='label'>驳回原因</div>
+        <a-input class='content' v-model='rejectContent' placeholder='请输入驳回原因' />
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
 import { STable } from '@/components'
 
-import { delReservation, getReservationList } from '@/api/admin/meeting/reservation'
+import { delReservation, getReservationList, saveReservation } from '@/api/admin/meeting/reservation'
 import ReservationModal from './modules/ReservationModal.vue'
 import { checkPermission } from '@/utils/permissions'
 
@@ -83,11 +99,14 @@ export default {
       // 高级搜索 展开/关闭
       advanced: false,
       // 查询参数
-      queryParam: {},
+      queryParam: {
+        title: null,
+        statusValue: null
+      },
       // 表头
       columns: [
         {
-          title: '会议名称',
+          title: '会议主题',
           dataIndex: 'title'
         },
         {
@@ -141,7 +160,37 @@ export default {
       selectedRows: [],
       addEnable: checkPermission('meeting:reservation:add'),
       editEnabel: checkPermission('meeting:reservation:edit'),
-      removeEnable: checkPermission('meeting:reservation:remove')
+      removeEnable: checkPermission('meeting:reservation:remove'),
+      rejectModalVisible: false,
+      rejectConfirmLoading: false,
+      rejectModalId: null,
+      rejectContent: null,
+      meetingStatusList: [
+        {
+          label: '全部',
+          value: null
+        },
+        {
+          label: '待支付',
+          value: 0
+        },
+        {
+          label: '待使用',
+          value: 1
+        },
+        {
+          label: '进行中',
+          value: 2
+        },
+        {
+          label: '已结束',
+          value: 3
+        },
+        {
+          label: '已取消',
+          value: 4
+        }
+      ]
     }
   },
   filters: {},
@@ -177,6 +226,57 @@ export default {
         }
         this.selectedRowKeys = []
       })
+    },
+    verifySuccess(id) {
+      saveReservation({
+        id,
+        stauts: 1
+      }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('审核通过')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    },
+    verifyReject(id) {
+      this.rejectModalId = id
+      this.rejectModalVisible = true
+    },
+    rejectHandleOk() {
+      console.log('rejectHandleOk', this.rejectContent)
+      let id = this.rejectModalId
+      let cancelResaon = this.rejectContent
+      // 校验必填
+      if (!this.rejectContent) {
+        this.$message.error('驳回原因不能为空!')
+        return
+      }
+      // 设置确认加载状态
+      this.rejectConfirmLoading = true
+      // 调用接口
+      saveReservation({
+        id,
+        stauts: 4,
+        cancelResaon
+      }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('操作成功')
+          this.rejectHandleCancel()
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    },
+    rejectHandleCancel() {
+      this.rejectModalId = null
+      this.rejectModalVisible = false
+      this.rejectConfirmLoading = false
+      this.rejectContent = null
     }
   },
   watch: {
@@ -195,3 +295,21 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.rejectView {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.rejectView .label {
+
+}
+
+.rejectView .content {
+  flex: 1;
+  margin-left: 10px;
+}
+
+</style>