1.入网信息登记改造

src/views/networkAccess/registration.vue

@@ -13,65 +13,7 @@
     </a-card>
 
 
-    <a-card style="margin-bottom:10px" v-if="current==0">
-      <div>
-        <a-form-model
-          ref="form"
-          :label-col="labelCol"
-          :wrapper-col="wrapperCol"
-          :model="model"
-          :rules="rules"
-        >
-          <div>
-            <a-row>
-              <a-col :span="12">
-                <spen>CRM系统高危地址证件提示结果 :</spen>
-                <a-radio-group v-model="model.crmRisk" default-value="a" button-style="solid">
-                  <a-radio-button value="a">
-                    存在风险
-                  </a-radio-button>
-                  <a-radio-button value="b">
-                    未提示存在风险
-                  </a-radio-button>
-                </a-radio-group>
-              </a-col>
-              <spen style='height: 30px'></spen>
-              <a-col :span="12">
-                <spen>客户类型 :</spen>
-                <a-radio-group v-model="model.isNewOrOld" default-value="a" button-style="solid">
-                  <a-radio-button value="a">
-                    新客户（无北京电信号码的客户）
-                  </a-radio-button>
-                  <a-radio-button value="b">
-                    老客户（有北京电信号码的客户，含已销户、在网）
-                  </a-radio-button>
-                </a-radio-group>
-              </a-col>
-
-              <a-col :span="12" style='margin-top: 30px'>
-                <spen>CRM系统内客户入网评级展示结果 :</spen>
-                <a-radio-group v-model='model.crmShow' default-value="a" button-style="solid">
-                  <a-radio-button value="a">
-                    高风险
-                  </a-radio-button>
-                  <a-radio-button value="b">
-                    低风险
-                  </a-radio-button>
-                  <a-radio-button value="c">
-                    未评级
-                  </a-radio-button>
-                  <a-radio-button value="d">
-                    空白
-                  </a-radio-button>
-                </a-radio-group>
-              </a-col>
-
-            </a-row>
-          </div>
 
-        </a-form-model>
-      </div>
-    </a-card>
 
     <!--身份信息-->
     <a-card style="margin-bottom:10px" v-if="current==0">
@@ -203,6 +145,74 @@
         </a-form-model>
       </div>
     </a-card>
+    <!--CRM系统和客户类型-->
+    <a-card style="margin-bottom:10px" v-if="current==0">
+      <div>
+        <a-form-model
+          ref="form"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol"
+          :model="model"
+          :rules="rules"
+        >
+          <div>
+            <a-row>
+              <a-col :span="12">
+                <a-form-item label="CRM系统高危地址证件提示结果" prop="industry" :labelCol="{ span:8 }"
+                             :wrapperCol="{ span: 12 }"
+                             style="margin: 0px 0px">
+                  <a-radio-group v-model="model.crmRisk" default-value="a" button-style="solid">
+                    <a-radio-button value="a">
+                      存在风险
+                    </a-radio-button>
+                    <a-radio-button value="b">
+                      未提示存在风险
+                    </a-radio-button>
+                  </a-radio-group>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-item label="CRM系统内客户入网评级展示结果" prop="industry" :labelCol="{ span:8 }"
+                             :wrapperCol="{ span: 12 }">
+                  <a-radio-group v-model='model.crmShow' default-value="a" button-style="solid">
+                    <a-radio-button value="a">
+                      高风险
+                    </a-radio-button>
+                    <a-radio-button value="b">
+                      低风险
+                    </a-radio-button>
+                    <a-radio-button value="c">
+                      未评级
+                    </a-radio-button>
+                    <a-radio-button value="d">
+                      空白
+                    </a-radio-button>
+                  </a-radio-group>
+                </a-form-item>
+              </a-col>
+              <a-col :span="15">
+                <a-form-item label="客户类型" prop="industry" :labelCol="{ span:3 }"
+                             :wrapperCol="{ span: 16 }"
+                             style="margin: 0px 0px">
+                  <a-radio-group v-model="model.isNewOrOld" default-value="a" button-style="solid">
+                    <a-radio-button value="a">
+                      新客户（无北京电信号码的客户）
+                    </a-radio-button>
+                    <a-radio-button value="b">
+                      老客户（有北京电信号码的客户，含已销户、在网）
+                    </a-radio-button>
+                  </a-radio-group>
+                </a-form-item>
+
+              </a-col>
+
+
+            </a-row>
+          </div>
+        </a-form-model>
+      </div>
+    </a-card>
+
     <!--  入网信息登记表单-->
     <a-card style="margin-bottom:10px" v-if="current==0">
       <div>
