diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 02abd1b61..9e06b7c04 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -166,7 +166,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.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}}
@@ -269,7 +270,7 @@
fixed="left"
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
- 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, 'ssrq', '')
- 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.ZCCSSRQ)
- this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
- this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
- 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 (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, 'ssrq', '')
+ 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.ZCCSSRQ)
+ this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+ this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
+ 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.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()
}
},
selectPage() {
@@ -1532,7 +1617,7 @@ export default {
},
// 数据搜索table判断checked状态
selectable (row) {
- return row.isRelateAccess === '1'
+ return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {