new 手机号

src/views/networkAccess/userStatistics.vue

@@ -35,10 +35,16 @@
                 <j-input placeholder="请输入证件编号" v-model="queryParam.cardNo"></j-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="创建人营业厅地址">
-                <j-input placeholder="请输入营业厅地址" v-model="queryParam.businessAddress"></j-input>
-              </a-form-item>
+            <a-col :span="6">
+              <a-form-model-item label="  判研结果 " :labelCol="{ span:5}"   :wrapperCol="{ span: 8 }">
+                <a-select placeholder="请选择判研结果"  v-model="queryParam.numberResults" >
+                  <a-select-option v-for="item in optionsWithDisabled"   :value="item.value">
+                    {{ item.text }}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+
+
             </a-col>
 
 
@@ -59,10 +65,12 @@
           <template v-if="toggleSearchStatus">
           <a-row  :gutter="24">
 
+
+
             <a-col :span="6">
-              <a-form-model-item label="  判研结果 " :labelCol="{ span:5}"   :wrapperCol="{ span: 8 }">
-                <a-select placeholder="请选择判研结果"  v-model="queryParam.numberResults" >
-                  <a-select-option v-for="item in optionsWithDisabled"   :value="item.value">
+              <a-form-model-item label="  上报状态 " :labelCol="{ span:5}"   :wrapperCol="{ span: 8 }">
+                <a-select placeholder="请选择上报状态"  v-model="queryParam.status" >
+                  <a-select-option v-for="item in statusList"   :value="item.value">
                     {{ item.text }}
                   </a-select-option>
                 </a-select>
@@ -85,6 +93,12 @@
           </a-row>
 
           <a-row>
+
+            <a-col :span="6" >
+              <a-form-item label="创建人营业厅"  >
+                <j-input placeholder="请输入营业厅" v-model="queryParam.businessAddress" style="width: 200px;"></j-input>
+              </a-form-item>
+            </a-col>
             <a-col :span="11" >
               <a-form-item label="创建时间"  prop="industry"      :labelCol="{ span:9}"   :wrapperCol="{ span: 10 }">
                 <j-date :show-time="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间" class="query-group-cust"
@@ -94,7 +108,6 @@
                         id="cardEndTime"  v-model="queryParam.createDateEnd" ></j-date>
               </a-form-item>
             </a-col>
-
             </a-row>
           </template>
         </a-form>
@@ -106,14 +119,14 @@
         <!-- 高级查询区域 -->
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
-            <a-menu-item key="1" @click="batchDel" v-has="'access:check:list:delete'">
-              <a-icon type="delete"/>
-              删除
+            <a-menu-item key="1" @click="showImproveAndUploadList" v-has="'access:check:list:delete'">
+              <a-icon type="up"/>
+              上传
             </a-menu-item>
           </a-menu>
-<!--          <a-button style="margin-left: 8px"> 批量操作-->
-<!--            <a-icon type="down"/>-->
-<!--          </a-button>-->
+          <a-button style="margin-left: 8px"> 批量操作
+            <a-icon type="down"/>
+          </a-button>
         </a-dropdown>
       </div>
 
@@ -148,7 +161,7 @@
             </span>
 
               <span v-has="'userStatistics:list:update'" v-show=" currentTab != 'del'">
-              <a @click="showImproveAndUploadAdmin(record)">上传</a>
+              <a @click="showImproveAndUploadAdmin(record)">上报</a>
               <a-divider type="vertical"/>
             </span>
 
@@ -184,6 +197,9 @@
             </div>
 
           </template>
+          <template v-slot:status="text, record">
+            <a-badge :status="text | statusEscalation" :text="text | escalationFilter"/>
+          </template>
           <template v-slot:createBy="text, record">
             <a @click="showByCreateBy(record)">{{text}}</a>
           </template>
@@ -249,6 +265,15 @@ export default {
           text: '上报紫名单',
           value: '4',
         }],
