修改了PC 页面

src/api/admin/meeting/reservation.js

@@ -12,6 +12,14 @@ export function getReservationList (parameter) {
   })
 }
 
+export function get (id) {
+  return axios({
+    url: api.reservation + '/get/'+id,
+    method: 'get',
+    params: {}
+  })
+}
+
 export function saveReservation (parameter) {
   return axios({
     url: api.reservation + (parameter.id > 0 ? '/update' : '/save'),

src/views/admin/meeting/ReservationInfo.vue

@@ -0,0 +1,168 @@
+<template>
+  <a-card :body-style="{padding: '24px 32px'}" :bordered="false">
+
+    <div style='display: flex;margin-bottom: 20px'>
+      <span style='width: 20px;display: block;font-size: 25px;color: #1890ff;font-weight: bold;'>|</span>
+      <span style='display: block;margin-top: 11px;font-size: 15px'>新增优惠卷</span>
+    </div>
+    <a-form-model :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="会议主题">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="会议室名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="预约人">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="会议类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="联系方式">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="所属公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="会议开始时间">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="会议结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="订单编号">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="实收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="订单状态">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="使用优惠劵" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="支付时间">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item  label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            {{form.name}}
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form-model>
+    <div style='display: flex;margin-bottom: 20px'>
+      <span style='width: 20px;display: block;font-size: 25px;color: #1890ff;font-weight: bold;'>|</span>
+      <span style='display: block;margin-top: 11px;font-size: 15px'>新增优惠卷</span>
+    </div>
+    <div style='display: flex;justify-content: space-between;align-items: center; margin: 20px 0px 20px 80px'>
+      <div >
+        <span>邀请人数:<span style='margin-left: 20px'>6</span></span>
+        <span style='margin-left: 100px'>实到人数:<span style='margin-left: 20px'>6</span></span>
+      </div>
+
+      <a-form layout='inline'>
+        <a-form-item label='关键词' style='margin-right: 135px'>
+          <a-input placeholder='请输入关键词' v-model='queryParam.title' />
+        </a-form-item>
+      </a-form>
+    </div>
+    <a-table :columns='columns'
+             size='default'
+             ref='table'
+             style='width: 1000px;margin-left: 80px'
+             bordered
+             >
+<!--:data-source='loadData'-->
+    </a-table>
+  </a-card>
+</template>
+
+<script>
+export default {
+  name: 'reservationInfo',
+  data(){
+    return {
+      labelCol: { span: 12 },
+      wrapperCol: { span: 8 },
+      form: {
+        name: '111',
+
+      },
+      queryParam:{
+
+      },
+      columns: [
+        {
+          title: '参会人员',
+          dataIndex: 'name'
+        },
+        {
+          title: '联系电话',
+          dataIndex: 'user.nickname',
+        },
+        {
+          title: '邀请人',
+          dataIndex: 'user.mobile'
+        },
+        {
+          title: '接收时间',
+          dataIndex: 'num'
+        },
+        {
+          title: '是否到访',
+          dataIndex: 'num'
+        },
+        {
+          title: '到访时间',
+          dataIndex: 'num'
+        },
+      ],
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/admin/meeting/ReservationList.vue

@@ -28,7 +28,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">新建</a-button>
+      <a-button v-if="addEnable" type="primary" icon="plus" @click="$refs.modal.add()">会议预约</a-button>
       <a-dropdown v-if="removeEnable&&selectedRowKeys.length > 0">
         <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
       </a-dropdown>
@@ -42,6 +42,8 @@
       :data="loadData"
     >
       <span slot="action" slot-scope="text, record">
+        <a  @click="handleInfo(record)">详情</a>
+        <a-divider type="vertical" />
         <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
         <a-divider type="vertical" />
         <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
@@ -88,19 +90,19 @@
         },
         {
           title: '会议室名称',
-          dataIndex: 'roomContentName'
+          dataIndex: 'roomContent.meetingName'
         },
         {
           title: '会议类型',
-          dataIndex: 'roomType'
+          dataIndex: 'roomContent.typeName'
         },
         {
           title: '预约人',
-          dataIndex: 'userId'
+          dataIndex: 'userName'
         },
         {
           title: '所属公司',
-          dataIndex: 'customerId'
+          dataIndex: 'customerName'
         },
         {
           title: '会议开始时间',
@@ -112,7 +114,7 @@
         },
         {
           title: '时长',
-          dataIndex: 'duration'
+          dataIndex: 'roomContent.duration'
         },
         {
           title: '金额',
@@ -120,7 +122,7 @@
         },
         {
           title: '预约状态',
-          dataIndex: 'stauts'
+          dataIndex: 'statusName'
         },
         {
           title: '操作',
@@ -149,6 +151,11 @@
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
+    //详情，跳转页面
+    handleInfo (record) {
+      this.$router.push({ name: 'reservationInfo', query: { id: record.id } })
+
+    },
     handleAdd () {
       this.$refs.modal.add()
     },

src/views/admin/meeting/modules/ReservationModal.vue

@@ -14,54 +14,71 @@
       <a-form-item style="display:none">
         <a-input v-decorator="['version']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议主体id">
+<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议主体id">-->
-        <a-input placeholder="会议主体id" v-decorator="['roomContentId']"/>
+<!--        <a-input placeholder="会议室名称" v-decorator="['roomContentId']"/>-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户id">
+<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="用户id">-->
-        <a-input placeholder="用户id" v-decorator="['userId']"/>
+<!--        <a-input placeholder="用户id" v-decorator="['userId']"/>-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠卷id">
+<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠卷id">-->
-        <a-input placeholder="优惠卷id" v-decorator="['ticketId']"/>
+<!--        <a-input placeholder="优惠卷id" v-decorator="['ticketId']"/>-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="企业id">
+<!--      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="企业id">-->
-        <a-input placeholder="企业id" v-decorator="['customerId']"/>
+<!--        <a-input placeholder="企业id" v-decorator="['customerId']"/>-->
-      </a-form-item>
+<!--      </a-form-item>-->
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="主题">
         <a-input placeholder="主题" v-decorator="['title']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="预约状态">
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='开始时间'>
-        <a-input placeholder="预约状态" v-decorator="['stauts']"/>
+<!--        <a-input placeholder='开始时间' v-decorator="['startTime']" />-->
+        <a-date-picker
+          :ranges="{ Today: [moment(), moment()], 'This Month': [moment(), moment().endOf('month')] }"
+          show-time
+          format="YYYY-MM-DD HH:mm"
+          @change="onRangeChangeSign"
+          v-decorator="['startTime', {rules: [{required: true, message: '开始时间'}]}]"
+          placeholder="开始时间"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否申请售后0否1是">
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='结束时间'>
-        <a-input placeholder="是否申请售后0否1是" v-decorator="['isAfterSale']"/>
+        <a-date-picker
+          :ranges="{ Today: [moment(), moment()], 'This Month': [moment(), moment().endOf('month')] }"
+          show-time
+          format="YYYY-MM-DD HH:mm"
+          @change="onRangeChangeSign"
+          v-decorator="['endDate', {rules: [{required: true, message: '结束时间'}]}]"
+          placeholder="开始时间"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="订单号">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="时长">
-        <a-input placeholder="订单号" v-decorator="['oderNumber']"/>
+        <a-input placeholder="时长" v-decorator="['duration']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="订单价格">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="发起人">
-        <a-input placeholder="订单价格" v-decorator="['orderMoney']"/>
+        <a-input placeholder="发起人" v-decorator="['title']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="订单取消原因">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系电话">
-        <a-input placeholder="订单取消原因" v-decorator="['cancelResaon']"/>
+        <a-input placeholder="联系电话" v-decorator="['title']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议室id">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="会议室">
-        <a-input placeholder="会议室id" v-decorator="['meetingId']"/>
+        <a-input placeholder="会议室" v-decorator="['title']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建者">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司">
-        <a-input placeholder="创建者" v-decorator="['createBy']"/>
+        <a-input placeholder="公司" v-decorator="['oderNumber']"/>
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="更新者">
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠卷">
-        <a-input placeholder="更新者" v-decorator="['updateBy']"/>
+        <a-input placeholder="优惠卷" v-decorator="['orderMoney']"/>
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注">
-        <a-input placeholder="备注" v-decorator="['remake']"/>
+        <a-input placeholder="备注" v-decorator="['orderMoney']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="总金额">
+        <a-input placeholder="总金额" v-decorator="['orderMoney']"/>
       </a-form-item>
     </a-form>
   </a-modal>
 </template>
 <script>
-    import {saveReservation} from '@/api/admin/meeting/reservation'
+    import {saveReservation,get} from '@/api/admin/meeting/reservation'
     import pick from 'lodash.pick'
+    import moment from 'moment'
 
     export default {
   name: 'ReservationModal',
@@ -90,6 +107,12 @@
   created () {
   },
   methods: {
+    moment,
+    onRangeChangeSign(){
+
+    },
+
+
     add () {
       this.form.resetFields()
       this.edit({ id: 0 })
@@ -100,6 +123,13 @@
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.mdl, 'id', 'roomContentId', 'userId', 'ticketId', 'customerId', 'title', 'stauts', 'isAfterSale', 'oderNumber', 'orderMoney', 'cancelTime', 'cancelResaon', 'visitType', 'explainNeedType', 'meetingNeedType', 'meetingId', 'photographType', 'startTime', 'endTime', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime', 'remake'))
       })
+      get(record.id).then(res =>{
+        this.form.setFieldsValue({
+          endDate:res.endDate,
+          duration:res.duration
+
+        })
+      })
     },
     handleSubmit (e) {
       e.preventDefault()