From 922cca367646024d16d33bff82bc33a299d350e2 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 27 Jul 2021 17:37:13 +0800 Subject: [PATCH 1/2] commit --- src/assets/images/shangqi/img/logo4.png | Bin 0 -> 2177 bytes src/components/navMenu/index.vue | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/assets/images/shangqi/img/logo4.png diff --git a/src/assets/images/shangqi/img/logo4.png b/src/assets/images/shangqi/img/logo4.png new file mode 100644 index 0000000000000000000000000000000000000000..735b23c00c0f6583bdd91d7bdecc89d4d18fd72e GIT binary patch literal 2177 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 DQV$ek literal 0 HcmV?d00001 diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index f9cb687af..5f429c122 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -434,7 +434,7 @@ export default { }, computed: { logo () { - return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png') + return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') }, ...mapGetters(['getDynamicTotal', 'isCollapse']) }, From a54fdcc61a8c5f238f8c3a653fb47b026f0105da Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 27 Jul 2021 17:49:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listOfCountries.vue | 10 - .../pages/addEdit.vue | 165 +++++++--- .../pages/otherAddEit.vue | 294 ++++++++++++++--- .../pages/projectAddEit.vue | 302 +++++++++++++++--- 4 files changed, 620 insertions(+), 151 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 60757cd0d..960328388 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -117,16 +117,6 @@ }} - { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id - }) + return items.id == item.id + }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') - this.$refs.accessTypeSelect.clearSelection() - this.$refs.entryTable.clearSelection() - this.$refs.searchTable.clearSelection() - } else{ - this.sarAccessInfoList.push(item) - this.$refs.accessTypeSelect.clearSelection() - this.$refs.entryTable.clearSelection() - this.$refs.searchTable.clearSelection() - } + this.$message.warning('请勿添加重复数据') + // this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } else{ + this.sarAccessInfoList.push(item) + // this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } }) } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') @@ -1329,12 +1329,16 @@ export default { _this: this, loading: 'loadData' }, res => { - if (res.ok) { - this.$message.success('新增成功') - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) + if (this.sarAccessInfoList.length !== 0) { + if (res.ok) { + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + } else { + this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } }, e => { }) @@ -1363,6 +1367,7 @@ export default { selectLawsStands () { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + this.sarAccessInfoSearch.standType = '' } else { this.sarAccessInfoSearch.standType = 'FOREIGN' } @@ -1374,16 +1379,29 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - 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) + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + 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.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + 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.list.length }, e => { @@ -1403,16 +1421,29 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - 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) + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + 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.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + 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.list.length }, e => { @@ -1426,16 +1457,29 @@ export default { sarAccessInfoSearchSelect (val) { this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList.forEach(item => { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - 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) + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + 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.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + 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.selectedAccInfoSearchList.forEach(item => { // 责任部门转换 @@ -1947,6 +1991,29 @@ export default { } 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, '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.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + 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) + } }) }, e => { }) @@ -2020,8 +2087,8 @@ export default { this.sarAccessEO.remark = accessRow.remark || '' this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessInfoSearch.validFlag = 0 - this.getFileInfo() this.getData() + this.getFileInfo() this.selectLawsStands() }) } else { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 08ec91a6c..2cdf4cc02 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -346,7 +346,7 @@ width="210px" label="卡车VPPS中文名称"> - + @@ -396,6 +402,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 提交 + 取消 +
+