Ver código fonte

1.入网信息登记修改详情改造

liuhy 1 ano atrás
pai
commit
4de3a8ef4c

+ 39 - 29
src/views/networkAccess/registration.vue

@@ -160,10 +160,10 @@
                              :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 value="1">
                       存在风险
                     </a-radio-button>
-                    <a-radio-button value="b">
+                    <a-radio-button value="0">
                       未提示存在风险
                     </a-radio-button>
                   </a-radio-group>
@@ -173,16 +173,16 @@
                 <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 value="3">
                       高风险
                     </a-radio-button>
-                    <a-radio-button value="b">
+                    <a-radio-button value="2">
                       低风险
                     </a-radio-button>
-                    <a-radio-button value="c">
+                    <a-radio-button value="1">
                       未评级
                     </a-radio-button>
-                    <a-radio-button value="d">
+                    <a-radio-button value="0">
                       空白
                     </a-radio-button>
                   </a-radio-group>
@@ -193,10 +193,10 @@
                              :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 value="1">
                       新客户(无北京电信号码的客户)
                     </a-radio-button>
-                    <a-radio-button value="b">
+                    <a-radio-button value="0">
                       老客户(有北京电信号码的客户,含已销户、在网)
                     </a-radio-button>
                   </a-radio-group>
@@ -827,9 +827,8 @@
 
 
             <a-list size="large" bordered>
-
+              <!--              高危号码上报关停类型选择-->
               <a-list-item>
-
                 <a-col :span="16">
                   <a-form-model-item id="numberResults" label=" 高危号码上报关停类型选择" v-bind="labelCol1ProMaxPlus"
                                      prop="industry">
@@ -849,7 +848,9 @@
 
 
                     <div v-if="model.shouldInterceptNetworkAccessValue == '3'">
-                      <a-tag color="blue"> 拦截不成功,请立即上报关停,微信发送关停号码和关停类型至渠道运营部</a-tag>
+                      <a-tag color="red">
+                        当选择拦截不成功已上报关停时,请立即通过微信及电话方式发送关停号码和关停类型至渠道运营部接口人
+                      </a-tag>
                     </div>
 
                     <div v-if="numberResults">
@@ -857,9 +858,8 @@
                     </div>
                   </a-form-model-item>
                 </a-col>
-
               </a-list-item>
-
+              <!--              新办号码-->
               <a-list-item v-if='model.shouldInterceptNetworkAccessValue!=2'>
                 <a-col :span="5">
 
@@ -889,7 +889,6 @@
                 </a-col>
               </a-list-item>
 
-
               <a-list-item v-if="model.shouldInterceptNetworkAccessValue == '3'">
                 <a-col :span="16">
                   <!--                      拦截不成功已上报关停需选择关停类型-->
@@ -913,7 +912,7 @@
                 </a-col>
               </a-list-item>
 
-              <a-list-item>
+              <a-list-item v-if="model.shouldInterceptNetworkAccessValue != '2'">
                 <a-col :span="16">
                   <!--                  拦截不成功上报蓝紫名单-->
                   <a-form-model-item id="numberResults" label=" 风险号码上报蓝紫名单"
@@ -947,7 +946,7 @@
 
                     </a-row>
                     <div>
-                      <a-tag color="blue"> 入网号码上报蓝紫名单非反诈管控手段</a-tag>
+                      <a-tag color="red"> 入网号码上报蓝紫名单非反诈管控手段</a-tag>
                     </div>
                     <div v-if="optionsWithDisabledValueFlag">
                       <a-tag color="red"> 请上报蓝紫名单</a-tag>
@@ -1434,7 +1433,13 @@ export default {
               ]
             }
           ]
