From 47105686d998d88eefd5874facfd8feefb056bc7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 10 Aug 2022 11:39:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8A=A8=E6=80=81-?= =?UTF-8?q?=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B=E4=BF=AE=E6=94=B9-?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e4ec41a97..a8187e336 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2596,8 +2596,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ - String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); - String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1); + String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1) + "."; + String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1) + "."; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); From df7a9845728ff6aea22ae0f20a8afd0010a72f41 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 10 Aug 2022 11:51:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8A=A8=E6=80=81-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E6=A1=A3=E5=BA=93=E5=86=85=E5=AE=B9?= =?UTF-8?q?-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index a8187e336..3288a7854 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -293,7 +293,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { + msgEndStr = " have been deleted from the document library."; + } + String msgContent = "The standard " + StringUtils.join(serialNumberListTemp,",") + msgEndStr; homeDocumentDynamicEO.setMsgContent(msgContent); homeDocumentDynamicEO.setMsgContentInfo(msgContent); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); From 9e51c6f9a36f2a6561fadf1787810a719ea3fa18 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 10 Aug 2022 11:57:58 +0800 Subject: [PATCH 3/3] =?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/countryCardList.vue | 92 +++++++++---------- .../components/countryCardView.vue | 29 ++++-- .../components/countryCardViewAdd.vue | 89 ++++++++++++++++-- .../components/displayInformationModel.vue | 49 ++-------- .../components/problemKnowledgeBaseList.vue | 7 +- 5 files changed, 158 insertions(+), 108 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index e3e4044bf..e9280d893 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -37,55 +37,26 @@
-
+
- 中国 + {{item.applyMarket_dictText}}
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- - - 中国 - -
-
- -
+
+ +
+ {{$t('dataLoading')}}
@@ -101,11 +72,16 @@ applyMarketList: [], pageSize: 10, total: 0, - pageNo: 1 + pageNo: 1, + loading: false, + url: { + getInfoList: '/problemKnowledgeBase/countryCardManageReleaseEO/page' + } } }, mounted() { this.getApplyMarketList() + this.getList() }, methods: { getApplyMarketList() { @@ -118,10 +94,15 @@ }) }, searchQuery() { - + this.pageNo = 1 + this.getApplyMarketList() + this.getList() }, searchReset() { - + this.pageNo = 1 + this.getApplyMarketList() + this.queryParam = {} + this.getList() }, pageOnChange(page, pageSize) { this.pageNo = page @@ -135,14 +116,19 @@ getList() { let query = { pageNo: this.pageNo, - pageSize: this.pageSize + pageSize: this.pageSize, + releaseStatus: 'Have released', + ...this.queryParam } - postAction(this.url.getInfoList, query).then((res) => { + 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 } }) }, @@ -153,10 +139,13 @@ }) window.open(newUrl.href, '_blank') }, - contentClick() { + contentClick(row) { let newUrl = this.$router.resolve({ path: '/countryCardView', - query: {} + query: { + applyMarket: row.applyMarket, + id: row.id, + } }) window.open(newUrl.href, '_blank') } @@ -208,6 +197,7 @@ .content-box { width: 100%; + overflow: hidden; } .content-box-box { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 65273ad93..6c194fd8a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -26,16 +26,19 @@
- - + + + + 中国 - + +
中国 - +
@@ -63,7 +66,9 @@ data() { return { clientWidth: '', - isTrue: false + isTrue: false, + dataList: [], + list: '/problemKnowledgeBase/countryCardManageReleaseEO/queryCountryCardManageReleaseByApplyMarkets' } }, mounted() { @@ -72,6 +77,7 @@ this.clientWidth = 340 * 14 + 'px' this.isTrue = true }) + this.queryCountry() }, methods: { displayInformationClick() { @@ -80,8 +86,19 @@ newlyAddedClick() { this.$refs.countryCardViewAddRef.add() }, - countryCardViewAddForm() { + countryCardViewAddForm(val) { + }, + queryCountry() { + let applyMarkets = this.$route.query.applyMarket + let query = { + applyMarkets: applyMarkets + } + postAction(this.list, query).then((res) => { + if (res.success) { + + } + }) } } } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue index da74db64a..2c1767b7a 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardViewAdd.vue @@ -14,14 +14,15 @@
- * {{$t('applicableMarket')}}
- +
@@ -34,15 +35,24 @@ {{$t('comparisonMarket')+(index+1)}} - + + + + {{ item.applyMarket_dictText}} + + + { this.formInline = {} + this.formInline.applyMarket = this.$route.query.applyMarket this.formInline.dataList = [{ relatedSection: '' }] + this.getList() this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() }) @@ -124,18 +140,71 @@ }, addData() { this.formInline.dataList.push({ - relatedSection: '' + applyMarket: '' }) + this.consolidateData() this.formInline = { ...this.formInline } }, deleteData() { this.formInline.dataList.pop() + this.consolidateData() this.formInline = { ...this.formInline } + }, + getList() { + let query = { + releaseStatus: 'Have released' + } + getAction(this.url.getInfoList, query).then((res) => { + if (res.success) { + this.applyMarketList = res.result + this.consolidateData() + } else { + this.applyMarketList = [] + } + }) + }, + consolidateData() { + let content = [] + content.push(this.$route.query.applyMarket) + content = content.join(',') + this.applyMarketList = this.applyMarketList.filter(res => { + return !content.includes(res.applyMarket) + }) + let contentIndex = [] + if (this.formInline.dataList && this.formInline.dataList.length > 0) { + this.formInline.dataList.forEach(res => { + contentIndex.push(res.applyMarket) + res.applyMarketList = [] + this.applyMarketList.forEach(val => { + res.applyMarketList.push(val) + }) + }) + } + contentIndex = contentIndex.join(',') + for (let i = 0; i < this.formInline.dataList.length; i++) { + for (let j = 0; j < this.formInline.dataList[i].applyMarketList.length; j++) { + if (contentIndex.includes(this.formInline.dataList[i].applyMarketList[j].applyMarket) + && this.formInline.dataList[i].applyMarket != this.formInline.dataList[i].applyMarketList[j].applyMarket) { + console.log(111) + console.log(j) + this.formInline.dataList[i].applyMarketList.splice(j, 1) + j-- + } + } + } + this.formInline = { ...this.formInline } + }, + applyMarketChange() { + this.consolidateData() } } } - +