From 25ca9231780113d9e0a52b35423c828605e41ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 29 Nov 2021 09:29:03 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B0=8F=E6=89=8B?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=20=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?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 --- src/pages/home2/components/release/index.vue | 1 + .../components/solicitopinions/index.vue | 1 + .../pages/standInvolveProjectDetail.vue | 44 ++++--------------- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue index 62081407a..0fe974c71 100644 --- a/src/pages/home2/components/release/index.vue +++ b/src/pages/home2/components/release/index.vue @@ -14,6 +14,7 @@ :data="standardReleaseList" tooltip-effect="dark" border + style="cursor:pointer;" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> style="width: 100%"> style="width: 100%"> - - - - - - - - From c6db8ef32ded8ca4c4dc39695d17351463296d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 29 Nov 2021 09:32:20 +0800 Subject: [PATCH 02/24] commit --- .../pages/standInvolveProjectDetail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 8f3750041..92f14e75e 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -157,13 +157,13 @@ Date: Mon, 29 Nov 2021 09:58:05 +0800 Subject: [PATCH 03/24] commit --- src/components/CustomFormComponents/DatePickerGroup.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index 0af7a27ef..77d0e0187 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -146,8 +146,6 @@ export default { value (val) { this.tagList = val !== '' && val !== null ? val.split(',') : [] this.tagList=this.tagList.map((item)=>item.substring(0,10)) - console.log("this.tagList",this.tagList); - }, tagList: { handler (val) { From e7f36da973bf8e3dcd111e96a5516b332d02165c Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 29 Nov 2021 10:03:22 +0800 Subject: [PATCH 04/24] comment --- src/components/CustomFormComponents/DatePickerGroup.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index 77d0e0187..78482a555 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -145,6 +145,7 @@ export default { watch: { value (val) { this.tagList = val !== '' && val !== null ? val.split(',') : [] + // 把日期的时分秒去掉 this.tagList=this.tagList.map((item)=>item.substring(0,10)) }, tagList: { From 3c52bb16aa8b5d7d241b1d8a9981dd2bff53a369 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 29 Nov 2021 14:46:43 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E8=83=BD=E6=9F=A5=E4=BC=81=E6=A0=87=E5=92=8C?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=98?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 172 +++++++++++++----- 1 file changed, 129 insertions(+), 43 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 33fc75d13..708dc7532 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -188,7 +188,7 @@ width="180px" label="标准号"> @@ -684,8 +685,8 @@ export default { dataSourceOptions: [ {value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'}, - //{value: 'FOREIGN_LAWS', label: '国内外政策'}, - // {value: 'BUSINESS', label: '企业标准 '}, + {value: 'FOREIGN_LAWS', label: '国内外政策'}, + {value: 'BUSINESS', label: '企业标准 '}, // {value: 'TEMP', label: '标准法规清单 '} ], // 新增、编辑 数据搜索字段 @@ -1163,6 +1164,66 @@ export default { } ] // 国内外政策可查字段 + }else if (val === 'FOREIGN_LAWS'){ + this.twoOptions=[ + { + label: '适用车辆类型', + value: 'SYCLLX', + type: 'SEL_OPTION', + disabled: false + }, { + label: '政策编号', + value: 'LAWS_NUMBER', + type: 'INPUT', + disabled: false + }, { + label: '中文名称', + value: 'LAWS_NAME', + type: 'INPUT', + disabled: false + }, { + label: '英文名称', + value: 'LAWS_EN_NAME', + type: 'INPUT', + disabled: false + }, { + label: '个性化标签', + value: 'GXHBQXX', + type: 'SEL_OPTION', + disabled: false + }, { + label: '新车型实施日期(文本)', + value: 'XCXSSRQ', + type: 'DATE_PIC_OPTS', + disabled: false + }, { + label: '在产车实施日期(文本)', + value: 'ZCCSSRQ', + type: 'DATE_PIC_OPTS', + disabled: false + }, { + label: '维护工程师', + value: 'ZCGCS', + type: 'SEL_OPTION', + selVal: "USERLIST", + disabled: false + } + ] + // 标准法规清单可查字段 + }else { + this.twoOptions=[ + { + label: '清单名称', + value: 'ACCESS_CONTENT', + type: 'INPUT', + disabled: false + }, { + label: '国家地区', + value: 'COUNTRY', + type: 'SEL_OPTION', + disabled: false + } + ] } }, /** @@ -1534,52 +1595,77 @@ export default { // }) // }, pageInfo() { - StandardsInfoPage(this.sarAccessInfoSearch).then(res => { - this.sarAccessInfoSearchList = res.data.list - this.sarAccessInfoSearchList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + ' ' + item.standNumber - } else { - item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear - } - if (item.attrInfoMap === null) { - 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', '') - this.$set(item, 'cycvppsbm', '') - this.$set(item, 'cycvppscn', '') - this.$set(item, 'kccvppsbm', '') - this.$set(item, 'kccvppscn', '') - } else { - 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) - this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) - this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) - this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) - this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) - } + console.log('1598',this.sarAccessInfoSearch) + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ + StandardsInfoPage(this.sarAccessInfoSearch).then(res => { + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + if (item.attrInfoMap === null) { + 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', '') + this.$set(item, 'cycvppsbm', '') + this.$set(item, 'cycvppscn', '') + this.$set(item, 'kccvppsbm', '') + this.$set(item, 'kccvppscn', '') + } else { + 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) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + } + }) + this.drawerTotal = res.data.count + }, e => { }) - this.drawerTotal = res.data.count - }, e => { - }) + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){ + this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, { + _this: this, + }, res => { + console.log('1640',res) + this.sarAccessInfoSearchList = res.data.list + }, e => { + }) + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, { + _this: this, + }, res => { + console.log('1648',res) + this.sarAccessInfoSearchList = res.data.list + }, e => { + }) + } }, // 查询数据搜索 table 数据 selectLawsStands() { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.pageInfo() - } else { + } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { this.sarAccessInfoSearch.standType = 'FOREIGN' this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') { + this.sarAccessInfoSearch.standType = 'LAWS' + this.pageInfo() + }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') { + this.sarAccessInfoSearch.standType = 'BUSINESS' + this.pageInfo() } }, From bb56cdfe88e2d864e3ee98b71578742e80c2ce69 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 29 Nov 2021 14:47:53 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E9=80=89=E4=BA=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E8=B7=B3=E5=87=BA=E4=BA=86=EF=BC=88=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=85=89=E9=80=9F=E9=80=89=E4=BA=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/roleTree/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index e88464d96..528ceb287 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -1,7 +1,6 @@