From 84cc6a3d809174d602a05a2f9c55fd42518453f2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 12 Jul 2022 15:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9=20=E4=B8=8A=E6=8A=A5=E5=BA=93-?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E5=87=BA=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=BB=E6=8E=89=E6=8A=80=E6=9C=AF=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=20=E5=8F=82=E6=95=B0=E8=AF=B4=E6=98=8E=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../src/components/tableCollection/index1.vue | 8 ++- .../commponts/customexportmodle.vue | 59 +++++++++++----- .../parameter/managementdetails/index.vue | 2 + .../parameterlist/components/addModel.vue | 70 ++++++++++--------- 6 files changed, 86 insertions(+), 55 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 05586dcd0..b43170a80 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -389,6 +389,7 @@ module.exports = { whole: 'Whole', DocumentLibrary: 'Document Library', GeneralExportInformation:'General export information', + CustomizeExportInformation:'Customize export information', DocumentComparisonLibrary: 'Document comparison Library', weekly: 'Weekly', SyncLibrary: 'Sync to doc. library', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 700a6135c..c0a728c48 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -394,6 +394,7 @@ module.exports = { whole: '全部', DocumentLibrary: '文档库', GeneralExportInformation:'常规导出信息', + CustomizeExportInformation:'自定义导出信息', DocumentComparisonLibrary: '文档对比库', weekly: '周报', SyncLibrary: '同步至文档库', diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 0dc4b2e8e..2faa372e5 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -96,7 +96,7 @@ - +
{{$t('configurationName')}}: @@ -290,12 +290,16 @@ this.$emit('handlePreservation') this.getTableList() }, + hideModal(){ + this.areaVisibleView = false + }, // 查看配置详细信息 onClickSee(val) { + console.log(val) let _this = this this.areaVisibleView = true axios({ - url: `/jero-boot/params/config/getById?id=${val.db_field_name}`, + url: `/jero-boot/report/detail/getConfig?id=${val.db_field_name}`, method: 'get', transformRequest: [function(data) { let ret = '' diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index 550f1e191..c413fbf9e 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -17,6 +17,7 @@
+ * {{$t('configure')}}
@@ -41,14 +42,23 @@
+ * {{$t('CustomTemplateName')}}
- - + + + + {{ mode.label }} + + + + + + +
@@ -87,6 +97,7 @@ export default { confirmLoading: false, description:false, dictOptions:[], + exportTemplatetOptions:[], visible: false, required:false, disabled:false, @@ -110,8 +121,8 @@ export default { description:[ { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, ], - status: [ - { required: true, message: this.$t('PleaseSelect')+this.$t('status'), trigger: 'change' }, + exportTemplateId: [ + { required: true, message: this.$t('PleaseSelect')+this.$t('CustomTemplateName'), trigger: 'change' }, ], fileConnectId: [ { required: true, message: this.$t('PleaseSelect')+this.$t('attachmentTemplate'), trigger: 'change' }, @@ -160,9 +171,9 @@ export default { this.visible = true this.title = this.$t('CustomExport') this.formInline = {} - this.formInline.separator = ',' this.formInline = {...this.formInline} this.getConfigure() + this.getexportTemplateId() this.$nextTick(() => { this.$refs['ruleForm'].clearValidate() @@ -172,7 +183,7 @@ export default { let pram = { paramsManifestId: this.$route.query.id } - getAction('report/detail/getConfigLabelList', pram).then((res) => { + getAction('report/detail/getConfigLabelListCustom', pram).then((res) => { if (res.success) { console.log(res.result) this.dictOptions = res.result @@ -181,6 +192,16 @@ export default { } }) }, + getexportTemplateId(){ + getAction('report/detail/getTemplateLabelList', {}).then((res) => { + if (res.success) { + console.log(res.result) + this.exportTemplatetOptions = res.result + } else { + // this.$refs.uploadFile.perentHandleFunc() + } + }) + }, editModel(value) { this.visible = true this.title = '编辑' @@ -213,17 +234,17 @@ export default { let url = this.url.ConventionalExport let Action = getAction let query = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(query).forEach(res => { - if (query[res] && query[res] instanceof Array) { - query[res] = query[res].join(',') - } - }) - if(this.contentListStart){ - query.certCategoryName = this.contentListStart - } + // Object.keys(query).forEach(res => { + // if (query[res] && query[res] instanceof Array) { + // query[res] = query[res].join(',') + // } + // }) + // if(this.contentListStart){ + // query.certCategoryName = this.contentListStart + // } query.paramsManifestId = this.$route.query.id this.confirmLoading = true - downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.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 6dc973175..3dc497d98 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -1,4 +1,5 @@