From 0d817f1ddb72935e78ec048b8a50473f88cc7596 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 12 Aug 2021 09:39:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=A0=87=E5=87=86=E5=AE=9E?= =?UTF-8?q?=E6=96=BD=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 16 ++++++++++++---- .../pages/otherAddEit.vue | 17 +++++++++++++---- .../pages/projectAddEit.vue | 17 +++++++++++++---- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index b1bbd0aed..1a786bd70 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -304,11 +304,14 @@ label="能源类型"> + + {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }} + @@ -582,7 +585,7 @@ export default { standEnName: '', typeApplicable: '', nylx: '', - putTime: '', + ssrq: '', zccssrqgj: '', xcxssrqgj: '', zrbm: '', @@ -1335,6 +1338,7 @@ export default { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') this.$set(item, 'sycpx', '') + this.$set(item, 'ssrq', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') this.$set(item, 'zrbm', '') @@ -1346,6 +1350,7 @@ export default { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) @@ -1382,6 +1387,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1393,6 +1399,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1427,6 +1434,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1438,6 +1446,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1526,7 +1535,6 @@ export default { }, // 导出确定功能 exportTestItem () { - let exportNames = this.exportName let exportList = [] if (this.sarAccessInfoListArry.length > 0) { exportList = this.sarAccessInfoListArry diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 5a1df3685..0dfdedf9f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -288,11 +288,14 @@ label="能源类型"> + + {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }} + - + @@ -566,7 +569,7 @@ export default { standEnName: '', typeApplicable: '', nylx: '', - putTime: '', + ssrq: '', zccssrqgj: '', xcxssrqgj: '', zrbm: '', @@ -1302,6 +1305,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1313,6 +1317,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1349,6 +1354,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1360,6 +1366,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1395,6 +1402,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1406,6 +1414,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index f75c5adfc..2e73c4f2c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -288,11 +288,14 @@ label="能源类型"> + + {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }} + - + @@ -580,7 +583,7 @@ export default { standEnName: '', typeApplicable: '', nylx: '', - putTime: '', + ssrq: '', zccssrqgj: '', xcxssrqgj: '', zrbm: '', @@ -1302,6 +1305,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1313,6 +1317,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1349,6 +1354,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1360,6 +1366,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) @@ -1394,6 +1401,7 @@ export default { if (item.attrInfoMap === null) { this.$set(item, 'zccssrqgj', '') this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') this.$set(item, 'sycpx', '') this.$set(item, 'typeApplicable', '') this.$set(item, 'nylx', '') @@ -1405,6 +1413,7 @@ export default { }else { this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'nylx', item.attrInfoMap.NYLX) From 98ee797a428c7d42160b77217082f8c299534a10 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 12 Aug 2021 13:49:21 +0800 Subject: [PATCH 2/4] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 2 +- src/pages/regulatoryRepository/standardForComments/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 011d29d6d..c48455049 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -208,7 +208,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail} from 'api/process' + import {inboundLiaisonDetail,saveTaskForPub} from 'api/process' export default { name: "bzdyStep5", diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index b70d81004..21ebfe376 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -55,7 +55,7 @@ :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> {{ scope.row.category }} From 5cbd9fb306de87690a3c2e50536c30009f1861f5 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 12 Aug 2021 14:16:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 6 +++--- .../pages/details.vue | 19 +++++++------------ .../pages/otherAddEit.vue | 6 +++--- .../pages/projectAddEit.vue | 6 +++--- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 1a786bd70..0b3225713 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1248,10 +1248,10 @@ export default { let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) - if (this.sarAccessInfoList[i].putTime === null) { - rowlist1.push(this.sarAccessInfoList[i].putTime = '-') + if (this.sarAccessInfoList[i].ssrq === null) { + rowlist1.push(this.sarAccessInfoList[i].ssrq = '-') }else { - rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) + rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) } if (this.sarAccessInfoList[i].xcxssrqgj === null) { rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index bb19c111f..6ee8ff256 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -150,11 +150,17 @@ label="能源类型"> + + + {{ scope.row.ssrq }} + + {{ scope.row.ssrq.slice(0, 10) }} + { this.$set(this.textStatusMap, item.value, item.label) - this.$set(this.typeApplicableMap, item.value, item.label) - this.$set(this.nylxMap, item.value, item.label) - this.$set(this.zrbmMap, item.value, item.label) - this.$set(this.sycpxMap, item.value, item.label) - this.$set(this.countryAreaMap, item.value, item.label) }) } }, @@ -797,12 +798,6 @@ export default { this.textStatusOptions = res.data.WBZTCLASS this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.setMap(this.textStatusOptions) - this.setMap(this.zrbmOptions) - this.setMap(this.categoryOptions) - this.setMap(this.sycpxOptions) - this.setMap(this.energyKindOptions) - this.setMap(this.drawerCountryOptions) - this.setMap(this.applyArcticOptions) this.getGzzOption(); }, e => { }); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 0dfdedf9f..ce62849a4 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1217,10 +1217,10 @@ export default { let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) - if (this.sarAccessInfoList[i].putTime === null) { - rowlist1.push(this.sarAccessInfoList[i].putTime = '-') + if (this.sarAccessInfoList[i].ssrq === null) { + rowlist1.push(this.sarAccessInfoList[i].ssrq = '-') }else { - rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) + rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) } if (this.sarAccessInfoList[i].xcxssrqgj === null) { rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 2e73c4f2c..31fa260f8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1216,10 +1216,10 @@ export default { let rowlist3 = [] for (let i = 0; i < this.sarAccessInfoList.length; i++) { rowlist.push(this.sarAccessInfoList[i].id) - if (this.sarAccessInfoList[i].putTime === null) { - rowlist1.push(this.sarAccessInfoList[i].putTime = '-') + if (this.sarAccessInfoList[i].ssrq === null) { + rowlist1.push(this.sarAccessInfoList[i].ssrq = '-') }else { - rowlist1.push(this.sarAccessInfoList[i].putTime.toString()) + rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) } if (this.sarAccessInfoList[i].xcxssrqgj === null) { rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') From 030341d5c36d708fbab2d4be81298f7251ff9a9c Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 12 Aug 2021 14:35:24 +0800 Subject: [PATCH 4/4] feat: There is no way the #bug issueTime 11 --- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index b179d70d1..f960e38f1 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -233,7 +233,7 @@ - 发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} + 发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }}