From 53ca97b185eccc447912b6d98600fae94693b1e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 17 Aug 2021 18:20:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmpg2/step10.vue | 8 ++++---- .../processCenter/pages/creatProcess/xmpg2/step11.vue | 6 +++--- .../processCenter/pages/creatProcess/xmpg2/step12.vue | 8 ++++---- .../processCenter/pages/creatProcess/xmpg2/step5.vue | 5 ++++- .../processCenter/pages/creatProcess/xmpg2/step6.vue | 7 ++++--- .../processCenter/pages/creatProcess/xmpg2/step7.vue | 8 ++++---- .../processCenter/pages/creatProcess/xmpg2/step8.vue | 8 ++++---- .../processCenter/pages/creatProcess/xmpg2/step9.vue | 8 ++++---- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index ff73ee5f0..3be6e759d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -95,21 +95,21 @@ label="条款名称"> { @@ -373,7 +376,6 @@ export default { this.listForm = item.form; this.dataList = item.form.dataList; } - }); }, //保存事件 @@ -400,6 +402,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + console.log(json); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 90ede1ec5..f5de1e3ca 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -96,12 +96,12 @@ label="条款名称"> Date: Wed, 18 Aug 2021 09:45:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 8 ++++---- .../processCenter/pages/creatProcess/wfhxzg/step2.vue | 10 ++++++---- .../processCenter/pages/creatProcess/wfhxzg/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/wfhxzg/step4.vue | 4 ++-- .../processCenter/pages/creatProcess/wfhxzg/step5.vue | 4 ++-- .../pages/projectAddEit.vue | 2 ++ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index dce75e757..e095c2f12 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -31,7 +31,7 @@ @@ -148,7 +148,7 @@ @@ -210,9 +210,9 @@ @selection-change="selectedChange" > - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index b52339f31..7337160b7 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -97,9 +97,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + @@ -248,6 +248,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, nonSearch: { + standSerialNumber: '', standId: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 @@ -457,7 +458,7 @@ export default { this.modalshowflag = false }, //查询按钮 - getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 + /*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 this.realList = this.dataList.filter(item => { let matchId = true; // 标准号 筛选 let matchName = true; // 项目名称 筛选 @@ -479,7 +480,7 @@ export default { return matchId && matchName && matchUnit; }) this.dataList = this.realList - }, + },*/ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ @@ -496,6 +497,7 @@ export default { clearAllSearch () { this.nonSearch = { standId: '', + standSerialNumber: '', productName: '', responsibleUnit: '' } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 039a1e43d..0ee390f14 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -99,9 +99,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index ffb4d7f5c..9dacab355 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -87,9 +87,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index b952313b3..6ac35d94c 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -87,9 +87,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 1ebf4635e..a075dfd8f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1048,6 +1048,8 @@ export default { this.sarAccessInfoSearch.standName = '' this.sarAccessInfo.standName = '' this.sarAccessInfo.standNumber = '' + this.sarAccessInfo.typeApplicable = '' + this.sarAccessInfo.syrz = '' this.sarAccessInfoSearch.advanceSearchVOStr = '' this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 From 8f2a1ef1fd41e89487fdac02d826fe9c0f670933 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 18 Aug 2021 12:35:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6b191d902..1ae32f44e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -621,16 +621,22 @@ 数据加载中... + - - + + + + + + + + + + @@ -1243,6 +1249,8 @@ export default { knowType: '', KnowTitle: '', knowIdList: '', + total7: 0, + page7: 1, addForm: { title: '', content: '', @@ -1759,6 +1767,15 @@ export default { this.knowId = '' this.AddKnowledgDialog = false }, + //查看分解单分页 + pageChange7(page) { + this.page7 = page + this.selectSarStandItems() + }, + pageSizeChange7(pageSize){ + this.pageSize7 = pageSize + this.selectSarStandItems() + }, // 知识点分页 pageChange1(page) { this.pageNo = page @@ -2317,12 +2334,9 @@ export default { this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.selectedItemList = [] if (res.ok) { - this.standItemList = res.data.list; - console.log("standItemList"); - console.log(this.standItemList); - console.log("res.data"); + this.standItemList = res.data; console.log(res.data); - this.standitemTotal = res.data.count // 分页需要 + this.total7 = res.data.length // 分页需要 } }, e => { })