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="标准号">
- {{ scope.row.standNumber }}
+ {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}
- {{ scope.row.standName }}
+ {{ scope.row.standName || scope.row.lawsName}}
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}
@@ -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()
}
},