Merge branch 'master' of https://gitee.com/elegant_wings/dbd-meeting-html

src/views/admin/meeting/ShowroomRecordList.vue

@@ -26,11 +26,17 @@
     <s-table
       size="default"
       ref="table"
-      rowKey="id"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       :columns="columns"
       :data="loadData"
+      rowKey='id'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'>
     >
+      <span slot='visitType' slot-scope='text'>
+        {{ text | visitType }}
+      </span>
+      <span slot='persons' slot-scope='text,record'>
+        <a @click='handlePersons(record)'>查看</a>
+      </span>
       <span slot="action" slot-scope="text, record">
         <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
         <a-divider type="vertical" />
@@ -38,6 +44,15 @@
       </span>
     </s-table>
     <showroomRecord-modal ref="modal" @ok="handleOk"/>
+
+    <a-modal v-model='visible' title='参观人员' width='800px' :footer="null" >
+      <a-table :columns='personColumns'
+               size='default'
+               ref='table'
+               style='width: 600px;margin-left: 40px'
+               :data-source='personData'>
+      </a-table>
+    </a-modal>
   </a-card>
 </template>
 
@@ -47,7 +62,9 @@
     import {delShowroomRecord,getShowroomRecordList} from '@/api/admin/meeting/showroomRecord'
     import ShowroomRecordModal from './modules/ShowroomRecordModal.vue'
     import {checkPermission} from '@/utils/permissions'
+    import { getDictArray } from '@/utils/dict'
 
+    const typeMap = {}
     export default {
   name: 'TableList',
   components: {
@@ -70,11 +87,27 @@
       advanced: false,
       // 查询参数
       queryParam: {},
+      visible:false,
+      personData:[],
+      personColumns:[
+        {
+          title: '名称',
+          dataIndex: 'name'
+        },
+        {
+          title: '职位',
+          dataIndex: 'job'
+        },
+        {
+          title: '展厅名称',
+          dataIndex: 'phone'
+        }
+      ],
       // 表头
       columns: [
         {
           title: '展厅名称',
-          dataIndex: 'meetingName'
+          dataIndex: 'showRoomName'
         },
 
         {
@@ -83,11 +116,14 @@
         },
         {
           title: '来参观人员',
-          dataIndex: 'reservationNumber'
+          dataIndex: 'persons',
+          scopedSlots: { customRender: 'persons' }
+
         },
         {
-          title: '来参观人员',
-          dataIndex: 'visitType'
+          title: '参观目的',
+          dataIndex: 'visitType',
+          scopedSlots: { customRender: 'visitType' }
         },
         {
           title: '预约-开始时间',
@@ -112,20 +148,37 @@
       },
       selectedRowKeys: [],
       selectedRows: [],
+      typeMap,
       addEnable: checkPermission('meeting:showroomRecord:add'),
       editEnabel: checkPermission('meeting:showroomRecord:edit'),
       removeEnable: checkPermission('meeting:showroomRecord:remove')
     }
   },
   filters: {
+    visitType(Type) {
+      return typeMap[Type].text
+    },
   },
-  created () {
+  async created () {
+    const TypeData = await getDictArray('visit_type')
+    TypeData.map(d => {
+      typeMap[d.dictValue] = { text: d.dictLabel }
+    })
   },
   methods: {
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
+
+    handlePersons(record){
+      this.visible =true
+      console.log(record.persons)
+      this.personData =  JSON.parse(record.persons)
+    },
+    itemHandleOk(){
+
+    },
     handleAdd () {
       this.$refs.modal.add()
     },