diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 798a088..a77c0e9 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -330,7 +330,7 @@ @include tree_font_color; } .el-tree-node__children{ - padding: 0 0 0 18px; + padding: 0 0 0 16px; .el-tree-node__content{ @include tree_children_padding; height: 30px; diff --git a/src/views/archivesStatistics/usageCountStatistics/index.vue b/src/views/archivesStatistics/usageCountStatistics/index.vue index bd56751..18e300d 100644 --- a/src/views/archivesStatistics/usageCountStatistics/index.vue +++ b/src/views/archivesStatistics/usageCountStatistics/index.vue @@ -47,8 +47,8 @@ {{ scope.row.isSummary ? '-' : scope.$index + 1 }} - - + + diff --git a/src/views/prearchiveLibrary/advancedSearchModal.vue b/src/views/prearchiveLibrary/advancedSearchModal.vue index e5c5f08..85eff82 100644 --- a/src/views/prearchiveLibrary/advancedSearchModal.vue +++ b/src/views/prearchiveLibrary/advancedSearchModal.vue @@ -185,7 +185,7 @@ export default { } }, mounted() { - this.getFieldCommon() + // this.getFieldCommon() }, methods: { resetQuery() { @@ -265,22 +265,29 @@ export default { }, getFieldCommon() { console.log('selectedDocument', this.selectedDocument) + const currentDocumentKey = JSON.parse(localStorage.getItem('currentDocumentKey')) + console.log('currentDocumentKey', currentDocumentKey) const params = { - documentId: this.selectedDocument.id, + documentId: this.selectedDocument.id ? this.selectedDocument.id : currentDocumentKey.id, archivesId: null } console.log('params', params) FetchDoeditDocument(params).then((data) => { - const showFiledAll = data.showFiled.filter(item => item.isSequence).sort((a, b) => a.isSequence - b.isSequence) - this.fieldOptions = showFiledAll - .filter(item => item.fieldName !== 'fonds_no' && item.fieldName !== 'fonds_name') - .map(item => { - return { - id: item.id, - label: item.fieldCnName, - value: item.fieldName - } - }) + if (data.code !== 500) { + const showFiledAll = data.showFiled.filter(item => item.isSequence).sort((a, b) => a.isSequence - b.isSequence) + this.fieldOptions = showFiledAll + .filter(item => item.fieldName !== 'fonds_no' && item.fieldName !== 'fonds_name') + .map(item => { + return { + id: item.id, + label: item.fieldCnName, + value: item.fieldName + } + }) + } else { + this.fieldOptions = [] + this.$message({ message: '获取字段失败', type: 'error', offset: 8 }) + } }) }, checkConditions(conditionData) { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 8722654..a59b556 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -123,17 +123,28 @@ 禁用 + - + + + + + + + + + + +