diff --git a/src/assets/images/shangqi/img/logo4.png b/src/assets/images/shangqi/img/logo4.png
new file mode 100644
index 000000000..735b23c00
Binary files /dev/null and b/src/assets/images/shangqi/img/logo4.png differ
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'])
},
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+