FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-28 13:23:07 +08:00
parent d4cb099d23 3cfe9b74e0
commit 4b957dfe47
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+22 -1
View File
@@ -207,7 +207,7 @@
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
>
{{ child.value ? child.value.substring(0, 10) : '-' }}
{{ child.value ? child.value : '-' }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
@@ -2327,6 +2327,27 @@
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)+','
}
for (let i = 0; i < ZCCSSRQ.length; i++) {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
}
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
}
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
this.sarStandardsInfoEO = res.data || {}
this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
console.log("hllo",this.sarStandardsInfoEO);
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+21
View File
@@ -3147,6 +3147,27 @@ 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)+','
}
for (let i = 0; i < ZCCSSRQ.length; i++) {
ZCCSSRQStr += ZCCSSRQ[i].substring(0,10)+','
}
for (let i = 0; i < XCXSSRQ.length; i++) {
XCXSSRQStr += XCXSSRQ[i].substring(0,10)+','
}
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
const item = res.data || {}
this.collectId = item.collectId
this.addOrUPdateFlag = 2