From 2280d8d80b647c96f73336e808fe37e6774c9a72 Mon Sep 17 00:00:00 2001 From: z_yu <1534695664@qq.com> Date: Tue, 5 Jul 2022 10:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=8F=8Abug19=EF=BC=8C20=EF=BC=8C21=EF=BC=8C22=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/storeManage/deviceManage/device.js | 37 +++++++++ .../storeManage/deviceManage/deviceDetail.js | 78 +++++++++++++++++++ src/views/archivesConfig/dict/dictDetail.vue | 1 - src/views/components/field/index.vue | 9 ++- .../{dictDetail.vue => deviceDetail.vue} | 15 ++-- src/views/storeManage/deviceManage/index.vue | 41 +++++----- 6 files changed, 152 insertions(+), 29 deletions(-) create mode 100644 src/api/storeManage/deviceManage/device.js create mode 100644 src/api/storeManage/deviceManage/deviceDetail.js rename src/views/storeManage/deviceManage/{dictDetail.vue => deviceDetail.vue} (92%) diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js new file mode 100644 index 0000000..9a426bb --- /dev/null +++ b/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 } diff --git a/src/api/storeManage/deviceManage/deviceDetail.js b/src/api/storeManage/deviceManage/deviceDetail.js new file mode 100644 index 0000000..2c2c914 --- /dev/null +++ b/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 } diff --git a/src/views/archivesConfig/dict/dictDetail.vue b/src/views/archivesConfig/dict/dictDetail.vue index 5151b6c..487165f 100644 --- a/src/views/archivesConfig/dict/dictDetail.vue +++ b/src/views/archivesConfig/dict/dictDetail.vue @@ -81,7 +81,6 @@ export default { group: false }, queryOnPresenterCreated: false, - confirmDeleteMsg: '确认删除当前字典内容么？', sort: ['dicCode,asc'] }) ] diff --git a/src/views/components/field/index.vue b/src/views/components/field/index.vue index 8cb9fd0..dbeeaa0 100644 --- a/src/views/components/field/index.vue +++ b/src/views/components/field/index.vue @@ -27,7 +27,7 @@ - + @@ -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) { diff --git a/src/views/storeManage/deviceManage/dictDetail.vue b/src/views/storeManage/deviceManage/deviceDetail.vue similarity index 92% rename from src/views/storeManage/deviceManage/dictDetail.vue rename to src/views/storeManage/deviceManage/deviceDetail.vue index 3ec8e80..c37afae 100644 --- a/src/views/storeManage/deviceManage/dictDetail.vue +++ b/src/views/storeManage/deviceManage/deviceDetail.vue @@ -4,7 +4,7 @@