From a3d029a624dc61e0d423273a98b39c1f6833f3dd Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 13:42:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=A0=87=E5=87=86=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=EF=BC=8C=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 179e7af34..52b406538 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -195,6 +195,7 @@ icon="icon-separate" >标准分解单

+

@@ -412,9 +413,16 @@ width="150" > + + {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }} + + + + - - - - - @@ -179,13 +179,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} @@ -195,7 +195,6 @@ icon="icon-separate" >标准分解单

-

@@ -257,11 +256,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} @@ -271,13 +272,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 98f2d0e0f..5f0b7ebe2 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3123,7 +3123,7 @@ export default { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.id this.personCollect.collectResId = this.collectId - this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' this.personCollect.userId = this.$store.getters.userInfo.userId this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, @@ -3204,6 +3204,7 @@ export default { formData.collectMenuId = undefined } formData.standType = 'INLAND' + formData.userId = this.$store.getters.userInfo.userId this.SarExportSearchEo = formData this.loading = true this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { @@ -3250,6 +3251,7 @@ export default { } this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows + this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, @@ -3414,6 +3416,7 @@ export default { this.quoteIdList1 = [] this.replaceStandNumForm.quoteIdList = '' } + this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) @@ -3650,6 +3653,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } + this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' From 3a5dd8ed1d8529ea3431d9001d64ec63e845279a Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 14:26:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug:=E5=9B=BD=E5=86=85/=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=B7=A6=E4=BE=A7=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=A0=91=E4=B8=8A=E6=96=B9=E9=9C=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 16 ++++++++++++++++ .../foreignStandardsAndRegulations/index.vue | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f0b7ebe2..cec1fc816 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
+ + @@ -1286,6 +1291,7 @@ export default { }, data () { return { + filterText: '', // 国内法规过滤 props: { label: 'menuName', children: 'children' @@ -1943,7 +1949,17 @@ export default { textStatusMap: {} // 文本状态id与name对应 } }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + } + }, methods: { + // 国内标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index b394854ef..d7acd19ee 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
+ + @@ -1741,14 +1746,23 @@ export default { displayLocation: [], orgData: [], delLoading: false, - standState: '' + standState: '', + filterText: '' } }, props: { }, watch: { + filterText(val) { + this.$refs.tree.filter(val); + } }, methods: { + // 海外标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR2 (type, title, id) { this.drawerTitle = title this.modalShowFlag2 = true