Merge remote-tracking branch 'origin/master'

src/views/networkAccess/registrationSelect.vue

@@ -3650,20 +3650,22 @@ export default {
         if (key === 'sysBusinessHall') {
           let dataListElement = dataLists[0]['sysBusinessHall'];
           if (dataListElement !== null && dataListElement !== undefined && dataListElement !== '') {
-            let splitElement = dataListElement.split("北区分公司")[2];
-            splitElement = that.sysBusinessHallRegin(splitElement);
-            let wordRegion = dataLists[0]['wordRegion'].split("/")[2];
-            let currentRegion = dataLists[0]['currentRegion'].split("/")[2];
-            if (splitElement !== wordRegion) {
-              map.name = '【入网提示卡】营业厅地址与工作地址不在同一区域';
-              map.text = '存在风险';
-              that.dataRisk.push(map)
-            }
-            if (splitElement !== currentRegion) {
-              that.dataRisk.push({
-                name: '【入网提示卡】营业厅地址与现住地址不在同一区域',
-                text: '存在风险'
-              })
+            if (dataLists[0]['wordRegion'] &&  dataLists[0]['currentRegion']){
+              let splitElement = dataListElement.split("北区分公司")[2];
+              splitElement = that.sysBusinessHallRegin(splitElement);
+              let wordRegion = dataLists[0]['wordRegion'].split("/")[2];
+              let currentRegion = dataLists[0]['currentRegion'].split("/")[2];
+              if (splitElement !== wordRegion) {
+                map.name = '【入网提示卡】营业厅地址与工作地址不在同一区域';
+                map.text = '存在风险';
+                that.dataRisk.push(map)
+              }
+              if (splitElement !== currentRegion) {
+                that.dataRisk.push({
+                  name: '【入网提示卡】营业厅地址与现住地址不在同一区域',
+                  text: '存在风险'
+                })
+              }
             }
           }
         }

src/views/networkAccess/registrationUpdate.vue

@@ -3956,20 +3956,22 @@ export default {
         if (key === 'sysBusinessHall') {
           let dataListElement = dataLists[0]['sysBusinessHall'];
           if (dataListElement !== null && dataListElement !== undefined && dataListElement !== '') {
-            let splitElement = dataListElement.split("北区分公司")[2];
-            splitElement = that.sysBusinessHallRegin(splitElement);
-            let wordRegion = dataLists[0]['wordRegion'].split("/")[2];
-            let currentRegion = dataLists[0]['currentRegion'].split("/")[2];
-            if (splitElement !== wordRegion) {
-              map.name = '【入网提示卡】营业厅地址与工作地址不在同一区域';
-              map.text = '存在风险';
-              that.dataRisk.push(map)
-            }
-            if (splitElement !== currentRegion) {
-              that.dataRisk.push({
-                name:'【入网提示卡】营业厅地址与现住地址不在同一区域',
-                text:'存在风险'
-              })
+            if (dataLists[0]['wordRegion'] && dataLists[0]['currentRegion']){
+              let splitElement = dataListElement.split("北区分公司")[2];
+              splitElement = that.sysBusinessHallRegin(splitElement);
+              let wordRegion = dataLists[0]['wordRegion'].split("/")[2];
+              let currentRegion = dataLists[0]['currentRegion'].split("/")[2];
+              if (splitElement !== wordRegion) {
+                map.name = '【入网提示卡】营业厅地址与工作地址不在同一区域';
+                map.text = '存在风险';
+                that.dataRisk.push(map)
+              }
+              if (splitElement !== currentRegion) {
+                that.dataRisk.push({
+                  name:'【入网提示卡】营业厅地址与现住地址不在同一区域',
+                  text:'存在风险'
+                })
+              }
             }
 
           }