From 202755113d52c26930ce9bcb8a1ba5d7f8919b28 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 17:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=B8=85=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=92=8C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue           | 4 ++--
 .../accessStandardsAndRegulations/pages/otherAddEit.vue       | 4 ++--
 .../accessStandardsAndRegulations/pages/projectAddEit.vue     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8d4c98fe5..8297e2464 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -2265,9 +2265,9 @@ export default {
       }, res => {
         this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
-          if (item.standYear === null) {
+          if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
+          } else if (item.standYear !== null && item.standType !== null){
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
           if (item.attrInfoMap === null) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0356caf9e..70ec69b73 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -2162,9 +2162,9 @@ export default {
       }, res => {
         this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
-          if (item.standYear === null) {
+          if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
+          } else if (item.standYear !== null && item.standType !== null){
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
           if (item.attrInfoMap === null) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 8d325ec78..360907b0e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -2149,9 +2149,9 @@ export default {
         }
 
         this.sarAccessInfoList.forEach(item => {
-          if (item.standYear === null) {
+          if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
+          } else if (item.standYear !== null && item.standType !== null){
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })