From 2dc8dd71a89600ea0d760238fb43891363974909 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 16:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsList.vue | 20 ++++++++-------- .../components/initiatingProcess.vue | 24 ++++++++++--------- .../collectionOfRegulatoryOpinions/index.vue | 10 +++++--- .../components/initiatingProcess.vue | 4 +++- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index 961166e0f..bdaa64268 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -10,7 +10,7 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;">
-
+
{{$t('export')}}
@@ -47,11 +47,11 @@ {{$t('filingExternalOpinions')}}:
- + {{$t('clickUpload')}}
- + {{$t('viewFile')}}
@@ -86,7 +86,7 @@ pageNo: 1, dataSource: [], formInline: {}, - userInfoQuery:{}, + userInfoQuery: {}, columns: [ { title: this.$t('relevantSections'), @@ -135,7 +135,7 @@ } }, mounted() { - this.userInfoQuery = this.userInfo() + this.userInfoQuery = this.userInfo() }, methods: { ...mapGetters(['userInfo']), @@ -178,8 +178,8 @@ //导出 handleExport() { let query = { - pageSize:this.pageSize, - pageNo:this.pageNo, + pageSize: this.pageSize, + pageNo: this.pageNo, lawsOpinionGatherId: this.lawsOpinionGatherId, actiProcInstId: this.actiProcInstId } @@ -201,7 +201,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -210,8 +210,8 @@ let query = { lawsOpinionGatherId: this.lawsOpinionGatherId, actiProcInstId: this.actiProcInstId, - pageSize:this.pageSize, - pageNo:this.pageNo + pageSize: this.pageSize, + pageNo: this.pageNo } this.loading = true getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 232ff83e1..6fdb2362f 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -141,7 +141,7 @@ addModelList: '/dummy/dummyInventoryInfoEO/queryPageDummy' }, loading: false, - JLoading:false, + JLoading: false, dataSource: [], selectedRowKeys: [], total: 0, @@ -172,12 +172,14 @@ align: 'center', dataIndex: 'serial_number', width: 170, + ellipsis: true, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170, scopedSlots: { customRender: 'titleName' } }, @@ -232,7 +234,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -261,7 +263,7 @@ if (this.selectedRowKeys.length > 1) { this.selectedRowKeys.shift() } - this.selectedRowKeysRecord = record.filter(res=>{ + this.selectedRowKeysRecord = record.filter(res => { return res.id == this.selectedRowKeys[0] }) this.selectedRowKeysRecord = [...this.selectedRowKeysRecord] @@ -297,14 +299,14 @@ dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, - getUUID(){ - var str=[]; - var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; - for(var i=0;i<36;i++){ - str[i]=Chars.substr(Math.floor(Math.random()*16),1) + getUUID() { + var str = [] + var Chars = '0123456789abcdefghijklmnopqrstuvwxyz' + for (var i = 0; i < 36; i++) { + str[i] = Chars.substr(Math.floor(Math.random() * 16), 1) } - str[0]=str[8]=str[13]=str[18]=str[23]='-'; - return str.join("") + str[0] = str[8] = str[13] = str[18] = str[23] = '-' + return str.join('') }, submit() { this.$refs.ruleForm.validate(valid => { @@ -338,7 +340,7 @@ postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { this.completeTask(value, res.result) - }else{ + } else { this.JLoading = false } }) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 0f0d418b3..173a0f4e2 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -92,7 +92,10 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - + + {{text}} + + {{$t('viewProcess')}} {{$t('evaluationResults')}} @@ -157,7 +160,8 @@ align: 'center', dataIndex: 'serialNumber', ellipsis: true, - width: 170 + width: 170, + scopedSlots: { customRender: 'serialNumber' } }, { title: this.$t('title'), @@ -235,7 +239,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 168270ba7..08db600d4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -250,12 +250,14 @@ align: 'center', dataIndex: 'serial_number', width: 170, + ellipsis: true, scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170, scopedSlots: { customRender: 'titleName' } }, @@ -335,7 +337,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList()