From eefef89cb761361490089b0c7429c3238e698ee9 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Tue, 5 Jul 2022 17:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=8F=8Abug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/storeManage/deviceManage/device.js    | 19 ++---
 src/assets/styles/yxk-admin.scss              |  9 +++
 src/views/category/fieldManage/index.vue      |  6 ++
 .../category/fieldManage/module/form.vue      |  4 +-
 src/views/components/category/SettingForm.vue |  1 +
 src/views/components/field/module/form.vue    |  3 +-
 src/views/storeManage/deviceManage/index.vue  | 74 +++++++++----------
 7 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js
index 9a426bb..06ae258 100644
--- a/src/api/storeManage/deviceManage/device.js
+++ b/src/api/storeManage/deviceManage/device.js
@@ -1,15 +1,8 @@
 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',
+    url: 'api/storeroom/create',
     method: 'post',
     data
   })
@@ -20,18 +13,18 @@ export function del(ids) {
     id: ids[0]
   }
   return request({
-    url: 'api/dictrionary/delete',
-    method: 'post',
+    url: 'api/storeroom/delete',
+    method: 'delete',
     data
   })
 }
 
 export function edit(data) {
   return request({
-    url: 'api/dictrionary/edit',
-    method: 'post',
+    url: 'api/storeroom/update',
+    method: 'put',
     data
   })
 }
 
-export default { add, edit, del, getDicts }
+export default { add, edit, del }
diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 4021d6e..1fb1fb6 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -985,4 +985,13 @@ input[type='number'] {
 }
 .svg-arc-style{
   margin-right: 10px;
+}
+
+.svg-arc-style{
+  margin-right: 10px;
+}
+
+.el-form-item__error--inline{
+  margin-left: 0;
+  vertical-align: top;
 }
\ No newline at end of file
diff --git a/src/views/category/fieldManage/index.vue b/src/views/category/fieldManage/index.vue
index 2d85b3e..fab0587 100644
--- a/src/views/category/fieldManage/index.vue
+++ b/src/views/category/fieldManage/index.vue
@@ -156,6 +156,12 @@ export default {
       })
       return false
     },
