diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 65ab8be06..a089f39e4 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -2327,24 +2327,38 @@ this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, { _this: this }, res => { - let SSRQ = res.data.attrInfoMap.SSRQ.split(',') + + + let SSRQStr = '' - let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') let ZCCSSRQStr = '' - let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') let XCXSSRQStr = '' - for (let i = 0; i < SSRQ.length; i++) { - SSRQStr += SSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.SSRQ != null && res.data.attrInfoMap.SSRQ!= ''){ + let SSRQ = res.data.attrInfoMap.SSRQ.split(',') + + for (let i = 0; i < SSRQ.length; i++) { + SSRQStr += SSRQ[i].substring(0,10)+',' + } + SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) } - for (let i = 0; i < ZCCSSRQ.length; i++) { - ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.ZCCSSRQ != null && res.data.attrInfoMap.ZCCSSRQ!= '') { + let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') + + for (let i = 0; i < ZCCSSRQ.length; i++) { + ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + } + + ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) + } - for (let i = 0; i < XCXSSRQ.length; i++) { - XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + + if (res.data.attrInfoMap.XCXSSRQ != null && res.data.attrInfoMap.XCXSSRQ!= '') { + let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') + for (let i = 0; i < XCXSSRQ.length; i++) { + XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + } + XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) } - SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) - ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) - XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) res.data.attrInfoMap.SSRQ = SSRQStr res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index b9f582724..443e2d0d4 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3147,24 +3147,35 @@ export default { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, { _this: this }, res => { - let SSRQ = res.data.attrInfoMap.SSRQ.split(',') let SSRQStr = '' - let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') let ZCCSSRQStr = '' - let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') let XCXSSRQStr = '' - for (let i = 0; i < SSRQ.length; i++) { - SSRQStr += SSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.SSRQ != null && res.data.attrInfoMap.SSRQ!= ''){ + let SSRQ = res.data.attrInfoMap.SSRQ.split(',') + + for (let i = 0; i < SSRQ.length; i++) { + SSRQStr += SSRQ[i].substring(0,10)+',' + } + SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) } - for (let i = 0; i < ZCCSSRQ.length; i++) { - ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + if (res.data.attrInfoMap.ZCCSSRQ != null && res.data.attrInfoMap.ZCCSSRQ!= '') { + let ZCCSSRQ = res.data.attrInfoMap.ZCCSSRQ.split(',') + + for (let i = 0; i < ZCCSSRQ.length; i++) { + ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+',' + } + + ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) + } - for (let i = 0; i < XCXSSRQ.length; i++) { - XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + + if (res.data.attrInfoMap.XCXSSRQ != null && res.data.attrInfoMap.XCXSSRQ!= '') { + let XCXSSRQ = res.data.attrInfoMap.XCXSSRQ.split(',') + for (let i = 0; i < XCXSSRQ.length; i++) { + XCXSSRQStr += XCXSSRQ[i].substring(0,10)+',' + } + XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) } - SSRQStr = SSRQStr.substring(0,SSRQStr.length-1) - ZCCSSRQStr = ZCCSSRQStr.substring(0,ZCCSSRQStr.length-1) - XCXSSRQStr = XCXSSRQStr.substring(0,XCXSSRQStr.length-1) res.data.attrInfoMap.SSRQ = SSRQStr res.data.attrInfoMap.ZCCSSRQ = ZCCSSRQStr res.data.attrInfoMap.XCXSSRQ = XCXSSRQStr