diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 30f61579a..caaf87e51 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -211,7 +211,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}}
@@ -327,7 +328,7 @@
align="center"
label="标准号">
- {{ scope.row.standNumber }}
+ {{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}
- {{ scope.row.standName }}
+ {{ scope.row.standName || scope.row.lawsName }}
- {{ scope.row.zccssrqgj.slice(0, 10) }}
+
- {{ scope.row.xcxssrqgj.slice(0, 10) }}
+
{
- this.sarAccessInfoSearchList = res.data.list
+ if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
+ StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+ this.sarAccessInfoSearchList = res.data.list
- //为空转换
- for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
- //适用车型为空
- if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
- this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+ //为空转换
+ for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
+ //适用车型为空
+ if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
+ this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+ }
+ //适用认证为空
+ if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+ this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
+ }
}
- //适用认证为空
- if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
- this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
- }
- }
- this.sarAccessInfoSearchList.forEach(item => {
- if (item.standYear === null) {
- item.standNumber = item.standSortShow + ' ' + item.standNumber
- } else {
- item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
- }
- this.addWord(item)
+ this.sarAccessInfoSearchList.forEach(item => {
+ if (item.standYear === null) {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber
+ } else {
+ item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+ }
+ this.addWord(item)
+ })
+ this.changeText(this.sarAccessInfoSearchList)
+ this.drawerTotal = res.data.count
+ }, e => {
})
- this.changeText(this.sarAccessInfoSearchList)
- 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 => {
+ })
+ }
},
// 查询按钮
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()
}
},
/** 高级查询查询按钮*/
@@ -1608,7 +1693,7 @@ export default {
},
// 数据搜索table判断checked状态
selectable(row) {
- return row.isRelateAccess === '1'
+ return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {