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

src/api/admin/meeting/detailEquipment.js

@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+const api = {
+  detailEquipment: '/meeting/detailEquipment'
+}
+
+export function getDetailEquipmentList (parameter) {
+  return axios({
+    url: api.detailEquipment + '/list',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function saveDetailEquipment (parameter) {
+  return axios({
+    url: api.detailEquipment + (parameter.id > 0 ? '/update' : '/save'),
+    method: 'post',
+    data: parameter,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function delDetailEquipment (parameter) {
+  return axios({
+    url: api.detailEquipment + '/remove',
+    method: 'post',
+    params: parameter
+  })
+}
+
+export const detailEquipmentExport = api.detailEquipment + '/export'

src/views/admin/meeting/DetailEquipmentList.vue

@@ -0,0 +1,152 @@
+<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="设备id">
+              <a-input placeholder="请输入设备id" v-model="queryParam.equipmentId"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="15">
+            <a-form-item label="房间id">
+              <a-input placeholder="请输入房间id" v-model="queryParam.buildingDetailId"/>
+            </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="() => queryParam = {}">重置</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"
+      :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>
+    <detailEquipment-modal ref="modal" @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+    import {STable} from '@/components'
+
+    import {delDetailEquipment} from '@/api/admin/meeting/detailEquipment'
+    import DetailEquipmentModal from './modules/DetailEquipmentModal.vue'
+    import {checkPermission} from '@/utils/permissions'
+
+    export default {
+  name: 'TableList',
+  components: {
+    STable,
+    DetailEquipmentModal
+  },
+  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: '设备id',
+          dataIndex: 'equipmentId'
+        },
+        {
+          title: '房间id',
+          dataIndex: 'buildingDetailId'
+        },
+        {
+          title: '操作',
+          width: '200px',
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return getDetailEquipmentList(Object.assign(parameter, this.queryParam))
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+      addEnable: checkPermission('meeting:detailEquipment:add'),
+      editEnabel: checkPermission('meeting:detailEquipment:edit'),
+      removeEnable: checkPermission('meeting:detailEquipment:remove')
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  methods: {
+    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) {
+      delDetailEquipment({ ids: ids.join(',') }).then(res => {
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          this.handleOk()
+        } else {
+          this.$message.error(res.msg)
+        }
+        this.selectedRowKeys = []
+      })
+    }
+  },
+  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/DetailEquipmentModal.vue

@@ -0,0 +1,112 @@
+<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="设备id">
+        <a-input placeholder="设备id" v-decorator="['equipmentId']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="房间id">
+        <a-input placeholder="房间id" v-decorator="['buildingDetailId']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建时间">
+        <a-input placeholder="创建时间" v-decorator="['deleteFlag']"/>
+      </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建时间">
+        <a-input placeholder="创建时间" v-decorator="['createBy']"/>
+      </a-form-item>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+    import {saveDetailEquipment} from '@/api/admin/meeting/detailEquipment'
+    import pick from 'lodash.pick'
+
+    export default {
+  name: 'DetailEquipmentModal',
+  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', 'equipmentId', 'buildingDetailId', 'createTime', 'deleteFlag', 'createBy'))
+      })
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log('Received values of form: ', values)
+          this.confirmLoading = true
+          saveDetailEquipment(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/meeting/modules/EquipmentModal.vue

@@ -62,7 +62,7 @@
         </a-col>
         <a-col :span='11'>
           <a-form-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='存放地点'>
-            <a-select v-decorator="['roomId',{rules: [{ required: true, message: '选择存放地点' }]}]" placeholder='所属房间'
+            <a-select v-decorator="['roomId']" placeholder='所属房间'
             >
               <a-select-option v-for='item in roomList' :key='item.id' :value='item.id' >
                 {{ item.name }}