-        }],
+        },
+        {
+          id: "99",
+          label: "非京",
+          value: "非京",
+        }
+      ],
       array: [1],  //创建一个数组
       form: {
         value: [],  //接收每个input框的值
@@ -3675,18 +3680,23 @@ export default {
 
         }
         if (key === 'sysBusinessHall') {
-          debugger
           let dataListElement = dataLists[0]['sysBusinessHall'];
           if (dataListElement !== null && dataListElement !== undefined && dataListElement !== '') {
-             let splitElement = dataListElement.split("北区分公司")[2];
-              splitElement = that.sysBusinessHallRegin(splitElement);
-              let wordRegion = dataLists[0]['wordRegion'][2];
-              let currentRegion = dataLists[0]['currentRegion'][2];
-              if (splitElement !== wordRegion && currentRegion !== wordRegion) {
-                map.name = '【入网提示卡】营业厅地址与工作地址、现住地址不在同一区域';
-                map.text = '存在风险';
-                that.dataRisk.push(map)
-              }
+            let splitElement = dataListElement.split("北区分公司")[2];
+            splitElement = that.sysBusinessHallRegin(splitElement);
+            let wordRegion = dataLists[0]['wordRegion'].split("/")[2];
+            let currentRegion = dataLists[0]['currentRegion'].split("/")[2];
+            if (splitElement !== wordRegion) {
+              map.name = '【入网提示卡】营业厅地址与工作地址不在同一区域';
+              map.text = '存在风险';
+              that.dataRisk.push(map)
+            }
+            if (splitElement !== currentRegion) {
+              that.dataRisk.push({
+                name:'【入网提示卡】营业厅地址与现住地址不在同一区域',
+                text:'存在风险'
+              })
+            }
           }
         }
 
@@ -4149,9 +4159,9 @@ export default {
         //是否将高危号码上报蓝、紫名单或不可复开关停
         "numberResults": arr,//this.model.numberResults
         // 工作区域
-        "wordRegion": this.model.wordRegion,
+        "wordRegion": this.model.wordRegion.join('/'),
         // 居住区域
-        "currentRegion": this.model.currentRegion,
+        "currentRegion": this.model.currentRegion.join('/'),
         // 营业厅地址
         "showsearchResult": this.model.sysBusinessHall
       };

Diferenças do arquivo suprimidas por serem muito extensas
+ 396 - 331
src/views/networkAccess/registrationSelect.vue


+ 395 - 134
src/views/networkAccess/registrationUpdate.vue

@@ -12,65 +12,6 @@
       </a-steps>
     </a-card>
 
-    <a-card style="margin-bottom:10px" v-if="current==0 && model.isNew!='' && model.isNew!=null " >
-      <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>
 
 
     <!--身份信息-->
@@ -201,6 +142,73 @@
         </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="1">
+                      存在风险
+                    </a-radio-button>
+                    <a-radio-button value="0">
+                      未提示存在风险
+                    </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="3">
+                      高风险
+                    </a-radio-button>
+                    <a-radio-button value="2">
+                      低风险
+                    </a-radio-button>
+                    <a-radio-button value="1">
+                      未评级
+                    </a-radio-button>
+                    <a-radio-button value="0">
+                      空白
+                    </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="1">
+                      新客户(无北京电信号码的客户)
+                    </a-radio-button>
+                    <a-radio-button value="0">
+                      老客户(有北京电信号码的客户,含已销户、在网)
+                    </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>
@@ -1091,13 +1099,42 @@
 
           <div>
             <a-list size="large" bordered>
+<!--              高危号码上报关停类型选择-->
               <a-list-item>
+                <a-col :span="16">
+                  <a-form-model-item id="numberResults" label=" 高危号码上报关停类型选择" v-bind="labelCol1ProMaxPlus"
+                                     prop="industry">
+                    <a-row>
+                      <a-radio-group v-model:value="model.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 @change="check3('numberResults')" :value=des.value>{{ des.text }}</a-radio>
+
+                        </template>
+                      </a-radio-group>
+                    </a-row>
+
+
+                    <div v-if="model.shouldInterceptNetworkAccessValue == '3'">
+                      <a-tag color="red"> 当选择拦截不成功已上报关停时,请立即通过微信及电话方式发送关停号码和关停类型至渠道运营部接口人</a-tag>
+                    </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='model.shouldInterceptNetworkAccessValue!=2'>
                 <a-col :span="5">
 
                 </a-col>
                 <a-col :span="24">
-
-
                   <a-form ref="form" :model="model">
                     <!-- 这个的v-for是核心是重点,一定要明白! -->
                     <div v-for="(item,index) in array" :key="index">
@@ -1112,7 +1149,6 @@
                         <a-button type="link" @click="add">[ + ]</a-button>
                         <a-button type="link" @click="del(index)">[ - ]</a-button>
                       </a-form-model-item>
-
                     </div>
                   </a-form>
 
@@ -1122,27 +1158,74 @@
                 <a-col :span="18">
                 </a-col>
               </a-list-item>
-              <a-list-item>
+<!--              关停类型选择-->
+              <a-list-item v-if="model.shouldInterceptNetworkAccessValue == '3'">
                 <a-col :span="16">
-                  <a-form-model-item id="numberResults" label=" 是否将高危号码上报蓝、紫名单或不可复开关停" v-bind="labelCol1ProMaxPlus"
+                  <!--                      拦截不成功已上报关停需选择关停类型-->
+                  <a-form-model-item id="numberResults" label=" 关停类型选择"
+                                     v-bind="labelCol1ProMaxPlus"
                                      prop="industry">
-                    <a-checkbox-group v-model="model.numberResults" style="width: 100%">
-                      <a-row>
-                        <template v-for="(des) in this.optionsWithDisabled">
-                          <a-col :span="8">
-                            <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-col>
+                    <a-row>
+                      <a-radio-group v-model:value="model.interceptFailedReportedAndStoppedValue">
+                        <template v-for="(des) in this.interceptFailedReportedAndStopped">
+                          <a-radio @change="check3('numberResults'+des.value)" :value=des.value>{{ des.text }}</a-radio>
                         </template>
-                      </a-row>
-                    </a-checkbox-group>
-                    <div v-if="numberResults" style="color: red">请选择是否将高危号码上报蓝、紫名单或不可复开关停</div>
+                      </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="model.shouldInterceptNetworkAccessValue != '2'">
+                <a-col :span="16">
+                  <!--                  拦截不成功上报蓝紫名单-->
+                  <a-form-model-item id="numberResults" label=" 风险号码上报蓝紫名单"
+                                     v-bind="labelCol1ProMaxPlus"
+                                     prop="industry">
+                    <a-row>
+                      <!--                      <a-checkbox-group v-model:value="model.optionsWithDisabledValue">
+                                              <template v-for="(des) in this.optionsWithDisabled">
+                                                <a-radio @change="check3('numberResults'+des.value)" :value=des.value>{{ des.text }}</a-radio>
+                                              </template>
+
+                                              <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-checkbox-group>-->
+
+                      <a-checkbox-group v-model="model.numberResults" style="width: 100%">
+                        <a-row>
+                          <template v-for="(des) in this.optionsWithDisabled">
+                            <a-col :span="8">
+                              <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-col>
+                          </template>
+                        </a-row>
+                      </a-checkbox-group>
+
+
+                    </a-row>
+                    <div>
+                      <a-tag color="red"> 入网号码上报蓝紫名单非反诈管控手段</a-tag>
+                    </div>
+                    <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>
@@ -1405,46 +1488,46 @@
 
                   </a-col>
 
-                  <a-col :span='8'>
-                    <a-form-model-item label="工作地址" prop="industry" :labelCol="{ span:8}" :wrapperCol="{ span: 10}">
+                  <!--                  工作地址-->
+                  <a-col :span="8">
+                    <a-form-model-item label="工作地址" prop="industry" :labelCol="{ span:5}" :wrapperCol="{ span: 15}">
                       <!--                      <a-radio-group v-model="model.wordAddress" button-style="solid">-->
-                      <a-input v-model="model.wordAddress" placeholder="请输入工作地址"
-                               id="wordAddress" @blur="showCheck0('wordAddress')" :disabled="isDisabled"></a-input>
-                      <div class="map_search_result" v-show="this.showsearchResult">
-                        <ul
-                          style="  border-radius: 5px ;border: 0.5px solid #f1f1f1;padding: 0px; background-color: #f1f1f1;">
-                          <li style="  border-radius: 5px;list-style: none;border: 0px solid;padding: 0px; "
-                              v-for="(item,index) in poiList" :key="index">
-                            {{ item.name }}
-                          </li>
-                        </ul>
-                      </div>
-                      <!--                      </a-radio-group>-->
+                      <a-col :span="10" style="position: relative;float: left">
+                        <a-cascader v-model="model.wordRegion" :options="wordRegionOptions"
+                                    placeholder="请选择工作区域"/>
+                      </a-col>
+
+                      <a-col :span="14">
+                        <a-input v-model="model.wordAddress" placeholder="请输入详细地址与门牌号"
+                                 id="wordAddress" @blur="showCheck0('wordAddress')" :disabled="isDisabled"></a-input>
+                      </a-col>
+
+                      <div v-if="isWordAddressHallNull" style="color: red;margin: 0px 0px">请输入工作地址</div>
                     </a-form-model-item>
                   </a-col>
 
+                  <!--                  现住地址-->
                   <a-col :span='8'>
-                    <a-form-model-item label="现住地址(到村/小区)" prop="industry" :labelCol="{ span:9}"
-                                       :wrapperCol="{ span: 10}">
+                    <a-form-model-item label="现住地址(到村/小区)" prop="industry" :labelCol="{ span:8}"
+                                       :wrapperCol="{ span: 15}">
                       <!--                      <a-radio-group v-model="model.currentAddress" button-style="solid">-->
+                      <a-col :span="10">
+                        <a-cascader v-model="model.currentRegion" :options="wordRegionOptions"
+                                    placeholder="请选择居住区域"/>
+                      </a-col>
 
+                      <a-col :span="14">
+                        <a-input v-model="model.currentAddress" placeholder="请输入详细地址与门牌号"
+                                 id="currentAddress" @blur="showCheck0('currentAddress')"
+                                 :disabled="isDisabled"></a-input>
+                      </a-col>
 
-                      <a-input v-model="model.currentAddress" placeholder="请输入现住地址"
-                               id="currentAddress" @blur="showCheck0('currentAddress')"
-                               :disabled="isDisabled"></a-input>
-                      <div class="map_search_result" v-show="this.showsearchcurrentAddress">
-                        <ul
-                          style="  border-radius: 5px ;border: 0.5px solid #f1f1f1;padding: 0px; background-color: #f1f1f1;">
-                          <li style="  border-radius: 5px;list-style: none;border: 0px solid;padding: 0px; "
-                              v-for="(item,index) in poiList"
-                              :key="index">{{ item.name }}
-                          </li>
-                        </ul>
-                      </div>
 
+                      <div v-if="isCurrentAddressHallNull" style="color: red;margin: 0px 0px">请输入现住地址</div>
                       <!--                      </a-radio-group>-->
                     </a-form-model-item>
                   </a-col>
+
                 </a-row>
                 <a-row>
                   <a-col :span="12">
@@ -1527,6 +1610,116 @@ export default {
   mixins: [JeecgListMixin],
   data() {
     return {
+      wordRegionOptions: [
+        {
+          id: "35",
+          label: "北京市",
+          value: "北京市",
+          children: [
+            {
+              id: "1022",
+              label: "市辖区",
+              value: "市辖区",
+              children: [
+                {
+                  id: "44",
+                  label: "东城区",
+                  value: "东城区",
+                },
+                {
+                  id: "45",
+                  label: "西城区",
+                  value: "西城区",
+                },
+                {
+                  id: "46",
+                  label: "朝阳区",
+                  value: "朝阳区",
+                },
+                {
+                  id: "47",
+                  label: "丰台区",
+                  value: "丰台区",
+                },
+                {
+                  id: "48",
+                  label: "石景山区",
+                  value: "石景山区",
+                },
+                {
+                  id: "49",
+                  label: "海淀区",
+                  value: "海淀区",
+                  children: []
+                },
+                {
+                  id: "50",
+                  label: "门头沟区",
+                  value: "门头沟区",
+                },
+                {
+                  id: "51",
+                  label: "房山区",
+                  value: "房山区",
+                },
+                {
+                  id: "52",
+                  label: "通州区",
+                  value: "通州区",
+                },
+                {
+                  id: "53",
+                  label: "顺义区",
+                  value: "顺义区",
+                },
+                {
+                  id: "54",
+                  label: "昌平区",
+                  value: "昌平区",
+                },
+                {
+                  id: "55",
+                  label: "大兴区",
+                  value: "大兴区",
+                },
+                {
+                  id: "56",
+                  label: "怀柔区",
+                  value: "怀柔区",
+                },
+                {
+                  id: "57",
+                  label: "平谷区",
+                  value: "平谷区",
+                }
+              ]
+            },
+            {
+              id: "1023",
+              label: "县",
+              value: "110200",
+              children: [
+                {
+                  id: "58",
+                  label: "密云县",
+                  value: "密云县",
+
+                },
+                {
+                  id: "59",
+                  label: "延庆县",
+                  value: "延庆县",
+                }
+              ]
+            }
+          ]
+        },
+        {
+          id: "99",
+          label: "非京",
+          value: "非京",
+        }
+      ],
       array: [],  //创建一个数组
       form: {
         value: [],  //接收每个input框的值
@@ -1633,8 +1826,10 @@ export default {
       operatorNull: false,
       calltestResultsNull: false,
       sysBusinessHallNull: false,
-      judgmentResearchNull: false,
-      judgmentResearchAddressShow: false,
+      // 工作地址提示
+      isWordAddressHallNull: null,
+      // 现住地址提示
+      isCurrentAddressHallNull: null,
       color: {
         cardNoColor: 'black'
       },
@@ -1665,21 +1860,32 @@ export default {
         // 限制搜索城市的范围
         citylimit: false,
       },
+      // 入网研判及处置结果
       optionsWithDisabled:
-        [{
-          text: '非高危',
-          value: '1',
-        }, {
-          text: '上报关停',
-          value: '2',
-
-        }, {
-          text: '上报蓝名单',
-          value: '3',
-        }, {
+        [
+          {
+            text: '上报蓝名单',
+            value: '3',
+          }, {
           text: '上报紫名单',
           value: '4',
-        }],
+        },
+          {
+            text: '不上报蓝紫名单',
+            value: '1',
+          }
+        ],
+      // 拦截不成功
+      interceptFailedReportedAndStopped: [
+        {
+          text: '安防停机(可复开)',
+          value: '1',
+        },
+        {
+          text: '安防停机(管控复开)',
+          value: '2',
+        },
+      ],
       defaultValue: "",
       content: "",
       inputValue: "",
@@ -1968,8 +2174,28 @@ export default {
       spin: false,
       showIdCardAddress: false,
       showMap: false,
+      shouldInterceptNetworkAccess: [
+        {
+          text: '非高危',
+          value: '1',
+        },
+        {
+          text: '高危且已成功拦截入网',
+          value: '2',
+        },
+        {
+          text: '拦截不成功已上报关停',
+          value: '3',
+        }
+      ],
+      shouldInterceptNetworkAccessFlag: false,
+      optionsWithDisabledValueFlag: false,
+      interceptFailedReportedAndStoppedFlag: false,
       //表单信息
       model: {
+        interceptFailedReportedAndStoppedValue: "",
+        optionsWithDisabledValue: "",
+        shouldInterceptNetworkAccessValue: "",
         crmRisk:'',
         crmShow:'',
         isNewOrOld:'',
@@ -2053,6 +2279,9 @@ export default {
         dianxin: 0,
         qita: 0,
         operator: '',
+        //现住区域
+        currentRegion: '',
+        //现住地址
         currentAddress: '',
         phonePurpose: '',
         useLife: '',
@@ -2071,6 +2300,9 @@ export default {
         cardStartTime: '',
         cardEndTime: '',
         idCardAddress: '',
+        // 工作区域
+        wordRegion: '',
+        // 工作详细地址
         wordAddress: '',
         positionInformation: '',
         businessAddress: '',
@@ -3115,23 +3347,19 @@ export default {
                   }
                   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 ( this.model.currentRegion &&  this.model.currentRegion.length > 0){
+                    this.model.currentRegion = this.model.currentRegion.split("/")
+                  }
+
+                  if ( this.model.wordRegion &&  this.model.wordRegion.length > 0){
+                    this.model.wordRegion = this.model.wordRegion.split("/")
+                  }
+                  //入网研判处置结果
+                  this.model.shouldInterceptNetworkAccessValue = result[0].judgmentStatus;
+                  //关停类型
+                  this.model.interceptFailedReportedAndStoppedValue =  result[0].shutdownType;
                 }
-                // this.$refs.modalDetail.detail( );
-                // this.$refs.modalDetail.title = "详情";
               }
             })
 
@@ -3725,6 +3953,29 @@ export default {
             that.dataRisk.push(map)
           }
         }
+        if (key === 'sysBusinessHall') {
+          let dataListElement = dataLists[0]['sysBusinessHall'];
+          if (dataListElement !== null && dataListElement !== undefined && dataListElement !== '') {
+            let splitElement = dataListElement.split("北区分公司")[2];
+            splitElement = that.sysBusinessHallRegin(splitElement);
+            let wordRegion = dataLists[0]['wordRegion'].split("/")[2];
+            let currentRegion = dataLists[0]['currentRegion'].split("/")[2];
+
+            if (splitElement !== wordRegion) {
+              map.name = '【入网提示卡】营业厅地址与工作地址不在同一区域';
+              map.text = '存在风险';
+              that.dataRisk.push(map)
+            }
+
+            if (splitElement !== currentRegion) {
+              that.dataRisk.push({
+                name:'【入网提示卡】营业厅地址与现住地址不在同一区域',
+                text:'存在风险'
+              })
+            }
+
+          }
+        }
         if (key === 'crmRisk') {
           if (dataLists[0]['crmRisk'] == 'a') {
             map.name = '【入网提示卡】 CRM系统高危地址证件提示结果:';
@@ -4259,6 +4510,16 @@ export default {
         "addressTooFiveNote":this.model.addressTooFiveNote,
         "noWork":this.model.noWork,
         "noWorkNote":this.model.noWorkNote,
+        //入网研判处置结果
+        "judgmentStatus": this.model.shouldInterceptNetworkAccessValue,
+        //关停类型
+        "shutdownType": this.model.interceptFailedReportedAndStoppedValue,
+        // 工作区域
+        "wordRegion": this.model.wordRegion.join('/'),
+        // 居住区域
+        "currentRegion": this.model.currentRegion.join('/'),
+        // 营业厅地址
+        "showsearchResult": this.model.sysBusinessHall
 
       };
       return data;

+ 2 - 2
src/views/networkAccess/userStatistics.vue

@@ -36,8 +36,8 @@
               </a-form-item>
             </a-col>
             <a-col :span="6">
-              <a-form-model-item label="  研结果 " :labelCol="{ span:5}" :wrapperCol="{ span: 8 }">
-                <a-select placeholder="请选择研结果" v-model="queryParam.judgmentStatus" mode="tags">
+              <a-form-model-item label="  研结果 " :labelCol="{ span:5}" :wrapperCol="{ span: 8 }">
+                <a-select placeholder="请选择研结果" v-model="queryParam.judgmentStatus" mode="tags">
                   <a-select-option v-for="item in optionsWithDisabled" :value="item.value">
                     {{ item.text }}
                   </a-select-option>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff