diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue index 8101047..b809921 100644 --- a/src/components/selection/TreeDataSelectModal.vue +++ b/src/components/selection/TreeDataSelectModal.vue @@ -139,7 +139,7 @@ export default { console.log('-------------optionsHref', val) if (val === '/laws/standard/partName/queryFirstList') { // 是涉及系统/部件 - this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' } + this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'code' } this.lazyLoadHref = '/laws/standard/partName/getChild' this.searchFieldName = 'nodeName' this.lazyLoadPidFieldName = 'dictItemId' diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index 8416de8..33dcb71 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -47,6 +47,18 @@ type="primary" ghost @click="viewAll(formItem.dbFieldName)"> {{ $t('enterpriseStandardLibrary.standard.viewAll')}} + + + {{ + detailData[(isChinese() ? formItem.dbFieldName + '_dictText' : formItem.dbFieldName + '_dictTextEn')] || global.emptyLine + }} + + + + {{ + detailData[formItem.dbFieldName + '_dictText'] || global.emptyLine + }} + {{ detailData[formItem.dbFieldName + '_dictText'] }} @@ -190,7 +202,7 @@ export default { dataSource: [], // 稽查内容数据 image: false, imageUrl: '', - showViewAllField: ['auth_dept'], // 需要显示展示查看全部按钮的字段 + showViewAllField: ['part_name'], // 需要显示展示查看全部按钮的字段 // 标准字段,需要跳转标准详情 standardFields: ['substitute_standard_number', 'replaced_by_standard_number', 'reference_standard', 'referenced_standard'], // 参与只允许查看最新稿件排序的字段顺序(发布稿>征求意见稿) @@ -199,7 +211,13 @@ export default { manuScriptNewestFileField: '', filePerm: { // 上传文件根据权限控制只能查看,没有权限的除了系统管理员外不可见不可下载 associated_file: 'enterpriseStandard:associatedFile:look' // 关联文件 - } + }, + // 需要数据字段翻译的属性类型 + needDictFieldList: [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], + // 需要双语切换翻译的属性类型 + needEnNameFieldType: [FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value], + // 是双语切换翻译的属性,但是不翻译的字段 + needEnNameTypeNotUseField: ['standard_system'] } }, computed: { diff --git a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue index c65e4e5..58188a0 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue @@ -54,14 +54,26 @@ {{ global.emptyLine }} - + type="primary" ghost @click="viewAll(formItem.dbFieldName)"> {{ $t('enterpriseStandardLibrary.standard.viewAll')}} - + + + + {{ + detailData[(isChinese() ? formItem.dbFieldName + '_dictText' : formItem.dbFieldName + '_dictTextEn')] || global.emptyLine + }} + + + + {{ + detailData[formItem.dbFieldName + '_dictText'] || global.emptyLine + }} + {{ - detailData[needDictFieldList.includes(formItem.fieldShowType) ? formItem.dbFieldName + '_dictText' : formItem.dbFieldName] || global.emptyLine + detailData[formItem.dbFieldName] || global.emptyLine }} @@ -180,6 +192,10 @@ export default { retractableFlag: {}, // 面板展开收起的标识 // 业务基本信息有几个部分 formPartList: [], + // 需要双语切换翻译的属性类型 + needEnNameFieldType: [FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value], + // 是双语切换翻译的属性,但是不翻译的字段 + needEnNameTypeNotUseField: ['standard_system'] } }, computed: { @@ -310,7 +326,7 @@ export default { }, // 查看全部 viewAll (fieldName) { - const data = this.detailData[fieldName + '_dictText'] || this.detailData[fieldName] + const data = this.isChinese() ? this.detailData[fieldName + '_dictText'] : this.detailData[fieldName + '_dictTextEn'] || this.detailData[fieldName] this.$refs.textContentModal.open(data) }, handlePreview (file, formItem) {