+      statusList:
+        [{
+          text: '上报成功',
+          value: '1',
+        }, {
+          text: '未上报',
+          value: '0',
+
+        }],
       company:'',
       sysCompany: [],
       ipagination:{
@@ -475,8 +500,8 @@ export default {
           title: '上报状态',
           align: "center",
           sorter: true,
-          dataIndex: 'numberResults',
-          scopedSlots: {customRender: 'numberResults'}
+          dataIndex: 'status',
+          scopedSlots: {customRender: 'status'}
         },
         {
           title: '操作',
@@ -509,6 +534,20 @@ export default {
         '4,3':'上报蓝/紫名单',
       }
       return statusMap[status]
+    },
+    statusEscalation(type) {
+      const statusTypeMap = {
+        '1': 'success',
+        '0': 'warning',
+      }
+      return statusTypeMap[type]
+    },
+    escalationFilter(status) {
+      const statusMap = {
+        '0': '未上报',
+        '1': '上报成功',
+      }
+      return statusMap[status]
     }
   },
   created() {
@@ -560,16 +599,7 @@ export default {
 
     showByCreateBy(record){
 
-      let queryParam = {
-        "createBy":record.createBy,
-        "cardNo":this.queryParam.cardNo,
-        "cardName":this.queryParam.cardName,
-        "newPhone":this.queryParam.newPhone,
-        "createDateStart":this.queryParam.createDateStart,
-        "createDateEnd":this.queryParam.createDateEnd,
-        "sysBusinessHall":this.queryParam.sysBusinessHall
-      }
-      this.loadData(null,queryParam);
+      this.selectRefresh();
       this.selectedRowKeys = [];
       this.selectionRows = [];
 
@@ -589,16 +619,7 @@ export default {
 
     },
     showByPhone(record){
-      let queryParam = {
-        "phone":record.phone,
-        "cardNo":this.queryParam.cardNo,
-        "cardName":this.queryParam.cardName,
-        "newPhone":this.queryParam.newPhone,
-        "createDateStart":this.queryParam.createDateStart,
-        "createDateEnd":this.queryParam.createDateEnd,
-        "sysBusinessHall":this.queryParam.sysBusinessHall
-      }
-      this.loadData(null,queryParam);
+      this.selectRefresh();
       this.selectedRowKeys = [];
       this.selectionRows = [];
 
@@ -621,15 +642,7 @@ export default {
       this.$router.push({path: '/networkAccess/registrationSelect', query: {id: record.id,cardNo: record.cardNo,isDisabled:true}});
     },
     showByCardName(record){
-      let queryParam = {
-        "cardNo":this.queryParam.cardNo,
-        "cardName":record.cardName,
-        "newPhone":this.queryParam.newPhone,
-        "createDateStart":this.queryParam.createDateStart,
-        "createDateEnd":this.queryParam.createDateEnd,
-        "sysBusinessHall":this.queryParam.sysBusinessHall
-      }
-      this.loadData(null,queryParam);
+      this.selectRefresh();
       this.selectedRowKeys = [];
       this.selectionRows = [];
 
@@ -704,19 +717,60 @@ export default {
     /**修改*/
     showImproveAndUpload(record) {
       if (!record.createTime.match(RegExp(this.getDate()))){
-        return this.$message.warning('此输入非天创建 禁止修改', 3);
+        return this.$message.warning('非天创建 禁止修改', 3);
 
       }
 
       this.$router.push({path: '/networkAccess/registrationUpdate', query: {id: record.id,cardNo: record.cardNo}});
     },
     showImproveAndUploadAdmin(record) {
-       if (record.status===1){
-         this.$message.warning('此输入非天创建 禁止修改', 3);
-         return
+       if (record.status==='1'){
+         return this.$message.warning('上报状态为已上报 请勿重复操作', 3);
        }
+      let data = {
+        ids: [record.id],
+      }
+      postAction("/businessReminderCard/escalation",{ids: data.ids} ).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message, 3);
+          this.loadData(1);
+        } else {
+          this.$message.error(res.message);
+        }
+      })
+    },
+    selectRefresh(){
+      let queryParam = {
+        "cardNo":this.queryParam.cardNo,
+        "cardName":record.cardName,
+        "newPhone":this.queryParam.newPhone,
+        "createDateStart":this.queryParam.createDateStart,
+        "createDateEnd":this.queryParam.createDateEnd,
+        "sysBusinessHall":this.queryParam.sysBusinessHall,
+        "status":this.queryParam.status
+      }
+      this.loadData(null,queryParam);
     },
+    showImproveAndUploadList() {
+      for (let i = 0; i < this.selectionRows.length; i++) {
+        if(this.selectionRows[i].status==='1'){
+          return this.$message.warning('选中数据中存在已上报的数据...', 3);
+        }
+      }
 
+      let data = {
+        ids: this.selectedRowKeys,
+      }
+      postAction("/businessReminderCard/escalation",data ).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message, 3);
+          this.loadData(1);
+
+        } else {
+          this.$message.error(res.message);
+        }
+      })
+    },
     /**详情*/
     showCheckDetail(record) {
       let id = record.id;