+    [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) })
+      }
+    },
     clickRowHandler(row) {
       this.$refs.fieldTable.clearSelection()
       this.$refs.fieldTable.toggleRowSelection(row)
diff --git a/src/views/category/fieldManage/module/form.vue b/src/views/category/fieldManage/module/form.vue
index 985bb46..6ae71e1 100644
--- a/src/views/category/fieldManage/module/form.vue
+++ b/src/views/category/fieldManage/module/form.vue
@@ -26,9 +26,9 @@ const defaultForm = {
   isDataType: null,
   isDataTypeDetails: null,
   isColumnLength: null,
-  isColumnType: null,
+  isColumnType: 2,
   isSequence: null,
-  isType: null,
+  isType: 2,
   isSystem: true,
   isLine: false,
   isInput: true,
diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue
index e8d32ba..feba244 100644
--- a/src/views/components/category/SettingForm.vue
+++ b/src/views/components/category/SettingForm.vue
@@ -161,6 +161,7 @@ export default {
           { required: true, message: '请选择数据类型', trigger: 'blur' }
         ],
         isColumnLength: [
+          { required: true, message: '请输入字段长度', trigger: 'blur' },
           { validator: checkMaxLength, trigger: 'blur' }
         ],
         editLength: [
diff --git a/src/views/components/field/module/form.vue b/src/views/components/field/module/form.vue
index 92074f8..d6d9814 100644
--- a/src/views/components/field/module/form.vue
+++ b/src/views/components/field/module/form.vue
@@ -43,7 +43,8 @@ const defaultForm = {
   fieldName: '',
   isDataType: 1,
   isColumnLength: 100,
-  isDefaultValue: ''
+  isDefaultValue: '',
+  isSystem: 1
 }
 export default {
   mixins: [form(defaultForm)],
diff --git a/src/views/storeManage/deviceManage/index.vue b/src/views/storeManage/deviceManage/index.vue
index 1587f57..e4d7c95 100644
--- a/src/views/storeManage/deviceManage/index.vue
+++ b/src/views/storeManage/deviceManage/index.vue
@@ -34,6 +34,11 @@
       <el-col class="curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
 
         <crudOperation :permission="permission">
+          <template v-slot:left>
+            <el-button v-permission="permission.add" size="mini" icon="el-icon-plus" :disabled="crud.selections[0] && crud.selections[0].id && crud.selections[0].id !== defaultExpandedKeys" @click="crud.toAdd">
+              新增
+            </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>
           </template>
@@ -43,7 +48,7 @@
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <div class="tree-scroll">
-            <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-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :default-expanded-keys="defaultExpandedKeys" highlight-current @node-click="handleNodeClick" />
           </div>
         </div>
       </el-col>
@@ -51,7 +56,7 @@
       <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" />
-        <deviceDetail ref="deviceDetail" :permission="permission" :active-add-btn="activeAddBtn" @treeRefresh="updateKeyChildren" />
+        <deviceDetail ref="deviceDetail" :permission="permission" :active-add-btn="activeRightBtn" />
       </el-col>
     </el-row>
   </div>
@@ -60,54 +65,53 @@
 <script>
 import deviceDetail from './deviceDetail'
 import crudDevice from '@/api/storeManage/deviceManage/deviceDetail'
-import CRUD, { presenter, header, form } from '@crud/crud'
+import CRUD, { presenter, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import Vue from 'vue'
 
-const defaultForm = { id: null, dicName: null, dicCode: null, dicExplain: null, dicType: true }
+const defaultForm = { id: null, name: null, sort: null }
 
 export default {
-  name: 'Dict',
+  name: 'Device',
   components: { crudOperation, deviceDetail },
   cruds() {
     return [
       CRUD({
-        title: '区域', url: 'api/dictrionary/menu',
+        title: '区域', url: 'api/storeroom/tree',
         crudMethod: { ...crudDevice },
         optShow: {
-          add: true,
+          add: false,
           edit: true,
           del: false,
           download: false,
           group: false
         },
-        sort: ['dicSequence,asc']
+        sort: ['sort,asc']
       })
     ]
   },
-  mixins: [presenter(), header(), form(defaultForm)],
+  mixins: [presenter(), form(defaultForm)],
   data() {
     return {
       rules: {
         dicName: [
-          { required: true, message: '请输入字典名称', trigger: 'blur' }
-        ],
-        dicCode: [
-          { required: true, message: '请输入字典代码', trigger: 'blur' }
+          { required: true, message: '请输入区域名称', trigger: 'blur' }
         ]
       },
       permission: {
-        add: ['admin', 'dict:add'],
-        edit: ['admin', 'dict:edit'],
-        del: ['admin', 'dict:del']
+        add: ['admin', 'deviceManage:add'],
+        edit: ['admin', 'deviceManage:edit'],
+        del: ['admin', 'deviceManage:del']
       },
       defaultProps: {
-        children: 'childMenus',
-        label: 'dicName'
+        children: 'children',
+        label: 'name'
       },
-      activeAddBtn: false,
+      activeRightBtn: false,
       deleteVisible: false,
       deleteData: {},
-      allowDelete: false // 是否允许删除当前区域
+      allowDelete: false, // 是否允许删除当前区域
+      defaultExpandedKeys: []
     }
   },
   methods: {
@@ -118,37 +122,25 @@ export default {
       }
       return true
     },
-    // 选中字典后，设置字典详情数据
+    [CRUD.HOOK.afterRefresh]() {
+      Vue.set(this.defaultExpandedKeys, 0, this.crud.data[0].id)
+      this.$refs.tree.setCurrentKey(this.crud.data[0].id)
+      this.crud.selections = [this.crud.data[0]]
+    },
+    // 选中区域后，显示设备详情数据
     handleNodeClick(val) {
       if (val) {
-        if (val.dicType === 'true') {
-          this.crud.selectionChangeHandler([val])
-        } else {
-          this.crud.selectionChangeHandler([])
-        }
+        this.crud.selectionChangeHandler([val])
         this.$refs.deviceDetail.query.id = val.id
         this.$refs.deviceDetail.dicPid = val.id
         this.$refs.deviceDetail.crud.toQuery()
-        this.activeAddBtn = true
+        this.activeRightBtn = true
       }
     },
-    // 编辑前将字典明细临时清空，避免日志入库数据过长
+    // 编辑前将区域临时清空，避免日志入库数据过长
     [CRUD.HOOK.beforeToEdit](crud, form) {
-      // 将角色的菜单清空，避免日志入库数据过长
       form.deviceDetails = null
     },
-    updateKeyChildren(data) {
-      const oldDatas = this.$refs.tree.getCurrentNode().childMenus
-      if (oldDatas) {
-        for (let i = 0; i < data.length; i++) {
-          const oldData = oldDatas.find((d) => { return d.id === data[i].id })
-          if (oldData) {
-            data[i].childMenus = oldData.childMenus
-          }
-        }
-      }
-      this.$refs.tree.updateKeyChildren(this.$refs.tree.getCurrentKey(), data)
-    },
     toDelete(data) {
       this.deleteData = data
       this.deleteVisible = true