浏览代码

new 手机号

sunyize 2 年之前
父节点
当前提交
ec11faf1e8

+ 8 - 8
src/views/networkAccess/registrationSelect.vue

@@ -2359,14 +2359,14 @@ export default {
       }else {
         this.cardStartTimeAndEndShow=false;
       } }
-      if (data==='all' || data==="judgmentResearch"){
-            if (this.model.judgmentResearch===''|| this.model.judgmentResearch===null){
-                this.judgmentResearchNull=true;
-                info=false;
-            }else {
-                this.judgmentResearchNull=false;
-            }
-      }
+      // if (data==='all' || data==="judgmentResearch"){
+      //       if (this.model.judgmentResearch===''|| this.model.judgmentResearch===null){
+      //           this.judgmentResearchNull=true;
+      //           info=false;
+      //       }else {
+      //           this.judgmentResearchNull=false;
+      //       }
+      // }
       // if (data==='all' || data==="operator"){   if (this.model.operator==='' || this.model.operator===null){
       //   this.operatorNull=true;
       //   info=false;

+ 8 - 8
src/views/networkAccess/registrationUpdate.vue

@@ -2356,14 +2356,14 @@ export default {
       }else {
         this.cardStartTimeAndEndShow=false;
       } }
-      if (data==='all' || data==="judgmentResearch"){
-            if (this.model.judgmentResearch===''|| this.model.judgmentResearch===null){
-                this.judgmentResearchNull=true;
-                info=false;
-            }else {
-                this.judgmentResearchNull=false;
-            }
-      }
+      // if (data==='all' || data==="judgmentResearch"){
+      //       if (this.model.judgmentResearch===''|| this.model.judgmentResearch===null){
+      //           this.judgmentResearchNull=true;
+      //           info=false;
+      //       }else {
+      //           this.judgmentResearchNull=false;
+      //       }
+      // }
       // if (data==='all' || data==="operator"){   if (this.model.operator==='' || this.model.operator===null){
       //   this.operatorNull=true;
       //   info=false;

+ 14 - 5
src/views/networkAccess/userStatistics.vue

@@ -147,8 +147,8 @@
               <a-divider type="vertical"/>
             </span>
 
-              <span v-has="'userStatistics:list:update:admin'" v-show=" currentTab != 'del'">
-              <a @click="showImproveAndUploadAdmin(record)">修改</a>
+              <span v-has="'userStatistics:list:update'" v-show=" currentTab != 'del'">
+              <a @click="showImproveAndUploadAdmin(record)">上传</a>
               <a-divider type="vertical"/>
             </span>
 
@@ -471,6 +471,12 @@ export default {
             }
             return '';
           }*/
+        },{
+          title: '上报状态',
+          align: "center",
+          sorter: true,
+          dataIndex: 'numberResults',
+          scopedSlots: {customRender: 'numberResults'}
         },
         {
           title: '操作',
@@ -698,14 +704,17 @@ export default {
     /**修改*/
     showImproveAndUpload(record) {
       if (!record.createTime.match(RegExp(this.getDate()))){
-        this.$message.warning('此输入非天创建 禁止修改', 3);
-        return
+        return this.$message.warning('此输入非天创建 禁止修改', 3);
+
       }
 
       this.$router.push({path: '/networkAccess/registrationUpdate', query: {id: record.id,cardNo: record.cardNo}});
     },
     showImproveAndUploadAdmin(record) {
-      this.$router.push({path: '/networkAccess/registrationHide', query: {id: record.id}});
+       if (record.status===1){
+         this.$message.warning('此输入非天创建 禁止修改', 3);
+         return
+       }
     },
 
     /**详情*/