0807

src/views/networkAccess/registration.vue

@@ -22,8 +22,19 @@
           :rules="rules"
         >
           <div>
-<!--            <registation-Modal ref="registationModel" @ok="modalFormOk2"></registation-Modal>-->
-
+<!--            <registation-Modal ref="registationModel" @ok="modalFormOk2"></registation-Modal> :row-class-name="tableRowClassName"-->
+            <div>
+<!--              <a-button type="primary" @click="showModal">研判结果异常展示</a-button>-->
+              <a-modal v-model:open="open" title="研判结果异常展示" @ok="handleOk" @cancel="onCance" :width="1000">
+                <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 1500, y: 300 }" >
+                  <template #bodyCell="{ column }">
+                    <template v-if="column.key === 'operation'">
+
+                    </template>
+                  </template>
+                </a-table>
+              </a-modal>
+            </div>
             <a-button type="link" @click="keyupInfoSelect()">身份证件号码检索</a-button>
             <a-row>
               <a-col :span="6">
@@ -698,12 +709,28 @@ export default {
   name: "registration",
   inject: ['closeCurrent'],
   mixins: [JeecgListMixin],
-  components: {
-    registationModel
-  },
   data() {
 
     return {
+      columns:[{ title: '身份证件号码', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
+        { title: '身份证姓名', width: 150, dataIndex: 'cardName', key: 'cardName'  },
+        { title: '证件是否在期', dataIndex: 'cardStartTimeAndEnd', key: '1', width: 150 },
+        { title: '创建人', dataIndex: 'createBy', key: 'createBy', width: 150 },
+        { title: '创建日期', dataIndex: 'createTime', key: 'createTime', width: 150 },
+        { title: '工作地址', dataIndex: 'wordAddress', key: 'wordAddress', width: 150 },
+        { title: '营业厅地址', dataIndex: 'sysBusinessHall', key: 'sysBusinessHall', width: 150 },
+        { title: '现住地址', dataIndex: 'currentAddress', key: 'currentAddress', width: 150 },
+        { title: '智能地址研判', dataIndex: 'judgmentResearch', key: 'judgmentResearch' , width: 150 },
+        { title: '人工地址判研', dataIndex: 'judgmentResearchAddress', key: 'judgmentResearchAddress', width: 150  },
+        { title: '拨测结果', dataIndex: 'calltestResults', key: 'calltestResults', width: 150 },
+        { title: '拨测联系电话', dataIndex: 'phone', key: 'phone', width: 150 },
+        { title: '一证通查结果', dataIndex: 'operator', key: 'operator', width: 150 },
+        { title: '新办手机号', dataIndex: 'newPhone', key: 'newPhone' ,width: 250},
+        { title: '运营商类型', dataIndex: 'operatorType', key: 'operatorType'  ,width: 150},
+        { title: '现用号码使用用途', dataIndex: 'phonePurpose', key: 'phonePurpose',width: 150 },
+        { title: '后续处理', width: 150, dataIndex: 'numberResults', key: 'numberResults'},
+       ],
+      open:false,
       disabledList:[],
       fetching: false,
       randomId: '',
@@ -1035,6 +1062,7 @@ export default {
       cardStartTimeAndEnd: '',
       cardStartTimeAndEndShow: false,
       industryQiTa:'',
+      isDisable:false,
       //表单信息
       model: {
         cardStartTimeAndEnd: '',
@@ -1090,6 +1118,7 @@ export default {
         newPhone5: ''
 
       },
+      dataList:[],
       current: 0,
       //步骤条
       steps: [
@@ -1116,12 +1145,140 @@ export default {
     this.getSysCompany();
     //DOM初始化完成进行地图初始化
     this.initMap();
-    this.queryById();
     this.getSysDictItems()
+    this.queryById();
 
+   //this.getDataList()
   },
 
   methods: {
+
+  resultData(result,newPhones){
+    for (let i = 0; i < result.length; i++){
+      if(result[i].cardStartTimeAndEnd!==null && result[i].cardStartTimeAndEnd!==''){
+        if (result[i].cardStartTimeAndEnd==="1"){
+          this.dataList[i].cardStartTimeAndEnd='是'
+        }
+        if (result[i].cardStartTimeAndEnd==="2"){
+          this.dataList[i].cardStartTimeAndEnd='否'
+        }
+      }
+      if (result[i].sysBusinessHall!==null &&result[i].sysBusinessHall!=='' ){
+        for (var item of this.sysCompany) {
+          if (item.id === this.model.company) {
+            this.companyName = item.name;
+            for (var it of item.sysBusinessHallList) {
+              if (it.id === this.model.sysBusinessHall) {
+                this.dataList[i].sysBusinessHall= this.companyName+ this.hallName
+              }
+            }
+          }
+        }
+      }
+      //智能地址研判
+      if (result[i].judgmentResearch!==null && result[i].judgmentResearch!==''){
+        if (result[i].judgmentResearch==="1"){
+          this.dataList[i].judgmentResearch='异常'
+        }
+        if (result[i].judgmentResearch==="2"){
+          this.dataList[i].judgmentResearch='正常'
+        }
+      }
+      //人工地址判研
+      if (result[i].judgmentResearchAddress!==null && result[i].judgmentResearchAddress!==''){
+        if (result[i].judgmentResearchAddress==="1"){
+          this.dataList[i].judgmentResearchAddress='异常'
+        }
+        if (result[i].judgmentResearchAddress==="2"){
+          this.dataList[i].judgmentResearchAddress='正常'
+        }
+      }
+      //拨测结果
+      if (result[i].calltestResults!==null && result[i].calltestResults!==''){
+        if (result[i].calltestResults==="1"){
+          this.dataList[i].calltestResults='关机'
+        }
+        if (result[i].calltestResults==="2"){
+          this.dataList[i].calltestResults='未接通'
+        }
+        if (result[i].calltestResults==="3"){
+          this.dataList[i].calltestResults='可接通不知晓入网事宜'
+        }
+        if (result[i].calltestResults==="4"){
+          this.dataList[i].calltestResults='可接通认可办理'
+        }
+      }
+      //运营商
+      if (result[i].operatorType!==null && result[i].operatorType!==''){
+        if (result[i].operatorType==="1"){
+          this.dataList[i].operatorType='移动'
+        }
+        if (result[i].operatorType==="2"){
+          this.dataList[i].operatorType='联调'
+        }if (result[i].operatorType==="3"){
+          this.dataList[i].operatorType='电信'
+        }if (result[i].operatorType==="4"){
+          this.dataList[i].operatorType='其它'
+        }
+      }
+      //一证通查结果
+      if (result[i].operator!==null && result[i].operator!==''){
+        if (result[i].operator==="1"){
+          this.dataList[i].operator='本地运营商'
+        }
+        if (result[i].operator==="2"){
+          this.dataList[i].operator='异地运营商'
+        }
+      }
+      let newPhonesStr='';
+      for (var item of  newPhones) {
+        if (item.match(RegExp('newPhone1+')) && item.replace('newPhone1+', '') !== '') {
+          newPhonesStr = newPhonesStr+item.replace('newPhone1+', '')+"  "
+        }
+        if (item.match(RegExp('newPhone2+')) && item.replace('newPhone2+', '') !== '') {
+          newPhonesStr = newPhonesStr+item.replace('newPhone2+', '')+"  "
+        }
+        if (item.match(RegExp('newPhone3+')) && item.replace('newPhone3+', '') !== '') {
+          newPhonesStr = newPhonesStr+item.replace('newPhone3+', '')+"  "
+        }
+        if (item.match(RegExp('newPhone4+')) && item.replace('newPhone4+', '') !== '') {
+          newPhonesStr = newPhonesStr+item.replace('newPhone4+', '')+"  "
+        }
+        if (item.match(RegExp('newPhone5+')) && item.replace('newPhone5+', '') !== '') {
+          newPhonesStr = newPhonesStr+item.replace('newPhone5+', '')+"  "
+        }
+      }
+      result[i].newPhone=newPhonesStr;
+      if (result[i].numberResults!==null && result[i].numberResults!==''){
+        var numberResultsList = result[i]["numberResults"].split(',');
+        var numberResultsListStr ='';
+        for (var item of  numberResultsList) {
+          if (item==='1'){
+            numberResultsListStr=numberResultsListStr+'非高危'
+          }
+          if (item==='2'){
+            numberResultsListStr=numberResultsListStr+'已报关停'
+          }
+          if (item==='3'){
+            numberResultsListStr=numberResultsListStr+'已报蓝名单 '
+          }
+          if (item==='4'){
+            numberResultsListStr=numberResultsListStr+' 已报紫名单'
+          }
+        }
+        result[i].numberResults=numberResultsListStr
+      }
+
+    }
+  },
+
+
+    showModal(){
+      this.open = true;
+    },
+    handleOk(){
+      this.open = false;
+    },
     modalFormOk2() {
       // 新增/修改 成功时，重载列表
       this.loadData2()
@@ -1777,6 +1934,13 @@ export default {
       }
 
     },
+    onCance  () {
+      var view =this.model;
+          Object.keys(view).forEach(function (key) {
+           view[key] = ''
+          });
+          this.industryQiTa='';
+    },
     keyupInfo(info) {
 
     //  this.handleEdit2()
@@ -1795,7 +1959,6 @@ export default {
             let view = this.model;
             if (result != null) {
               var i=0;
-
                 Object.keys(view).forEach(function (key) {
                   if (key==='company'){
                     that.change(result[0][key]);
@@ -1870,23 +2033,29 @@ export default {
                 if (info===''){
                   this.model.id=null;
                 }
+              this.dataList=result;
+                if (info===''){
+                  this.resultData(result,newPhones);
+                  this.showModal()
+                }
+
 
               this.disabledListAdd()
               this.showCheck0('all');
-              if (result[0]["isSizeNumberResults"] === 'is') {
-                this.$confirm({
-                  title: "确认是否继续...",
-                  content: '该用户有多个不友好研判结果',
-                  onOk: function () {
-
-                  },
-                  onCancel: function () {
-                    Object.keys(view).forEach(function (key) {
-                      view[key] = '';
-                    })
-                  }
-                });
-              }
+              // if (result[0]["isSizeNumberResults"] === 'is') {
+              //   this.$confirm({
+              //     title: "确认是否继续...",
+              //     content: '该用户有多个不友好研判结果',
+              //     onOk: function () {
+              //
+              //     },
+              //     onCancel: function () {
+              //       Object.keys(view).forEach(function (key) {
+              //         view[key] = '';
+              //       })
+              //     }
+              //   });
+              // }
             }
             // this.$refs.modalDetail.detail( );
             // this.$refs.modalDetail.title = "详情";
@@ -1902,25 +2071,12 @@ export default {
 
     /**获取详情*/
     queryById() {
+      this.model.id = this.$route.query.id;
+      this.model.cardNo = this.$route.query.cardNo;
+      this.isDisable = this.$route.query.isDisable;
       this.getSysCompany();
-      let that = this;
-      let data = {
-        "id": that.model.id
-      }
-      getAction(that.url.queryById, data).then((res) => {
-        if (res.success) {
-          let result = res.result;
-          if (result != null) {
-            for (var i in result) {
-              that.model[i] = result[i] == null ? null : result[i].toString();
-            }
-          }
-        }
-        this.keyupInfo('update');
-        this.change(this.model.company)
-      })
-
-
+      this.keyupInfo('update');
+      this.change(this.model.company)
     },
 
 
@@ -2375,11 +2531,13 @@ export default {
             this.$message.success(mes, 3);
             this.addIng == true
              location.reload();
+            // this.onCance  ()
             //this.closeCurrent();
             //this.$router.replace({ path: this.$route.path })
           } else {
             this.$message.error("提交失败");
              location.reload();
+            // this.onCance  ()
             // this.closeCurrent();
             // this.$router.replace({ path: this.$route.path })
           }

src/views/networkAccess/userStatistics.vue

@@ -176,6 +176,17 @@ export default {
   inject: ['closeCurrent'],
   data() {
     return {
+      ipagination:{
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '20', '30','300'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
       numberResults: null,
       /**统计标签*/
       currentTab: 'all',
@@ -395,26 +406,20 @@ 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',
+        '4': 'success',
+        '3,4': 'success',
+        '4,3': 'success',
       }
       return statusTypeMap[type]
     },
     statusFilter(status) {
       const statusMap = {
         '1': '非高危',
-        '2': '已报蓝紫名单',
-        '3': '已报关停',
-        '1,2':'非高危/已报蓝紫名单',
-        '2,1': '非高危/已报蓝紫名单 ',
-        '1,3,2':'非高危/已报关停/已报蓝紫名单',
-        '1,2,3': '非高危/已报关停/已报蓝紫名单',
-        '3,2,1': '非高危/已报关停/已报蓝紫名单',
-        '3,1,2': '非高危/已报关停/已报蓝紫名单',
+        '2': '已报关停',
+        '3': '已报蓝名单',
+        '4': '已报紫名单',
+        '3,4':'已报蓝紫名单',
+        '4,3':'已报蓝紫名单',
       }
       return statusMap[status]
     }
@@ -461,14 +466,14 @@ export default {
 
     },
     showByCardNo(record){
-      let queryParam = {
-        "cardNo":record.cardNo,
-        "cardName":this.queryParam.cardName
-      }
-      this.loadData(null,queryParam);
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-
+      // let queryParam = {
+      //   "cardNo":record.cardNo,
+      //   "cardName":this.queryParam.cardName
+      // }
+      // this.loadData(null,queryParam);
+      // this.selectedRowKeys = [];
+      // this.selectionRows = [];
+      this.$router.push({path: '/networkAccess/registration', query: {id: record.id,cardNo: record.cardNo,isDisable:'is'}});
     },
     showByCardName(record){
       let queryParam = {
@@ -538,10 +543,22 @@ export default {
       })
 
     },
-
+    getDate(){
+      var today = new Date();
+      var dd = String(today.getDate()).padStart(2, '0');
+      var mm = String(today.getMonth() + 1).padStart(2, '0');
+      var yyyy = today.getFullYear();
+
+      today = mm + '/' + dd + '/' + yyyy;
+      return today;
+    },
     /**修改*/
     showImproveAndUpload(record) {
-      this.$router.push({path: '/networkAccess/registration', query: {id: record.id}});
+      if (!record.createTime.match(RegExp(this.getDate()))){
+        this.$message.warning('此输入非天创建 禁止修改', 3);
+        return
+      }
+      this.$router.push({path: '/networkAccess/registration', query: {id: record.id,cardNo: record.cardNo}});
     },
     showImproveAndUploadAdmin(record) {
       this.$router.push({path: '/networkAccess/registrationHide', query: {id: record.id}});