Browse Source

bug27修改

master
z_yu 3 years ago
parent
commit
9d0d51c297
  1. 2
      src/views/category/fieldManage/index.vue
  2. 2
      src/views/components/field/index.vue
  3. 17
      src/views/storeManage/deviceManage/index.vue

2
src/views/category/fieldManage/index.vue

@ -160,7 +160,7 @@ export default {
[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) })
this.crud.form.isSequence = this.crud.data.reduce((prev, cur) => { return Math.max(prev.isSequence, cur.isSequence) })
}
},
[CRUD.HOOK.beforeToCU]() {

2
src/views/components/field/index.vue

@ -130,7 +130,7 @@ export default {
[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) })
this.crud.form.isSequence = this.crud.data.reduce((prev, cur) => { return Math.max(prev.isSequence, cur.isSequence) })
}
},
handleConfirm() {

17
src/views/storeManage/deviceManage/index.vue

@ -6,8 +6,8 @@
<span class="dialog-left-bottom" />
<div class="setting-dialog">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="区域名称" prop="dicName">
<el-input v-model="form.dicName" style="width: 370px;" />
<el-form-item label="区域名称" prop="name">
<el-input v-model="form.name" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -32,10 +32,9 @@
<!-- 区域列表 -->
<el-row class="container-main" :gutter="20">
<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 v-permission="permission.add" size="mini" icon="el-icon-plus" :disabled="crud.selections[0] && crud.selections[0].id && crud.selections[0].id !== defaultExpandedKeys[0]" @click="crud.toAdd">
新增
</el-button>
</template>
@ -64,7 +63,7 @@
<script>
import deviceDetail from './deviceDetail'
import crudDevice from '@/api/storeManage/deviceManage/deviceDetail'
import crudDevice from '@/api/storeManage/deviceManage/device'
import CRUD, { presenter, form } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import Vue from 'vue'
@ -94,7 +93,7 @@ export default {
data() {
return {
rules: {
dicName: [
name: [
{ required: true, message: '请输入区域名称', trigger: 'blur' }
]
},
@ -141,6 +140,12 @@ export default {
[CRUD.HOOK.beforeToEdit](crud, form) {
form.deviceDetails = null
},
[CRUD.HOOK.beforeSubmit]() {
this.crud.form.pid = this.defaultExpandedKeys[0]
if (!this.crud.form.sort) {
this.crud.form.sort = this.crud.data[0].children.reduce((prev, cur) => { return Math.max(prev.sort, cur.sort) })
}
},
toDelete(data) {
this.deleteData = data
this.deleteVisible = true

Loading…
Cancel
Save