From 87106a877d00e023075b9f1ba30d3d2ed0eaf8d9 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 25 Oct 2023 17:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=BD=92=E6=A1=A3=E5=BA=93/=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/archivesConfig/dict/dictDetail.vue | 6 +- src/views/components/category/PreviewForm.vue | 20 +++--- src/views/prearchiveLibrary/index.vue | 4 +- .../prearchiveLibrary/module/batchFile.vue | 69 ++++++++++++------- src/views/system/dept/index.vue | 2 +- .../fileLibraryManage/fieldManage/index.vue | 2 +- src/views/system/user/index.vue | 2 +- 7 files changed, 64 insertions(+), 41 deletions(-) diff --git a/src/views/archivesConfig/dict/dictDetail.vue b/src/views/archivesConfig/dict/dictDetail.vue index dc135b8..647aa67 100644 --- a/src/views/archivesConfig/dict/dictDetail.vue +++ b/src/views/archivesConfig/dict/dictDetail.vue @@ -2,12 +2,12 @@
- +
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index d8204d4..3142f54 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -214,7 +214,7 @@ export default { delete node.childMenus } return { - id: node.dictionaryId, + id: node.dictionaryName, label: node.dictionaryName, children: node.childMenus } @@ -260,13 +260,13 @@ export default { return name } }, - getNode(list, dicName) { + getNode(list, dictionaryName) { let data; (list || []).map(item => { - if (item.dicName === dicName) { + if (item.dictionaryName === dictionaryName) { data = [item] } else { - const child = this.getNode(item.childMenus, dicName) + const child = this.getNode(item.childMenus, dictionaryName) if (child) { data = child } @@ -468,8 +468,11 @@ export default { }, // tree - select selectTree(val) { - this.addOrUpdateForm[this.treeCurrentFiled.fieldName] = val.dicName - // this.treeName = val.dicName + this.addOrUpdateForm[this.treeCurrentFiled.fieldName] = val.dictionaryName + console.log('this.treeCurrentFiled.fieldName', this.treeCurrentFiled.fieldName) + console.log('val', val) + console.log('val.dictionaryName', val.dictionaryName) + // this.treeName = val.dictionaryName // 自动重复字段 - 是否重复 - treeSelect方式 if (this.treeCurrentFiled.isRepeat) { let params @@ -478,14 +481,14 @@ export default { 'categoryId': this.selectedCategory.id, 'archivesId': this.arcId, 'fieldName': this.treeCurrentFiled.fieldName, - 'value': val.dicName + 'value': val.dictionaryName } } else { params = { 'documentId': this.selectedCategory.id, 'archivesId': null, 'fieldName': this.treeCurrentFiled.fieldName, - 'value': val.dicName + 'value': val.dictionaryName } } this.handlerIsRepeat(params, this.treeCurrentFiled) @@ -619,6 +622,7 @@ export default { 'jsonString': JSON.stringify(this.addOrUpdateForm), 'fileJsonString': this.fileJsonString } + console.log('params', params) prearchEdit(params).then(res => { if (res) { this.$message.success(res) diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue index 5191dde..7384013 100644 --- a/src/views/prearchiveLibrary/index.vue +++ b/src/views/prearchiveLibrary/index.vue @@ -68,7 +68,7 @@
- + @@ -308,11 +308,13 @@ export default { 'ids': ids } exportFile(this.baseApi + '/api/re-document/download?' + qs.stringify(params, { indices: false })) + this.crud.downloadLoading = false }).catch(() => { }) }, handleBatch() { this.$refs.batchForm.batchVisible = true + this.$refs.batchForm.selectionsArc = this.crud.selections }, handelMerge() { this.mergeVisible = true diff --git a/src/views/prearchiveLibrary/module/batchFile.vue b/src/views/prearchiveLibrary/module/batchFile.vue index 9e635f8..898401f 100644 --- a/src/views/prearchiveLibrary/module/batchFile.vue +++ b/src/views/prearchiveLibrary/module/batchFile.vue @@ -97,7 +97,7 @@ -
+
取消 @@ -116,7 +116,7 @@ import { FetchInitDocumentFieldByPid } from '@/api/system/fileLibrary/fileLibrar import { FetchCategoryMenu, FetchInitCategoryFieldByPid } from '@/api/system/category/category' import { FetchArchivesScopeByCategoryId } from '@/api/system/archivesScope' import { FetchCheckRepeat } from '@/api/system/fieldMate' -// import { FetchBatchToFile } from '@/api/prearchiveLibrary/prearchiveLibrary' +import { FetchBatchToFile } from '@/api/prearchiveLibrary/prearchiveLibrary' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' // import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' @@ -135,6 +135,7 @@ export default { }, data() { return { + selectionsArc: [], batchVisible: false, rulesOptions: [], categoryTree: [], @@ -251,7 +252,7 @@ export default { } }) res.forEach((item, index) => { - this.selectStatus.push({ mode: true, fiedType: 2, value: '', field: item, isInput: item.isInput }) + this.selectStatus.push({ mode: true, fiedType: 1, value: '', field: item, isInput: item.isInput }) }) this.rightLoading = false }) @@ -297,7 +298,6 @@ export default { this.$nextTick(() => { if (this.form.categoryId) { this.$refs.scopeModule.$refs.tree2.setCurrentKey(this.form.categoryId) - console.log(this.batchCategory) this.$refs.scopeModule.handleNodeClick2(this.batchCategory) } }) @@ -345,7 +345,7 @@ export default { // 切换 "字段值" / "默认值" selectChangeFiedType(index) { this.options.forEach((item) => { - if (this.selectStatus[index].fiedType === 1) { + if (this.selectStatus[index].fiedType === 2) { this.selectStatus.splice(index, 1, { mode: false, fiedType: this.selectStatus[index].fiedType, value: this.allFieldData[index].categoryFieldId.isDefaultValue, field: item, isInput: item.isInput }) } else { this.selectStatus.splice(index, 1, { mode: true, fiedType: this.selectStatus[index].fiedType, value: '', field: item, isInput: item.isInput }) @@ -390,33 +390,50 @@ export default { // }, []) // } // const indices = getIndicesByMode(false) - console.log(this.selectStatus) - const filteredDocumentList = this.selectStatus.map(item => { - if (item.hasOwnProperty('field')) { - const fieldValue = item['field'] // 获取指定字段的值 - return { - ...fieldValue, // 提取整个field字段，并复制其内容 - getType: item.fiedType // 在field字段中添加getType字段并赋值 - } - } else { - return item + // const arrAL = this.selectStatus.map(item => { + // if (item.hasOwnProperty('field')) { + // return { + // documentValue: item['field'].fieldName, + // getType: item.fiedType // 在field字段中添加getType字段并赋值 + // } + // } else { + // return item + // } + // }) + // console.log(arrAL) + const dtos = this.allFieldData.map((item, index) => { + return { + 'categoryValue': item.categoryFieldId.fieldName, + 'documentValue': this.selectStatus[index].fiedType === 2 ? item.categoryFieldId.isDefaultValue : this.selectStatus[index].field.fieldName, + 'getType': this.selectStatus[index].fiedType, + 'isRequired': item.categoryFieldId.isRequired } }) - console.log('filteredDocumentList', filteredDocumentList) - console.log(this.allFieldData) - const filteredCategoryList = this.allFieldData.map(item => { + const archivesIds = this.selectionsArc.map(item => { + return item.id }) - console.log(filteredCategoryList) - const params = { - 'archivesIds': [], - 'categoryId': this.selectedDocument.id, - 'documentId': this.form.categoryId, - 'dtos': [] + 'archivesIds': archivesIds, + 'documentId': this.selectedDocument.id, + 'categoryId': this.form.categoryId, + 'dtos': dtos } console.log(params) - // FetchBatchToFile().then((res) => { - // }) + FetchBatchToFile(params).then((res) => { + console.log(res) + if (res === 'SUCCESS') { + this.$emit('refresh') + this.batchVisible = false + Object.assign(this.form, { + ruleName: null, + scope: null, + documentId: null, + categoryId: null + }) + this.selectedCategoryName = null + this.allFieldData = [] + } + }) }, normalizer(node) { if (node.children && !node.children.length) { diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index dbd751e..d49ac0b 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -160,7 +160,7 @@ import { exportFile } from '@/utils/index' import qs from 'qs' import { mapGetters } from 'vuex' -const defaultForm = { id: null, fondsId: null, deptsCode: '', deptsName: '', deptsAbbr: '', isTop: '1', deptsParentsId: null, deptsOrders: 999, deptsStatus: null } +const defaultForm = { id: null, fondsId: null, deptsCode: '', deptsName: '', deptsAbbr: '', isTop: '1', deptsParentsId: null, deptsOrders: 999, deptsStatus: 1 } export default { name: 'Dept', // rrOperation, diff --git a/src/views/system/fileLibraryManage/fieldManage/index.vue b/src/views/system/fileLibraryManage/fieldManage/index.vue index b88917d..bb3ea8c 100644 --- a/src/views/system/fileLibraryManage/fieldManage/index.vue +++ b/src/views/system/fileLibraryManage/fieldManage/index.vue @@ -112,7 +112,7 @@ export default { permission: { add: ['admin', 'fieldManage:add'], edit: ['admin', 'fieldManage:edit'], - del: ['admin', 'fieldManage:edit'] + del: ['admin', 'fieldManage:del'] }, deleteVisible: false, deleteData: {}, diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 168ebd2..4ddb37c 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -190,7 +190,7 @@ import { exportFile } from '@/utils/index' import qs from 'qs' let userRoles = [] let userPosts = [] -const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: null, fonds: { id: null }, roles: [], posts: [], dept: { id: null }, phone: null } +const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, fonds: { id: null }, roles: [], posts: [], dept: { id: null }, phone: null, isAdmin: false } export default { name: 'User', components: { Treeselect, crudOperation, pagination, DateRangePicker },