设备管理 及bug19，20，21，22修改

src/api/storeManage/deviceManage/device.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+export function getDicts() {
+  return request({
+    url: 'api/dictrionary/menu',
+    method: 'get'
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/dictrionary/edit',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  const data = {
+    id: ids[0]
+  }
+  return request({
+    url: 'api/dictrionary/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/dictrionary/edit',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getDicts }

src/api/storeManage/deviceManage/deviceDetail.js

@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+export function get(dictName) {
+  const params = {
+    dictName,
+    page: 0,
+    size: 9999
+  }
+  return request({
+    url: 'api/dictDetail',
+    method: 'get',
+    params
+  })
+}
+
+export function findSubsetById(id) {
+  const params = {
+    id,
+    page: 0,
+    size: 9999
+  }
+  return request({
+    url: 'api/dictrionary/findSubsetById',
+    method: 'get',
+    params
+  })
+}
+
+// 根据字典id查询子集
+export function FetchFindAllSubsetById(parameter) {
+  return request({
+    url: 'api/dictrionary/findAllSubsetById',
+    method: 'get',
+    params: parameter
+  })
+}
+
+export function getDictMap(dictName) {
+  const params = {
+    dictName,
+    page: 0,
+    size: 9999
+  }
+  return request({
+    url: 'api/dictDetail/map',
+    method: 'get',
+    params
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/dictrionary/edit',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  const data = {
+    id: ids[0]
+  }
+  return request({
+    url: 'api/dictrionary/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/dictrionary/edit',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del }

src/views/archivesConfig/dict/dictDetail.vue

@@ -81,7 +81,6 @@ export default {
           group: false
         },
         queryOnPresenterCreated: false,
-        confirmDeleteMsg: '确认删除当前字典内容么？',
         sort: ['dicCode,asc']
       })
     ]

src/views/components/field/index.vue

@@ -27,7 +27,7 @@
       </el-table-column>
     </el-table>
     <!--表单渲染-->
-    <eForm />
+    <eForm ref="eform" />
     <el-dialog title="关键提示" :visible.sync="verifyDialogVisible" :before-close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
@@ -57,6 +57,7 @@ import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 
 export default {
+  name: 'Field',
   components: { eForm, crudOperation },
   mixins: [presenter()],
   cruds() {
@@ -123,6 +124,12 @@ export default {
         form.isColumnLength = undefined
       }
     },
+    [CRUD.HOOK.beforeSubmit]() {
+      this.crud.form.isType = this.isType
+      if (!this.crud.form.isSequence) {
+        this.crud.data.reduce((prev, cur) => { return Math.max(prev.isSequence, cur.isSequence) })
+      }
+    },
     handleConfirm() {
       verifyMaintenance(encrypt(this.form.verifyCode)).then((res) => {
         if (res) {

src/views/storeManage/deviceManage/dictDetail.vue → src/views/storeManage/deviceManage/deviceDetail.vue

@@ -4,7 +4,7 @@
     <div class="head-container">
       <crudOperation :permission="permission">
         <template v-slot:left>
-          <el-button v-permission="permission.add" size="mini" type="primary" icon="el-icon-plus" :disabled="!activeAddBtn" @click="choose">新增</el-button>
+          <el-button v-permission="permission.add" size="mini" type="primary" icon="el-icon-plus" :disabled="!activeAddBtn" @click="selectDeviceType">新增</el-button>
         </template>
         <template v-slot:right>
           <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
@@ -33,12 +33,12 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="删除字典内容" :visible.sync="deleteVisible" :before-close="handleClose">
+    <el-dialog title="删除设备" :visible.sync="deleteVisible" :before-close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <div class="dialog-delt">
-          <p><span>确定删除当前字典内容吗？</span></p>
+          <p><span>确定删除当前设备吗？</span></p>
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click.native="handleConfirm">确定</el-button>
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import crudDictDetail from '@/api/archivesConfig/dictDetail'
+import crudDeviceDetail from '@/api/storeManage/deviceManage/deviceDetail'
 import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
@@ -70,8 +70,8 @@ export default {
   cruds() {
     return [
       CRUD({
-        title: '字典内容', url: 'api/dictrionary/findSubsetById', query: { id: '' },
-        crudMethod: { ...crudDictDetail },
+        title: '设备', url: 'api/dictrionary/findSubsetById', query: { id: '' },
+        crudMethod: { ...crudDeviceDetail },
         optShow: {
           add: false,
           edit: true,
@@ -81,7 +81,6 @@ export default {
           group: false
         },
         queryOnPresenterCreated: false,
-        confirmDeleteMsg: '确认删除当前字典内容么？',
         sort: ['dicSequence,asc']
       })
     ]
@@ -165,6 +164,8 @@ export default {
     handleClose(done) {
       this.deleteData = {}
       done()
+    },
+    selectDeviceType() {
     }
   }
 }

src/views/storeManage/deviceManage/index.vue

@@ -16,20 +16,20 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="删除字典" :visible.sync="deleteVisible" :before-close="handleClose">
+    <el-dialog title="删除区域" :visible.sync="deleteVisible" :before-close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
         <div class="dialog-delt">
-          <p><span>确定要删除当前字典吗？</span></p>
-          <p class="delt-tip"><span>提示：如果删除当前字典，此字典内所属内容会一并删除</span></p>
+          <p><span>确定要删除当前区域吗？</span></p>
+          <p v-show="!allowDelete" class="delt-tip"><span>提示：该区域已绑定设备，不可删除，请先删除设备</span></p>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click.native="handleConfirm">确定</el-button>
+          <el-button type="primary" :disabled="!allowDelete" @click.native="handleConfirm">确定</el-button>
         </div>
       </div>
     </el-dialog>
-    <!-- 字典列表 -->
+    <!-- 区域列表 -->
     <el-row class="container-main" :gutter="20">
       <el-col class="container-left curd-in-out" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
         <span class="right-top-line" />
@@ -39,22 +39,22 @@
             <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
           </template>
         </crudOperation>
-        <!--字典树状结构-->
+        <!--区域树状结构-->
         <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
       </el-col>
-      <!-- 字典详情列表 -->
+      <!-- 设备详情列表 -->
       <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
         <span class="right-top-line" />
         <span class="left-bottom-line" />
-        <dictDetail ref="dictDetail" :permission="permission" :active-add-btn="activeAddBtn" @treeRefresh="updateKeyChildren" />
+        <deviceDetail ref="deviceDetail" :permission="permission" :active-add-btn="activeAddBtn" @treeRefresh="updateKeyChildren" />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import dictDetail from './dictDetail'
-import crudDict from '@/api/archivesConfig/dict'
+import deviceDetail from './deviceDetail'
+import crudDevice from '@/api/storeManage/deviceManage/deviceDetail'
 import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 
@@ -62,12 +62,12 @@ const defaultForm = { id: null, dicName: null, dicCode: null, dicExplain: null,
 
 export default {
   name: 'Dict',
-  components: { crudOperation, dictDetail },
+  components: { crudOperation, deviceDetail },
   cruds() {
     return [
       CRUD({
         title: '区域', url: 'api/dictrionary/menu',
-        crudMethod: { ...crudDict },
+        crudMethod: { ...crudDevice },
         optShow: {
           add: true,
           edit: true,
@@ -75,7 +75,6 @@ export default {
           download: false,
           group: false
         },
-        confirmDeleteMsg: '确定要删除当前字典吗',
         sort: ['dicSequence,asc']
       })
     ]
@@ -102,14 +101,15 @@ export default {
       },
       activeAddBtn: false,
       deleteVisible: false,
-      deleteData: {}
+      deleteData: {},
+      allowDelete: false // 是否允许删除当前区域
     }
   },
   methods: {
     // 获取数据前设置好接口地址
     [CRUD.HOOK.beforeRefresh]() {
-      if (this.$refs.dictDetail) {
-        this.$refs.dictDetail.query.id = ''
+      if (this.$refs.deviceDetail) {
+        this.$refs.deviceDetail.query.id = ''
       }
       return true
     },
@@ -121,16 +121,16 @@ export default {
         } else {
           this.crud.selectionChangeHandler([])
         }
-        this.$refs.dictDetail.query.id = val.id
-        this.$refs.dictDetail.dicPid = val.id
-        this.$refs.dictDetail.crud.toQuery()
+        this.$refs.deviceDetail.query.id = val.id
+        this.$refs.deviceDetail.dicPid = val.id
+        this.$refs.deviceDetail.crud.toQuery()
         this.activeAddBtn = true
       }
     },
     // 编辑前将字典明细临时清空，避免日志入库数据过长
     [CRUD.HOOK.beforeToEdit](crud, form) {
       // 将角色的菜单清空，避免日志入库数据过长
-      form.dictDetails = null
+      form.deviceDetails = null
     },
     updateKeyChildren(data) {
       const oldDatas = this.$refs.tree.getCurrentNode().childMenus
@@ -147,6 +147,7 @@ export default {
     toDelete(data) {
       this.deleteData = data
       this.deleteVisible = true
+      this.allowDelete = this.$refs.deviceDetail.crud.data && this.$refs.deviceDetail.crud.data.length === 0
     },
     handleConfirm() {
       this.deleteVisible = false