From ba5559098b057e2c4c2ef5467ba9482b1eecd501 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 23 Dec 2021 16:23:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20-=20?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AD=A5=20-=20=E6=B2=A1=E6=9C=89=E5=B8=A6?= =?UTF-8?q?=E5=85=A5=E7=82=B9=E5=8F=96=E6=B6=88=E5=86=8D=E6=AC=A1=E8=BF=9B?= =?UTF-8?q?=E5=8E=BB=E8=A1=A8=E6=A0=BC=E4=BC=9A=E5=8F=98=E7=9F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 884a26ce2..87e0577b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1203,7 +1203,7 @@ :data="tableData.standardData" tooltip-effect="dark" style="width: 100%;" - :height="tableHeight.standardTableHeight" + height="100%" border class="drag-table" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" From ae605689017318d15c3c7048f17b4c9e247d972a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 23 Dec 2021 16:37:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 97 +++++++++++++------ 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index afb29ac50..cc4e4049d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -459,39 +459,74 @@ export default { }, // 根据准入id查询标准法规详情 selectInfobyAccid() { - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - ...this.standardFormList, - ...this.standardForm, - id: this.pageId - }, { - _this: this - }, res => { - console.log(res.data.records); - res.data.records.forEach(item => { - if (item.nylx === "[]") { - item.nylx = null; - } - if (item.typeApplicable === "[]") { - item.typeApplicable = null; - } - if (item.sycpx === "[]") { - item.sycpx = null; - } - if(item.zrbm === "[]"){ - item.zrbm = null - } + if(this.sarAccessEO.sortKey === '1'){ + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { + ...this.standardFormList, + ...this.standardForm, + id: this.pageId, + types: '1', + }, { + _this: this + }, res => { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + }); + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + " " + item.standNumber; + } else { + item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; + } + }); + }, e => { }); - this.standinfoList = res.data.records; - this.standardFormTotal = res.data.total; - this.standinfoList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + " " + item.standNumber; - } else { - item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; - } + }else{ + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { + ...this.standardFormList, + ...this.standardForm, + id: this.pageId + }, { + _this: this + }, res => { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + }); + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + " " + item.standNumber; + } else { + item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; + } + }); + }, e => { }); - }, e => { - }); + } }, selectInfoMore() { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { From c9b6c39cf7c561c6577e40f1ad8ebbbc129e3c49 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 23 Dec 2021 16:52:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20-=20?= =?UTF-8?q?=E7=AC=AC1,4=E6=AD=A5=20-=20=E5=A4=9A=E9=80=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 87e0577b2..5a30d3110 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -520,6 +520,7 @@