diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 7eafd047e..eff55c5ba 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1298,4 +1298,5 @@ module.exports = { personChargeReceivesTheTask:'Person in charge receives the task', theResponsiblePersonTaskForTheSecondTime:'The responsible person receives the task for the second time', processNodesAreInconsistentPleaseSelectConsistentData:'Process nodes are inconsistent; Please select consistent data', + exportFileName:'Export file name', } \ 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 251fe8bd5..d4b640677 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1400,4 +1400,5 @@ module.exports = { personChargeReceivesTheTask:'责任人接收任务', theResponsiblePersonTaskForTheSecondTime:'责任人二次接收任务', processNodesAreInconsistentPleaseSelectConsistentData:'流程节点不一致;请选择一致的数据', + exportFileName:'导出文件名称', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index 18cd007ee..c0a2474a3 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -65,6 +65,22 @@ + + + +
+
+ * + {{$t('exportFileName')}} +
+ + + +
+
+ +
@@ -121,6 +137,14 @@ export default { description:[ { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], + exportName:[ + { + max: 70, + message: this.$t('exportFileName') + this.$t('cannotExceed') + 70 + this.$t('Characters'), + trigger: 'blur' + }, + { required: true, message: this.$t('PleaseEnter')+this.$t('exportFileName'), trigger: 'blur' }, + ], exportTemplateId: [ { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' }, ], @@ -243,12 +267,12 @@ export default { // query.certCategoryName = this.contentListStart // } query.paramsManifestId = this.$route.query.id - let long = localStorage.getItem('language') - if (long && long === 'zh-cn') { - query.exportName = '自定义导出' - } else if (long && long === 'en-us') { - query.exportName = 'Custom' - } + // let long = localStorage.getItem('language') + // if (long && long === 'zh-cn') { + // query.exportName = '自定义导出' + // } else if (long && long === 'en-us') { + // query.exportName = 'Custom' + // } this.confirmLoading = true downloadFile('report/detail/exportCustom', query.exportName+'.zip', query) this.confirmLoading = false diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 320bc0c8f..5f2b8165b 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -5,7 +5,7 @@
- {{ $t('ParameterViewPage') }} + {{this.$route.query.pageName ? this.$route.query.pageName : $t('ParameterViewPage')}}
@@ -19,9 +19,9 @@ {{$t('NcertificationCategory')}} + :placeholder="$t('PleaseSelect')+$t('NcertificationCategory')" + :type="'select'" + :triggerChange="false" :dictCode="'cert_category'"/> @@ -104,39 +104,39 @@ @value='value' @listReset='listReset' @LoginUserType='LoginUserType'/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{this.$t('pleaseWaitWhileRunning')}} @@ -144,444 +144,454 @@ \ No newline at end of file