diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 799e01e9e..50ba2696a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1309,4 +1309,5 @@ module.exports = { importLocalDisassemblyOrder:'Import local disassembly order', notExport:'Not export', hasBeenExport:'Has been export', + firstLevelDirectory:'First level directory', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a4d0c48ec..9acdc9128 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1410,4 +1410,5 @@ module.exports = { importLocalDisassemblyOrder:'导入本地拆解单', notExport:'未导出', hasBeenExport:'已导出', + firstLevelDirectory:'一级目录', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 008c74166..5fcdfcf2e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -136,6 +136,13 @@ pageNo: 1, queryParam: {}, columns: [ + { + title: this.$t('firstLevelDirectory'), + align: 'center', + dataIndex: 'memoriesChapterOneName', + ellipsis: true, + width: 170 + }, { title: this.$t('chapterContents'), align: 'center', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index a1fb27251..12be5c8b3 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -260,6 +260,9 @@ if (value.length > 1) { value.shift() } + if (extra.triggerNode.dataRef && extra.triggerNode.dataRef.parentId) { + this.formInline.memoriesChapterOne = extra.triggerNode.dataRef.parentId + } this.formInline.memoriesChapter = value this.formInline = { ...this.formInline } }, @@ -273,7 +276,7 @@ text = 'solicitOpinionsRef' } else if (this.$refs.releaseStandardRef) { text = 'releaseStandardRef' - }else if (this.$refs.industryTemplateRef) { + } else if (this.$refs.industryTemplateRef) { text = 'industryTemplateRef' } this.$refs[text].getData((val) => { @@ -293,7 +296,8 @@ let query = Object.assign(val, { month: formInline.month, memoriesChapter: formInline.memoriesChapter, - contentTemplate: formInline.contentTemplate + contentTemplate: formInline.contentTemplate, + memoriesChapterOne:formInline.memoriesChapterOne }) postAction(url, query).then((res) => { if (res.success) { @@ -400,7 +404,7 @@ ::v-deep .ant-select-tree-node-content-wrapper { float: right; - margin-top: -2px!important; + margin-top: -2px !important; } ::v-deep .ant-select-tree-title {