0807

src/views/networkAccess/PopupSubTable.vue

@@ -380,7 +380,7 @@ export default {
 
       //关闭当前页
       this.closeCurrent();
-      this.$router.replace({ path: '/networkAccess/registration', query:{cardNo:record.cardNo}});
+      this.$router.replace({ path: '/networkAccess/registration', query:{cardNo:record.cardNo,id:record.id}});
     },
 
 

src/views/networkAccess/registration.vue

@@ -1471,7 +1471,7 @@ export default {
       })
     },
     keyupInfoSelect() {
-      if (this.model.cardNo === '') {
+      if (this.model.cardNo === '' ||this.model.cardNo===undefined ) {
         return;
       }
       this.closeCurrent();
@@ -1535,16 +1535,16 @@ export default {
                   }
                 }
                 this.isSizeNumberResults = result[i]["isSizeNumberResults"];
-                if (this.model.wordAddress!=='' && this.model.wordAddress!==null){
-                  this.searchKeyWordsysBusinessHall(this.model.wordAddress,'wordAddress');
-                }
-
-                if (this.hallName!=='' && this.hallName!==null){
-                  this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
-                }
-                if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
-                  this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
-                }
+                // if (this.model.wordAddress!=='' && this.model.wordAddress!==null){
+                //   this.searchKeyWordsysBusinessHall(this.model.wordAddress,'wordAddress');
+                // }
+                //
+                // if (this.hallName!=='' && this.hallName!==null){
+                //   this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
+                // }
+                // if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
+                //   this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
+                // }
                 if (info===''){
                   this.model.id=null;
                 }

src/views/networkAccess/userStatistics.vue

@@ -395,6 +395,12 @@ export default {
         '1': 'success',
         '2': 'processing',
         '3': 'warning',
+        '1,2':'processing',
+        '2,1': 'processing ',
+        '1,3,2':'warning',
+        '1,2,3': 'warning',
+        '3,2,1': 'warning',
+        '3,1,2': 'warning',
       }
       return statusTypeMap[type]
     },
@@ -403,6 +409,12 @@ export default {
         '1': '非高危',
         '2': '已报蓝紫名单',
         '3': '已报关停',
+        '1,2':'非高危/已报蓝紫名单',
+        '2,1': '非高危/已报蓝紫名单 ',
+        '1,3,2':'非高危/已报关停/已报蓝紫名单',
+        '1,2,3': '非高危/已报关停/已报蓝紫名单',
+        '3,2,1': '非高危/已报关停/已报蓝紫名单',
+        '3,1,2': '非高危/已报关停/已报蓝紫名单',
       }
       return statusMap[status]
     }