From 883e2b5215f9e89c6c21968700f2d36011304653 Mon Sep 17 00:00:00 2001 From: z_yu <1534695664@qq.com> Date: Tue, 12 Jul 2022 13:35:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86-=E8=91=97?= =?UTF-8?q?=E5=BD=95=E7=95=8C=E9=9D=A2=E7=AE=A1=E7=90=86bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=8A=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../category/descriptionPreview/index.vue | 8 +- src/views/components/category/PreviewForm.vue | 1 + src/views/components/category/data.json | 391 ------------------ src/views/storeManage/deviceManage/index.vue | 1 + .../deviceManage/module/deviceDetail.vue | 37 +- 5 files changed, 27 insertions(+), 411 deletions(-) delete mode 100644 src/views/components/category/data.json diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue index 8ba5b1e..821d49c 100644 --- a/src/views/category/descriptionPreview/index.vue +++ b/src/views/category/descriptionPreview/index.vue @@ -103,11 +103,13 @@ export default { this.getArchivesType() }, methods: { - getArchivesType() { + getArchivesType(setField) { FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => { this.allFieldsData.splice(0, this.allFieldsData.length) this.isInputFields.splice(0, this.isInputFields.length) - let setField = false + if (!setField) { + setField = false + } res.sort(this.compare).forEach((item, index) => { // 防止对应字典是null时报错 item.dictionaryConfigId = item.dictionaryConfigId || { dicName: null, id: null } @@ -157,7 +159,7 @@ export default { this.settingFormVisible = false // 清空数组数据 this.allFieldsData.splice(0, this.allFieldsData.length) - this.getArchivesType() + this.getArchivesType(true) }) }) return false diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index 9f0c21b..d600659 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -148,6 +148,7 @@ export default { }, formPreviewData: function() { this.editFormRow() + this.FetchNoFormatField() } }, created() { diff --git a/src/views/components/category/data.json b/src/views/components/category/data.json deleted file mode 100644 index d24db51..0000000 --- a/src/views/components/category/data.json +++ /dev/null @@ -1,391 +0,0 @@ -{ - "code": 200, - "message": "操作成功", - "data": [{ - "id": "FFAFBB1647D459C82085A", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": "4028e3d480d116120180d116ebb60000", - "fieldName": "department", - "fieldCnName": "部门名称", - "isDefaultValue": "", - "isInputClass": "select", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 100, - "isColumnType": null, - "isSequence": 30, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 1, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 250, - "displayLength": 100, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82082D", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": "4028e3d480d116120180d116ebb60000", - "fieldName": "archive_no", - "fieldCnName": "档号", - "isDefaultValue": "", - "isInputClass": "popover", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 100, - "isColumnType": null, - "isSequence": 15, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 2, - "isDisplayformat": true, - "displayformatType": "left", - "editLength": 250, - "displayLength": 100, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82084D", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "archive_year", - "fieldCnName": "归档年度", - "isDefaultValue": "", - "isInputClass": "number", - "isDataType": 2, - "isDataTypeDetails": "int", - "isColumnLength": 11, - "isColumnType": null, - "isSequence": 27, - "isType": 1, - "isSystem": true, - "isLine": false, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 3, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 250, - "displayLength": 100, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82084C", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": "EAC68B9FE234EDE61B2200", - "fieldName": "retention", - "fieldCnName": "保管期限", - "isDefaultValue": "", - "isInputClass": "select", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 10, - "isColumnType": null, - "isSequence": 26, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 4, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 510, - "displayLength": 100, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82083D", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "piece_no", - "fieldCnName": "件号", - "isDefaultValue": "", - "isInputClass": "text", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 50, - "isColumnType": null, - "isSequence": 21, - "isType": 1, - "isSystem": true, - "isLine": false, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 5, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 300, - "displayLength": 70, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82084A", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "maintitle", - "fieldCnName": "题名", - "isDefaultValue": "", - "isInputClass": "text", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 250, - "isColumnType": null, - "isSequence": 24, - "isType": 1, - "isSystem": true, - "isLine": false, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 6, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 250, - "displayLength": 250, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82084E", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "created_date", - "fieldCnName": "成文日期", - "isDefaultValue": "", - "isInputClass": "date", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 20, - "isColumnType": null, - "isSequence": 28, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 7, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 250, - "displayLength": 140, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82083F", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "page_no", - "fieldCnName": "页(张)号", - "isDefaultValue": "", - "isInputClass": null, - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 10, - "isColumnType": null, - "isSequence": 23, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": false, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 8, - "isDisplayformat": null, - "displayformatType": null, - "editLength": null, - "displayLength": null, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82084F", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "responsibleby", - "fieldCnName": "责任人", - "isDefaultValue": "", - "isInputClass": "text", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 100, - "isColumnType": null, - "isSequence": 29, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 9, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 200, - "displayLength": 100, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82085F", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "archive_date", - "fieldCnName": "归档日期", - "isDefaultValue": "", - "isInputClass": null, - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 50, - "isColumnType": null, - "isSequence": 35, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": false, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 10, - "isDisplayformat": null, - "displayformatType": null, - "editLength": null, - "displayLength": 120, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }, { - "id": "FFAFBB1647D459C82085B", - "categoryId": "FFAFBB1647D459C82080A", - "sysDictionaryId": null, - "fieldName": "remarks", - "fieldCnName": "备注", - "isDefaultValue": "", - "isInputClass": "textarea", - "isDataType": 1, - "isDataTypeDetails": "varchar", - "isColumnLength": 500, - "isColumnType": null, - "isSequence": 31, - "isType": 1, - "isSystem": true, - "isLine": true, - "isInput": true, - "isRequired": false, - "isAutomatic": true, - "isAdd": true, - "isSearch": true, - "isInherit": true, - "isFilling": true, - "fillingDigit": 2, - "isRepeat": false, - "isDisplay": true, - "displayOrder": 11, - "isDisplayformat": true, - "displayformatType": "center", - "editLength": 250, - "displayLength": 500, - "create_by": null, - "update_by": null, - "create_time": null, - "update_time": null - }], - "timestamp": 1654670164582 -} \ No newline at end of file diff --git a/src/views/storeManage/deviceManage/index.vue b/src/views/storeManage/deviceManage/index.vue index 0da6171..a3a8240 100644 --- a/src/views/storeManage/deviceManage/index.vue +++ b/src/views/storeManage/deviceManage/index.vue @@ -116,6 +116,7 @@ export default { [CRUD.HOOK.afterRefresh]() { Vue.set(this.defaultExpandedKeys, 0, this.crud.data[0].id) this.$refs.tree.setCurrentKey(this.crud.data[0].id) + this.$refs.deviceDetail.storeroomId = this.crud.data[0].id this.crud.selections = [this.crud.data[0]] }, // 选中区域后，显示设备详情数据 diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue index b469a5b..513968e 100644 --- a/src/views/storeManage/deviceManage/module/deviceDetail.vue +++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue @@ -18,7 +18,6 @@
- @@ -67,7 +66,7 @@ - 通知 + 通知
@@ -135,7 +134,7 @@ import CRUD, { presenter, header, form } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' -const defaultForm = { deviceInfo: { supplierId: null }, id: null, isLinkage: [], isCallback: [], isNotice: [] } +const defaultForm = { deviceInfo: { supplierId: null }, id: null, isLinkage: [], isCallback: [], isNotice: false } export default { components: { crudOperation, pagination }, @@ -160,9 +159,7 @@ export default { mixins: [ presenter(), header(), - form(function() { - return Object.assign({ storeroomId: this.storeroomId }, defaultForm) - }) + form(defaultForm) ], props: { activeAddBtn: { @@ -248,22 +245,28 @@ export default { } }, methods: { - [CRUD.HOOK.afterSubmit]() { - this.needRefreshTree = true - }, - [CRUD.HOOK.afterDelete]() { - this.needRefreshTree = true + // [CRUD.HOOK.afterSubmit]() { + // this.needRefreshTree = true + // }, + // [CRUD.HOOK.afterDelete]() { + // this.needRefreshTree = true + // }, + [CRUD.HOOK.beforeSubmit]() { + this.crud.form.deviceInfo.storeroomId = this.storeroomId + // if (!this.crud.form.isSequence) { + // this.crud.form.isSequence = this.crud.data.reduce((prev, cur) => { return { isSequence: Math.max(prev.isSequence, cur.isSequence) } }).isSequence + 1 + // } }, // 获取数据前设置默认参数 [CRUD.HOOK.beforeRefresh]() { this.crud.query.id = this.storeroomId }, - [CRUD.HOOK.afterRefresh](crud) { - if (this.needRefreshTree) { - this.needRefreshTree = false - this.$emit('treeRefresh', crud.data) - } - }, + // [CRUD.HOOK.afterRefresh](crud) { + // if (this.needRefreshTree) { + // this.needRefreshTree = false + // this.$emit('treeRefresh', crud.data) + // } + // }, clickRowHandler(row) { this.$refs.table.clearSelection() this.$refs.table.toggleRowSelection(row)