diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 42b0f11..5ad4ab8 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -265,7 +265,18 @@ export default { translationContentList: [], // 译文内容的数据 clauseLabelInfo: {}, // 条文标签数据 clauseLabelHideField: ['item_content', 'item_title', 'translation'], - needDictField: [FieldType.USER_SINGLE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value], + needDictField: [ + FieldType.USER_SINGLE.value, + FieldType.ORGAN_SINGLE.value, + FieldType.ORGAN_MORE.value, + FieldType.OPTION_SINGLE.value, + FieldType.OPTION_MORE.value, + FieldType.TREE.value, + FieldType.TREE_SINGLE.value, + FieldType.TREE_MODAL_SELECT.value, + FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value, + FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value + ], queryParams: {}, isDragging: false, // 是否拖拽中 standardCatalogueRefX: 280, // 标准目录默认宽度 diff --git a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue index c4ce785..a64cc43 100644 --- a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue +++ b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue @@ -20,6 +20,7 @@ splitSearch disabledSourceSearch @nameChange="handleStandardNumberChange" + @listChange="handleStandardListChange" :select-only="true" :can-selected-source="[StandardSource.FOREIGN.value]" class="readonly-input" @@ -113,6 +114,7 @@ export default { validateTrigger: 'change' } }, + standardInfo: {}, // 选择的标准 downTemplateUrl: '/laws/DocumentTool/documentSplit/downloadImportTemplate' // 模板下载 } }, @@ -124,8 +126,9 @@ export default { this.form.validateFields(async (errors, values) => { if (!errors) { this.confirmLoading = true - const formData = values + const formData = Object.assign({}, values) const fileInfo = await getFileInfo({ id: formData.splitFileId }) + formData.standardId = this.standardInfo.id if (fileInfo.success) { formData.fileName = fileInfo.result.fileName } @@ -198,6 +201,9 @@ export default { handleStandardNumberChange (name) { this.form.setFieldsValue({ title: name }) }, + handleStandardListChange (list) { + this.standardInfo = list[0] || {} + }, // 下载导入模板 downTemplate (fileName, fileSuffix = '.xls') { if (!fileName || typeof fileName !== 'string') { diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue index 4f674d8..8910180 100644 --- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue +++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue @@ -153,18 +153,26 @@ @change="updateDom" :placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)" /> - + + + + + + + + + + + + + @@ -240,10 +248,12 @@ import { getFormDictTreeList } from '../../../../api/api' import STreeSelect from '../../../../components/STreeSelect' import TreeSelection from '../../../../components/selection/TreeSelection' import { randomUUID } from '@/utils/util' +import TreeDataSelection from '@comp/selection/TreeDataSelection' export default { name: 'SplitAddForm', components: { + TreeDataSelection, TreeSelection, JMultipleDatePicker, SplitDetailAddTable, @@ -719,6 +729,9 @@ export default { } return null }, + treeDataSelectNameChange (value, fieldName) { + this.formInline[fieldName + '_dictText'] = value + }, /** * 如果字段中的usableRange只有一个值,那么就需要在placeholder中标识 * @param field