完成单位管理、会议室管理功能

加入所有页面的强制显示分页

src/api/admin/meeting/roomContent.js

@@ -54,11 +54,14 @@ export function selectSearchInfoByShape(parameter) {
   })
 }
 
-export function saveRoomContent(parameter) {
+export function saveRoomContent(parameter, files) {
   return axios({
     url: '/admin/meetingRoom' + (parameter.id > 0 ? '/update' : '/save'),
     method: 'post',
-    params: parameter,
+    data: {
+      room: parameter,
+      files: files
+    },
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'
     }

src/api/admin/meeting/uto.js

@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  meetingUto: '/admin/uto'
+}
+
+export function getMeetingUtoList (parameter) {
+  return axios({
+    url: api.meetingUto + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveMeetingUto (parameter) {
+  return axios({
+    url: api.meetingUto + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delMeetingUto (parameter) {
+  return axios({
+    url: api.meetingUto + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const meetingUtoExport = api.meetingUto + '/export'

src/views/admin/RepairList.vue

@@ -103,6 +103,7 @@
       size='default'
       ref='table'
       rowKey='id'
+      showPagination="true"
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       :columns='columns'
       :data='loadData'

src/views/admin/meeting/RoomContentList.vue

@@ -75,6 +75,7 @@
       size='default'
       ref='table'
       rowKey='id'
+      showPagination='true'
       :rowSelection='{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }'
       :columns='columns'
       :data='loadData'
@@ -95,17 +96,6 @@
       </span>
     </s-table>
 
-    <a-modal
-      title='提示'
-      :visible='deleteVisible'
-      :confirm-loading='deleteLoading'
-      @ok='deleteOk'
-      @cancel='deleteCancel'
-    >
-      <p>是否确认删除？</p>
-    </a-modal>
-
-
     <roomContent-modal ref='modal' @ok='handleOk' />
     <a-modal v-model='visible' title='会议设备' width='600px' @ok='itemHandleOk()'>
       <s-table

src/views/admin/meeting/UtoList.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="5" :sm="15">
+            <a-form-item label="部门名称">
+              <a-input placeholder="请输入部门名称" v-model="queryParam.orgName"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="reset()">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div class="table-operator">
+      <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>
+    </div>
+    <s-table
+      size="default"
+      ref="table"
+      rowKey="id"
+      showPagination="true"
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+      :columns="columns"
+      :data="loadData"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a v-if="editEnabel" @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a v-if="removeEnable" @click="delByIds([record.id])">删除</a>
+      </span>
+    </s-table>
+    <meetingUto-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {getMeetingUtoList,delMeetingUto} from '@/api/admin/meeting/uto'
+    import MeetingUtoModal from './modules/UtoModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+    import { delRoomContent } from '@/api/admin/meeting/roomContent'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    MeetingUtoModal
+  },
+  data () {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      form: this.$form.createForm(this),
+      mdl: {},
+      // 高级搜索 展开/关闭
+      advanced: false,
+      // 查询参数
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '部门编号',
+          dataIndex: 'orgId'
+        },
+        {
+          title: '部门名称',
+          dataIndex: 'orgName'
+        },
+        {
+          title: '登录名',
+          dataIndex: 'loginName'
+        },
+        {
+          title: '密码',
+          dataIndex: 'password'
+        },
+        {
+          title: '备注',
+          dataIndex: 'remark'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getMeetingUtoList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      // addEnable: checkPermission('admin:meetingUto:add'),
+      // editEnabel: checkPermission('admin:meetingUto:edit'),
+      // removeEnable: checkPermission('admin:meetingUto:remove'),
+      addEnable: true,
+      editEnabel: true,
+      removeEnable: true
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  methods: {
+    reset() {
+      this.queryParam = {}
+      this.handleOk()
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    handleAdd () {
+      this.$refs.modal.add()
+    },
+    handleEdit (record) {
+      this.$refs.modal.edit(record)
+    },
+    handleOk () {
+      this.$refs.table.refresh(true)
+      console.log('handleSaveOk')
+    },
+    delByIds (ids) {
+      const _this = this
+      if (ids === '') {
+        this.$message.error('请选择后删除！')
+        return
+      }
+      this.$confirm({
+        title: '警告',
+        content: '删除后不可恢复，是否确认删除?',
+        okText: '是',
+        okType: 'warning',
+        cancelText: '否',
+        onOk() {
+          delMeetingUto({ ids: ids.join(',') }).then(res => {
+            if (res.code === 0) {
+              _this.$message.success('删除成功')
+              _this.handleOk()
+            } else {
+              _this.$message.error(res.msg)
+            }
+            this.selectedRowKeys = []
+          })
+        },
+        onCancel() {
+        }
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

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

@@ -401,7 +401,7 @@ export default {
 
           // 多个图片
           // values.indoorPicUrl = JSON.stringify(indoorPicUrl)
-          values.files = files
+          // values.files = files
           let deviceArr = values.device
           let deviceStr = ''
           for (let key in deviceArr) {
@@ -411,8 +411,7 @@ export default {
           values.device = deviceStr
           values.floorId = this.typeMap[values.floor]
           values.typeId = this.shapeMap[values.typeName]
-
+          saveRoomContent(values, files)
-          saveRoomContent(values)
             .then((res) => {
               if (res.code === 0) {
                 this.$message.success('保存成功')

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

@@ -0,0 +1,115 @@
+<template>
+  <a-modal
+    title='操作'
+    style='top: 20px;'
+    :width='800'
+    v-model='visible'
+    :confirmLoading='confirmLoading'
+    @ok='handleSubmit'
+  >
+    <a-form :form='form'>
+      <a-form-item style='display:none'>
+        <a-input v-decorator="['id']" />
+      </a-form-item>
+      <a-form-item style='display:none'>
+        <a-input v-decorator="['version']" />
+      </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='部门编号'>
+        <a-input placeholder='部门id' v-decorator="['orgId', {rules: [{required: true, message: '请输入部门编号'}]}]" />
+      </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='部门名称'>
+        <a-input placeholder='部门名称' v-decorator="['orgName', {rules: [{required: true, message: '请输入部门名称'}]}]" />
+      </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='登录名'>
+        <a-input placeholder='登录名'
+                 v-decorator="['loginName', {rules: [{required: true, message: '请输入登录名'}]}]" />
+      </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='密码'>
+        <a-input placeholder='密码' v-decorator="['password', {rules: [{required: true, message: '请输入密码'}]}]" />
+      </a-form-item>
+      <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='备注'>
+        <a-input placeholder='备注' v-decorator="['remark']" />
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+import { saveMeetingUto } from '@/api/admin/meeting/uto'
+import pick from 'lodash.pick'
+
+export default {
+  name: 'MeetingUtoModal',
+  props: {},
+  components: {},
+  data() {
+    return {
+      visible: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      confirmLoading: false,
+      mdl: {},
+      form: this.$form.createForm(this)
+    }
+  },
+  beforeCreate() {
+  },
+  created() {
+  },
+  methods: {
+    add() {
+      this.form.resetFields()
+      this.edit({ id: 0 })
+    },
+    edit(record) {
+      this.mdl = Object.assign(record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.mdl, 'id', 'orgId', 'orgName', 'loginName', 'password', 'remark'))
+      })
+    },
+    handleSubmit(e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          // this.confirmLoading = true
+          values.userName = values.orgName
+          saveMeetingUto(values).then(res => {
+            if (res.code === 0) {
+              this.$message.success('保存成功')
+              this.$emit('ok')
+              this.visible = false
+            } else {
+              this.$message.error(res.msg)
+            }
+          }).catch(() => {
+            this.$message.error('系统错误，请稍后再试')
+          }).finally(() => {
+            // this.confirmLoading = false
+          })
+        }
+      })
+    }
+  },
+  watch: {
+    /*
+      'selectedRows': function (selectedRows) {
+        this.needTotalList = this.needTotalList.map(item => {
+          return {
+            ...item,
+            total: selectedRows.reduce( (sum, val) => {
+              return sum + val[item.dataIndex]
+            }, 0)
+          }
+        })
+      }
+      */
+  }
+}
+</script>

src/views/admin/repair/PerformanceList.vue

@@ -28,6 +28,7 @@
           size='default'
           ref='tableFloor'
           rowKey='id'
+          showPagination="true"
           :columns='floorColumns'
           :data='loadFloor'
         >
@@ -58,6 +59,7 @@
           size='default'
           ref='tableFloorCreate'
           rowKey='id'
+          showPagination="true"
           :columns='floorCreateColumns'
           :data='loadFloorCreate'
         >
@@ -88,6 +90,7 @@
           size='default'
           ref='tableWorker'
           rowKey='id'
+          showPagination="true"
           :columns='columns'
           :data='loadWorker'
         >

src/views/admin/repair/RepairAddressList.vue

@@ -22,6 +22,7 @@
       size="default"
       ref="table"
       rowKey="id"
+      showPagination="true"
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       :columns="columns"
       :data="loadData"

src/views/admin/repair/RepairDeviceList.vue

@@ -27,6 +27,7 @@
       size='default'
       ref='table'
       rowKey='id'
+      showPagination="true"
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       :columns='columns'
       :data='loadData'

src/views/admin/repair/RepairDeviceTypeList.vue

@@ -28,6 +28,7 @@
       size='default'
       ref='table'
       rowKey='id'
+      showPagination="true"
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       :columns='columns'
       :data='loadData'

src/views/admin/repair/RepairHistory.vue

@@ -51,6 +51,7 @@
       size='default'
       ref='table'
       rowKey='id'
+      showPagination="true"
       :columns='columns'
       :data='loadData'
     >