From 2507fadf912154b3c69984fedcf19bb8b3c16147 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 9 Aug 2022 17:50:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E8=AE=BE=E7=BD=AE=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 33 +++++++-------- .../jero/modules/report/util/WordUtil.java | 42 +++++++++++++++++-- 2 files changed, 53 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 7d7c5d0cf..e57924d30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -546,11 +546,12 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); - String content = ""; - if(CutEnum.CN.getValue().equals(cut)){ - content = "主要内容"; - }else{ - content = "Content"; - } - WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 12, false, true, "Microsoft YaHei UI"); + String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; //生成页眉页脚 - WordUtil.exportHeardAndFoot(document,lawsMonthlyReportWriteEOS.get(0).getMonth()); + WordUtil.exportHeardAndFoot(document,moth); + //生成标题 + WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, false, true, "Blue Sky Noto Regular"); int oneCount = 1; for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : reportTitleOneList) { @@ -639,7 +636,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl新征求意见清单模板, 新发布标准清单模板 @@ -686,7 +683,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Tue, 9 Aug 2022 17:53:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 22 +++++++++++++++---- .../components/problemKnowledgeBaseList.vue | 12 +++++++--- .../problemKnowledgeBaseRelease.vue | 20 ++++++++++++----- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 094e2f5ee..8b17b5343 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -42,7 +42,6 @@ @@ -293,12 +292,22 @@ getAction('/problemKnowledgeBase/problemKnowledgeBaseEO/queryById', query).then((res) => { if (res.success) { this.formInline = res.result || {} - this.formInline = { ...this.formInline } if (this.formInline.showPermissions == 'Privacy') { this.isDisplay = true + if (this.formInline.permissionUserList && this.formInline.permissionUserList.length > 0) { + let userId = [] + let userName = [] + this.formInline.permissionUserList.forEach(val => { + userId.push(val.userId) + userName.push(val.userName) + }) + this.formInline.studioEngineerName = userName.join(',') + this.formInline.studioEngineer = userId.join(',') + } } else { this.isDisplay = false } + this.formInline = { ...this.formInline } } else { this.formInline = {} } @@ -390,10 +399,13 @@ this.loading = true this.confirmLoading = true let url = '' + let Action if (this.formInline.id) { url = this.url.edit + Action = putAction } else { url = this.url.add + Action = postAction } formInline.permissionUserList = [] if (formInline.showPermissions == 'Privacy') { @@ -404,12 +416,14 @@ }) }) } - postAction(url, formInline).then((res) => { + Action(url, formInline).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.loading = false if (this.$route.query.id) { - + this.$router.push({ + path: '/problemKnowledgeBaseRelease' + }) } else { this.$router.push({ path: '/problemknowledgeBase' diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index a50d4e6f7..d7a10b460 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -6,7 +6,7 @@ {{$t('searchContent')}} + v-model="searchStr"> {{$t('query')}} {{$t('reset')}} @@ -76,6 +76,7 @@ @showSizeChange="SizeChange" /> + {{$t('dataLoading')}} @@ -95,6 +96,7 @@ checkboxText: [], conList: [], total: 0, + loading: false, pageSize: 10, downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, @@ -112,7 +114,7 @@ this.getList() }, ResetSearch() { - this.searchContent = '' + this.searchStr = '' this.pageNo = 1 this.getList() }, @@ -148,14 +150,18 @@ getList() { let query = { pageNo: this.pageNo, - pageSize: this.pageSize + pageSize: this.pageSize, + searchStr: this.searchStr } + this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total + this.loading = false } else { this.conList = [] + this.loading = false } }) }, diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 628bdec05..b42131f4f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -57,12 +57,14 @@ + {{$t('dataLoading')}}