@@ -853,69 +863,80 @@
                 <a-col :span="16">
                   <a-form-model-item id="numberResults" label=" 入网研判及处置结果" v-bind="labelCol1ProMaxPlus"
                                      prop="industry">
-                      <a-row>
-                        <a-radio-group v-model:value="shouldInterceptNetworkAccessValue">
-                          <template v-for="(des) in this.shouldInterceptNetworkAccess">
-
-                            <!--                            <a-checkbox :value="des.value" name="numberResults"-->
-                            <!--                                        @change="check3('numberResults'+des.value)" @click="checkboxT(des.value)"-->
-                            <!--                                        :disabled="disabledList.includes(des.value)">{{ des.text }}-->
-                            <!--                            </a-checkbox>-->
-                            <a-radio :value=des.value>{{ des.text }}</a-radio>
+                    <a-row>
+                      <a-radio-group v-model:value="model.shouldInterceptNetworkAccessValue">
+                        <template v-for="(des) in this.shouldInterceptNetworkAccess">
 
-                          </template>
-                        </a-radio-group>
-                      </a-row>
+                          <!--                            <a-checkbox :value="des.value" name="numberResults"-->
+                          <!--                                        @change="check3('numberResults'+des.value)" @click="checkboxT(des.value)"-->
+                          <!--                                        :disabled="disabledList.includes(des.value)">{{ des.text }}-->
+                          <!--                            </a-checkbox>-->
+                          <a-radio @change="check3('numberResults')" :value=des.value>{{ des.text }}</a-radio>
 
+                        </template>
+                      </a-radio-group>
+                    </a-row>
 
-                    <div v-if="shouldInterceptNetworkAccessValue == '3'">
 
-                      <a-tag color="red">  拦截不成功，请立即上报关停，微信发送关停号码和关停类型至渠道运营部韩京晶</a-tag>
+                    <div v-if="model.shouldInterceptNetworkAccessValue == '3'">
+                      <a-tag color="red"> 拦截不成功，请立即上报关停，微信发送关停号码和关停类型至渠道运营部韩京晶</a-tag>
+                    </div>
 
-                     </div>
+                    <div v-if="numberResults">
+                      <a-tag color="red"> 选择入网研判及处置结果</a-tag>
+                    </div>
                   </a-form-model-item>
                 </a-col>
 
               </a-list-item>
 
-              <a-list-item v-if="shouldInterceptNetworkAccessValue == '3'">
+              <a-list-item v-if="model.shouldInterceptNetworkAccessValue == '3'">
                 <a-col :span="16">
                   <!--                      拦截不成功已上报关停需选择关停类型-->
                   <a-form-model-item id="numberResults" label=" 关停类型选择"
                                      v-bind="labelCol1ProMaxPlus"
                                      prop="industry">
                     <a-row>
-                      <a-radio-group v-model:value="interceptFailedReportedAndStoppedValue">
+                      <a-radio-group v-model:value="model.interceptFailedReportedAndStoppedValue">
                         <template v-for="(des) in this.interceptFailedReportedAndStopped">
-                          <a-radio :value=des.value>{{ des.text }}</a-radio>
+                          <a-radio @change="check3('numberResults'+des.value)" :value=des.value>{{ des.text }}</a-radio>
                         </template>
                       </a-radio-group>
                     </a-row>
+
+                    <div v-if="interceptFailedReportedAndStoppedFlag">
+                      <a-tag color="red"> 请选择关停类型</a-tag>
+                    </div>
+
                   </a-form-model-item>
 
                 </a-col>
               </a-list-item>
 
-              <a-list-item v-if="shouldInterceptNetworkAccessValue == '3'">
+              <a-list-item v-if="model.shouldInterceptNetworkAccessValue == '3'">
                 <a-col :span="16">
