diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f6890fb0c..423e5b24c 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -43,7 +43,7 @@
-

+

{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear @@ -51,30 +51,30 @@ {{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}

-

{{ +

{{ sarStandardsInfoEO.standName || '-' }}

-

{{ +

{{ sarStandardsInfoEO.standEnName || '-' }}

-

{{ +

{{ standMap[sarStandardsInfoEO.standNature] || '-' }}

-

+

{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}

-

{{ +

{{ sarStandardsInfoEO.issueTime || '-' }}

-

+

{{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}

-

{{ +

{{ sarStandardsInfoEO.standSystem || '-' }}

@@ -87,11 +87,10 @@ v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'" > - +
@@ -137,9 +136,8 @@
+ :class="item.label !== '文本信息' ? 'modular-item half' : 'modular-item'" + >
@@ -324,7 +322,7 @@ >
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 286380794..5a62053a6 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1149,6 +1149,27 @@ export default { addSarAccess() { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { + + //为空转换 + for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { + //适用车型为空 + if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ + this.selectedAccInfoSearchList[i].typeApplicable = null + } + //能源类型为空 + if (this.selectedAccInfoSearchList[i].nylx === '[]'){ + this.selectedAccInfoSearchList[i].nylx = null + } + //责任部门为空 + if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ + this.selectedAccInfoSearchList[i].zrbm = null + } + //试用产品线为空 + if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ + this.selectedAccInfoSearchList[i].sycpx = null + } + } + // 追加字段 this.selectedAccInfoSearchList.map(item => { let addList; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 5013827b8..b6b42a4eb 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1097,6 +1097,27 @@ export default { addSarAccess () { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { + + //为空转换 + for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { + //适用车型为空 + if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ + this.selectedAccInfoSearchList[i].typeApplicable = null + } + //能源类型为空 + if (this.selectedAccInfoSearchList[i].nylx === '[]'){ + this.selectedAccInfoSearchList[i].nylx = null + } + //责任部门为空 + if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ + this.selectedAccInfoSearchList[i].zrbm = null + } + //试用产品线为空 + if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ + this.selectedAccInfoSearchList[i].sycpx = null + } + } + // 追加字段 this.selectedAccInfoSearchList.map(item => { let addList; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 8a5e45bd9..192ad0938 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1097,6 +1097,27 @@ export default { addSarAccess() { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { + + //为空转换 + for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { + //适用车型为空 + if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ + this.selectedAccInfoSearchList[i].typeApplicable = null + } + //能源类型为空 + if (this.selectedAccInfoSearchList[i].nylx === '[]'){ + this.selectedAccInfoSearchList[i].nylx = null + } + //责任部门为空 + if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ + this.selectedAccInfoSearchList[i].zrbm = null + } + //试用产品线为空 + if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ + this.selectedAccInfoSearchList[i].sycpx = null + } + } + // 追加字段 this.selectedAccInfoSearchList.map(item => { let addList; @@ -1515,6 +1536,18 @@ export default { pageInfo() { 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 + } + //适用认证为空 + 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 @@ -1995,6 +2028,27 @@ export default { _this: this }, res => { this.sarAccessInfoList = res.data.records + + //为空转换 + for (let i = 0; i < this.sarAccessInfoList.length; i++) { + //适用车型为空 + if (this.sarAccessInfoList[i].typeApplicable === '[]'){ + this.sarAccessInfoList[i].typeApplicable = null + } + //能源类型为空 + if (this.sarAccessInfoList[i].nylx === '[]'){ + this.sarAccessInfoList[i].nylx = null + } + //责任部门为空 + if (this.sarAccessInfoList[i].zrbm === '[]'){ + this.sarAccessInfoList[i].zrbm = null + } + //试用产品线为空 + if (this.sarAccessInfoList[i].sycpx === '[]'){ + this.sarAccessInfoList[i].sycpx = null + } + } + this.sarAccessInfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 76232ef6f..68a96826e 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -166,7 +166,10 @@ label="标准号" >