From 99aac7d0dad29629ab6beed723c112c733358fc1 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 19 Aug 2021 14:50:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=9B=9E=E6=98=BE=E4=BB=A5=E5=8F=8A=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 100 +++++++++--------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 99e9ee793..398c2b577 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -425,7 +425,7 @@
更多
- + - - - - - - - - - + + + + + + + + + - - + + @@ -819,9 +819,9 @@
+ :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''"> {{ - standShowItemEO.interpretationContent ? standShowItemEO.interpretationContent.replace(/<.*?>/ig, ' ') : '' + standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : '' }}
@@ -852,51 +852,51 @@
- {{standShowItemEO.dutyEngineer }} + {{ standShowItemEO.dutyEngineer }}
- {{standShowItemEO.comparedWithPrevious }} + {{ standShowItemEO.comparedWithPrevious }}
- {{standShowItemEO.complianceRequire }} + {{ standShowItemEO.complianceRequire }}
- {{standShowItemEO.complianceState }} + {{ standShowItemEO.complianceState }}
- - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -1251,6 +1251,7 @@ export default { knowIdList: '', total7: 0, page7: 1, + pageSize7: this.$store.getters.userInfo.configContent, addForm: { title: '', content: '', @@ -1772,7 +1773,7 @@ export default { this.page7 = page this.selectSarStandItems() }, - pageSizeChange7(pageSize){ + pageSizeChange7(pageSize) { this.pageSize7 = pageSize this.selectSarStandItems() }, @@ -2099,7 +2100,7 @@ export default { console.log("pageSize"); console.log(pageSize); // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent - this.standItemSearch.pageSize =pageSize; + this.standItemSearch.pageSize = pageSize; this.selectSarStandItems() // 此处需要调用接口，修改个人配置 }, @@ -2331,12 +2332,15 @@ export default { selectSarStandItems(id, flag) { this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType - this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { + ...this.standItemSearch, + pageSize: this.pageSize7, page: this.page7, + }, {}, res => { this.selectedItemList = [] if (res.ok) { - this.standItemList = res.data; + this.standItemList = res.data.list; console.log(res.data); - this.total7 = res.data.length // 分页需要 + this.total7 = res.data.count // 分页需要 } }, e => { }) From 7b1d4bd883075ff3f70f56b4f6fb9e35a63452ff Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 19 Aug 2021 15:43:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 398c2b577..dda912463 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -559,11 +559,11 @@ { From 1c5ecac0d4b80f4631489f26569b0d29b0457350 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 19 Aug 2021 15:49:50 +0800 Subject: [PATCH 3/4] commit --- .../pages/creatProcess/bzzqyj/step5.vue | 1 - .../pages/creatProcess/bzzqyj/step7.vue | 1 + .../pags/consultationDetails.vue | 57 ++++++++++++++++--- 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 0d44e7924..0d73dd9a0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -354,7 +354,6 @@ this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname - console.log(data); this.oldData = JSON.parse(JSON.stringify(data.summaryList)) data.summaryList.forEach( item => { if (item.state) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 813827b12..61b4a50d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -366,6 +366,7 @@ }) this.json = data this.data = arr + this.oldData = data.oldinfo }).catch(e => { }) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 864bd9717..8250bbdc8 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -60,6 +60,24 @@ align="center" label="修改意见内容(包括理由或依据)" > + + + + + +
- - + + - - + + + + + + + +
@@ -139,14 +163,22 @@ isSubmit: false, opinionContent: { // 抽屉数据 partCode: '', - content: '', + oldText: '', + newText: '', + reason: '' }, opinionContentRules: { partCode: [ { required: true, message: '请输入章节编号', trigger: 'blur' }, ], - content: [ - { required: true, message: '请输入修改意见内容(包括理由或依据)', trigger: 'blur' } + oldText: [ + { required: true, message: '请输入修改前内容', trigger: 'blur' } + ], + newText: [ + { required: true, message: '请输入修改后内容', trigger: 'blur' } + ], + reason: [ + { required: true, message: '请输入修改理由', trigger: 'blur' } ], }, standinfoList: [], // 详情列表 @@ -231,12 +263,16 @@ this.id = row.id this.opiniontitle = '编辑意见内容' this.opinionContent.partCode = row.partCode - this.opinionContent.content = row.content + this.opinionContent.reason = row.reason + this.opinionContent.oldText = row.oldText + this.opinionContent.newText = row.newText } else { this.id = '' this.opiniontitle = '新增意见' this.opinionContent.partCode = '' - this.opinionContent.content = '' + this.opinionContent.reason = '' + this.opinionContent.oldText = '' + this.opinionContent.newText = '' } this.isDialog = true }, @@ -275,6 +311,9 @@ var form = { cid: this.$route.query.item.cid, content: this.opinionContent.content, + oldText: this.opinionContent.oldText, + newText: this.opinionContent.newText, + reason: this.opinionContent.reason, partCode: this.opinionContent.partCode, userId: this.$store.getters.userInfo.userId || '', userName: this.$store.getters.userInfo.userName || '', From 6195d17afc530aba3128c0ca026578de2a8643e6 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 19 Aug 2021 15:55:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93=E5=88=86=E9=A1=B5bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 612bd54e5..9198a2f34 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -214,11 +214,7 @@
- +