-<!--                  拦截不成功上报蓝紫名单-->
+                  <!--                  拦截不成功上报蓝紫名单-->
                   <a-form-model-item id="numberResults" label=" 高危号码上报蓝紫名单"
                                      v-bind="labelCol1ProMaxPlus"
                                      prop="industry">
                     <a-row>
-                      <a-radio-group v-model:value="optionsWithDisabledValue">
+                      <a-radio-group v-model:value="model.optionsWithDisabledValue">
                         <template v-for="(des) in this.optionsWithDisabled">
-                          <a-radio :value=des.value>{{ des.text }}</a-radio>
+                          <a-radio @change="check3('numberResults'+des.value)" :value=des.value>{{ des.text }}</a-radio>
                         </template>
                       </a-radio-group>
                     </a-row>
+
+                    <div v-if="optionsWithDisabledValueFlag">
+                      <a-tag color="red"> 请上报蓝紫名单</a-tag>
+                    </div>
+
                   </a-form-model-item>
 
                 </a-col>
               </a-list-item>
 
 
-
             </a-list>
           </div>
         </a-form-model>
@@ -1413,8 +1434,8 @@ export default {
         citylimit: false,
       },
       // 是否拦截入网
-      shouldInterceptNetworkAccessValue:"",
-      shouldInterceptNetworkAccess:[
+
+      shouldInterceptNetworkAccess: [
         {
           text: '非高危',
           value: '1',
@@ -1431,7 +1452,7 @@ export default {
 
 
       // 入网研判及处置结果
-      optionsWithDisabledValue: "",
+
       optionsWithDisabled:
         [
           /*{
@@ -1447,9 +1468,9 @@ export default {
             text: '上报蓝名单',
             value: '3',
           }, {
-            text: '上报紫名单',
-            value: '4',
-          }
+          text: '上报紫名单',
+          value: '4',
+        }
           /*{
             text: '高危且已成功拦截入网',
             value: '5',
@@ -1460,7 +1481,7 @@ export default {
           }*/
         ],
       // 拦截不成功
-      interceptFailedReportedAndStoppedValue:"",
+
       interceptFailedReportedAndStopped: [
         {
           text: '安防停机（可复开）',
@@ -1568,7 +1589,8 @@ export default {
         wrapperCol: {
           span: 15
         }
-      }, labelCol1ProMax5A6: {
+      },
+      labelCol1ProMax5A6: {
         labelCol: {
           span: 14
         },
@@ -1591,7 +1613,8 @@ export default {
         wrapperCol: {
           span: 5
         }
-      }, labelCol1ProMaxA8: {
+      },
+      labelCol1ProMaxA8: {
         labelCol: {
           span: 13
         },
@@ -1653,6 +1676,7 @@ export default {
         cardName: [{
           required: true, message: '请输姓名!'
         }],
+
         cardDate: [
           {required: true, message: '请输入身份证证件有效期...'}
         ],
@@ -1764,9 +1788,14 @@ export default {
       spin: false,
       showIdCardAddress: false,
       showMap: false,
+      shouldInterceptNetworkAccessFlag: false,
+      optionsWithDisabledValueFlag: false,
+      interceptFailedReportedAndStoppedFlag: false,
       //表单信息
       model: {
-
+        interceptFailedReportedAndStoppedValue: "",
+        optionsWithDisabledValue: "",
+        shouldInterceptNetworkAccessValue: "",
         screening: {},
         cardStartTimeAndEnd: '',
         value: 0,
@@ -3816,7 +3845,7 @@ export default {
         if (this.form.value.length > 0) {
           this.model.newPhone = this.form.value.join(',');
           this.model.phoneUserId = this.form.phoneUserId.join(',');
-        } else {
+        } else if (this.model.shouldInterceptNetworkAccessValue != "2"){
           this.$message.warning('新办号码至少选择一项！！！', 3);
           return
         }
@@ -3856,8 +3885,7 @@ export default {
         "crmShow": this.model.crmShow,
         "isNewOrOld": this.model.isNewOrOld,
 
-        //是否将高危号码上报蓝、紫名单或不可复开关停
-        "numberResults": arr,
+
         "cardStartTimeAndEnd": this.model.cardStartTimeAndEnd,
         "judgmentResearchAddress": this.model.judgmentResearchAddress,
         "cardNo": this.model.cardNo,
@@ -3921,7 +3949,12 @@ export default {
         "addressTooFiveNote": this.model.addressTooFiveNote,
         "noWork": this.model.noWork,
         "noWorkNote": this.model.noWorkNote,
-
+        //入网研判处置结果
+        "judgmentStatus":this.model.shouldInterceptNetworkAccessValue,
+        //关停类型
+        "shutdownType":this.model.interceptFailedReportedAndStoppedValue,
+        //是否将高危号码上报蓝、紫名单或不可复开关停
+        "numberResults": this.model.optionsWithDisabledValue
       };
       return data;
     },
@@ -3992,142 +4025,122 @@ export default {
       this.submit(data, this.model.id)
     },
 
-
+    // 提交效验
     check3(data) {
-      debugger
       var info = true;
-
-      if (data === 'all' || data === 'newPhone5') {
-        if (this.size >= 5) {
-          if (this.model.newPhone5 === '' || this.model.newPhone5 === null) {
-            document.getElementById('newPhone5').style.borderColor = "red";
-            info = false;
-          } else {
-            document.getElementById('newPhone5').style.borderColor = "#d9d9d9";
-          }
-        }
-
-      }
       var reg = RegExp(/numberResults/);
-
       if (data === 'all' || reg.exec(data)) {
-
-        if (data === 'all') {
-          if (this.model.numberResults === '' || this.model.numberResults === null || this.model.numberResults.length === 0) {
-            this.numberResults = true;
-            info = false;
-          } else {
-            this.numberResults = false;
-          }
+        if (this.model.shouldInterceptNetworkAccessValue === '' || this.model.shouldInterceptNetworkAccessValue === null || this.model.shouldInterceptNetworkAccessValue.length === 0) {
+          this.numberResults = true;
+          info = false;
         } else {
-          if (this.model.numberResults === '' || this.model.numberResults === null || this.model.numberResults.length === 0) {
-            this.numberResults = false;
-          }
+          this.numberResults = false;
         }
-        if (reg.exec(data)) {
-          for (let i = 0; i < this.model.numberResults.length; i++) {
-            if (data === 'numberResults' + this.model.numberResults[i]) {
-              //在取消选择
-              if (this.model.numberResults.length === 1) {
-                this.numberResults = true;
-                info = false;
-              } else {
-                this.numberResults = false;
-              }
-            }
-          }
+        if (this.model.shouldInterceptNetworkAccessValue === '3' &&
+          (this.model.interceptFailedReportedAndStoppedValue === '' || this.model.interceptFailedReportedAndStoppedValue === null || this.model.interceptFailedReportedAndStoppedValue.length === 0)) {
+          this.interceptFailedReportedAndStoppedFlag = true;
+        } else {
+          this.interceptFailedReportedAndStoppedFlag = false;
+        }
+        if (this.model.shouldInterceptNetworkAccessValue === '3' &&
+          (this.model.optionsWithDisabledValue === '' || this.model.optionsWithDisabledValue === null || this.model.optionsWithDisabledValue.length === 0)) {
+          this.optionsWithDisabledValueFlag = true;
+        } else {
+          this.optionsWithDisabledValueFlag = false;
+        }
+        if (!this.numberResults && !this.interceptFailedReportedAndStoppedFlag && !this.optionsWithDisabledValueFlag) {
+          info = true;
         }
-
-
       }
-      return info;
-    },
+    return info;
+  },
 
-    /**新增*/
-    submitBusiness() {
+  /**新增*/
+  submitBusiness() {
 
-      var info = true;
-      info = this.check3('all');
-      if (info === false) {
-        return
-      }
-      let that = this;
-      that.addIng == false
-      let data = this.getData('submit');
-      let id = that.model.id;
-      let i = 1;
-      let dataMessage = '';
-      const h = this.$createElement
-      const newDatas = [];
-      data['status'] = "1";//确认提交
-      let jsonString = JSON.stringify(data);
-      data['screening'] = jsonString
-      this.submit(data, id)
-
-      // if(  data["calltestResults"] ==='2'){
-      //   newDatas.push(h('p', null, i++ +'、该用户拨测号码未接通 请确认风险 。 '))
-      //
-      // }if(this.isSizeNumberResults==='is'  ){
-      //   newDatas.push(h('p', null, i++ +' 、该用户有多个不友好研判结果 请确认风险 。 '))
-      //
-      // }if(this.isSizeNumberResults==='is'  ){
-      //   newDatas.push(h('p', null, i++ +' 、该用户现住地址(到村/小区)，工作地址，营业厅地址距离过远 请确认风险 。 '))
-      //
-      // }else{
-      //   newDatas.push(h('p', null, i++ +' 暂无风险提示 请继续。 '))
-      // }
-      //
-      // this.$confirm({
-      //   title: "确认是否继续提交",
-      //   content: h('div', null, newDatas),
-      //   onOk: function () {
-      //     if (id == null){
-      //       postAction("/businessReminderCard/add", data).then((res) => {
-      //         if (res.success) {
-      //           that.clearModel()
-      //           that.$message.success("提交成功", 7);
-      //           that.addIng == true
-      //         } else {
-      //           that.$message.error("提交失败");
-      //           that.addIng == true;
-      //         }
-      //       })
-      //     }else {
-      //       postAction("/businessReminderCard/editById", data).then((res) => {
-      //         if (res.success) {
-      //           that.clearModel()
-      //           this.$message.success("修改成功", 7);
-      //           that.addIng == true
-      //           this.$router.go(-1);
-      //           this.closeCurrent();
-      //         } else {
-      //           this.$message.error("修改失败");
-      //           that.addIng == true;
-      //         }
-      //       })
-      //
-      //     }
-      //   }
-      // });
+    var info = true;
+    info = this.check3('all');
+    if (info === false) {
+      return
+    }
+    let that = this;
+    that.addIng == false
+    let data = this.getData('submit');
+    let id = that.model.id;
+    let i = 1;
+    let dataMessage = '';
+    const h = this.$createElement
+    const newDatas = [];
+    data['status'] = "1";//确认提交
+    let jsonString = JSON.stringify(data);
+    data['screening'] = jsonString
+    this.submit(data, id)
+
+    // if(  data["calltestResults"] ==='2'){
+    //   newDatas.push(h('p', null, i++ +'、该用户拨测号码未接通 请确认风险 。 '))
+    //
+    // }if(this.isSizeNumberResults==='is'  ){
+    //   newDatas.push(h('p', null, i++ +' 、该用户有多个不友好研判结果 请确认风险 。 '))
+    //
+    // }if(this.isSizeNumberResults==='is'  ){
+    //   newDatas.push(h('p', null, i++ +' 、该用户现住地址(到村/小区)，工作地址，营业厅地址距离过远 请确认风险 。 '))
+    //
+    // }else{
+    //   newDatas.push(h('p', null, i++ +' 暂无风险提示 请继续。 '))
+    // }
+    //
+    // this.$confirm({
+    //   title: "确认是否继续提交",
+    //   content: h('div', null, newDatas),
+    //   onOk: function () {
+    //     if (id == null){
+    //       postAction("/businessReminderCard/add", data).then((res) => {
+    //         if (res.success) {
+    //           that.clearModel()
+    //           that.$message.success("提交成功", 7);
+    //           that.addIng == true
+    //         } else {
+    //           that.$message.error("提交失败");
+    //           that.addIng == true;
+    //         }
+    //       })
+    //     }else {
+    //       postAction("/businessReminderCard/editById", data).then((res) => {
+    //         if (res.success) {
+    //           that.clearModel()
+    //           this.$message.success("修改成功", 7);
+    //           that.addIng == true
+    //           this.$router.go(-1);
+    //           this.closeCurrent();
+    //         } else {
+    //           this.$message.error("修改失败");
+    //           that.addIng == true;
+    //         }
+    //       })
+    //
+    //     }
+    //   }
+    // });
 
-    },
-    /**充值表单*/
-    clearModel() {
-      this.model = {}
-      this.current = 0;
-    },
+  },
+  /**充值表单*/
+  clearModel() {
+    this.model = {}
+    this.current = 0;
+  },
 
-    /**下载模版*/
-    downloadTemplat() {
-      const a = document.createElement('a')
-      a.href = '/web/tnc/static/newPhoneAndUserId.xlsx'
-      a.setAttribute('download', '新办号码及用户编号模版.xlsx')
-      a.click();
-      a.remove();
-    },
+  /**下载模版*/
+  downloadTemplat() {
+    const a = document.createElement('a')
+    a.href = '/web/tnc/static/newPhoneAndUserId.xlsx'
+    a.setAttribute('download', '新办号码及用户编号模版.xlsx')
+    a.click();
+    a.remove();
+  },
 
 
-  },
+}
+,
 }
 </script>
 

src/views/networkAccess/userStatistics.vue

@@ -247,6 +247,13 @@
           <template v-slot:phone="text, record">
             <a @click="showByPhone(record)">{{ text }}</a>
           </template>
+          <template v-slot:judgmentStatus="text, record">
+            <a-badge :status="text | statusTypeFilter" :text="text | judgmentStatusFilter"/>
+          </template>
+          <template v-slot:shutdownType="text, record">
+            <a-badge :status="text | statusTypeFilter" :text="text | shutdownType"/>
+          </template>
+
           <template v-slot:numberResults="text, record">
             <a-badge :status="text | statusTypeFilter" :text="text | statusFilter"/>
           </template>
@@ -305,11 +312,11 @@ export default {
           text: '非高危',
           value: '1',
         }, {
-          text: '上报关停',
+          text: '高危且已成功拦截入网',
           value: '2',
 
         }, {
-          text: '上报蓝/紫',
+          text: '拦截不成功已上报关停',
           value: '3',
         }],
       statusList:
@@ -453,7 +460,43 @@ export default {
 
         },
         {
-          title: '研判结果',
+          title: '研判处置结果',
+          align: "center",
+          // sorter: true,
+          sorter: (a, b) => a.numberResults.localeCompare(b.numberResults),
+          dataIndex: 'judgmentStatus',
+          scopedSlots: {customRender: 'judgmentStatus'},
+          /*customRender: function (text, record, index) {
+            if (text == '1') {
+              return '非高危';
+            } else if (text == '2') {
+              return '上报蓝紫名单';
+            } else if (text == '3') {
+              return '上报关停';
+            }
+            return '';
+          }*/
+        },
+        {
+          title: '关停类型',
+          align: "center",
+          // sorter: true,
+          sorter: (a, b) => a.numberResults.localeCompare(b.numberResults),
+          dataIndex: 'shutdownType',
+          scopedSlots: {customRender: 'shutdownType'},
+          /*customRender: function (text, record, index) {
+            if (text == '1') {
+              return '非高危';
+            } else if (text == '2') {
+              return '上报蓝紫名单';
+            } else if (text == '3') {
+              return '上报关停';
+            }
+            return '';
+          }*/
+        },
+        {
+          title: '蓝/紫名单',
           align: "center",
           // sorter: true,
           sorter: (a, b) => a.numberResults.localeCompare(b.numberResults),
@@ -470,7 +513,7 @@ export default {
             return '';
           }*/
         }, {
-          title: '紫名单上报(省)倒计时',
+          title: '蓝/紫名单上报(省)倒计时',
           align: "center",
           // sorter: true,
           dataIndex: 'createTime',
@@ -481,7 +524,7 @@ export default {
           customRender: function (text, record, index) {
             let numberResults = record.numberResults;
             // 紫名单
-            if (numberResults != '4') {
+            if (numberResults != '4' && numberResults != '3') {
               return '无';
             }
             let time = record.createTime;
@@ -533,6 +576,24 @@ export default {
       }
       return statusMap[status]
     },
+    judgmentStatusFilter(status) {
+      const statusMap = {
+        '1': '非高危',
+        '2': '高危且已成功拦截入网',
+        '3': '拦截不成功已上报关停',
+      }
+      return statusMap[status]
+    },
+
+    shutdownType(status) {
+      const statusMap = {
+        '1': '安防停机（可复开）',
+        '2': '安防停机（管控复开）'
+      }
+      return statusMap[status]
+    },
+
+
     statusEscalation(type) {
       const statusTypeMap = {
         '1': 'success',