0807

src/views/networkAccess/registration.vue

@@ -25,19 +25,19 @@
 <!--            <registation-Modal ref="registationModel" @ok="modalFormOk2"></registation-Modal> :row-class-name="tableRowClassName"-->
             <div>
 <!--              <a-button type="primary" @click="showModal">研判结果异常展示</a-button>         :transformCellText="dataShow"       -->
-              <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 }"  :rowClassName="cellStyle"   >
+              <a-modal v-model:open="open" title="研判结果异常展示"   @ok="handleOk"  :width="1000">
+                <template slot="footer" >
+                  <a-button type="primary" style="display:block;margin:0 auto"
+                            @click="handleOk" >已阅</a-button>
+                </template>
+                <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 1500, y: 300 }"  :rowClassName="cellStyle"    >
                   <template #bodyCell="{ column }">
                     <template v-if="column.key === 'operation'">
 
                     </template>
 
                   </template>
-                  <template slot="footer">
-                    <a-button type="primary"
-                              @click="handleOk">确定</a-button>
-                  </template>
+
                   <template v-slot:age="text, record">
                     <div v-if="parseInt(text)<=23 || parseInt(text)>=60" style="color: red">{{ text }}</div>
                     <div v-if="parseInt(text)>23 && parseInt(text)<60" >{{ text }}</div>
@@ -176,7 +176,7 @@
               <!--                </a-form-model-item>-->
               <!--              </a-col>-->
               <a-col :span="10">
-                <a-form-model-item label="运营商类型" :labelCol="{ span:9 }"
+                <a-form-model-item label="客户现用号码一证通查结果" :labelCol="{ span:9 }"
                                    :wrapperCol="{ span: 13}" prop="operatorType" style="margin: 0px 0px">
                   <a-radio-group v-model="model.operatorType" button-style="solid"  @change="showCheck0('operatorType')" :disabled="isDisabled">
 
@@ -198,7 +198,7 @@
 <!--                    <span v-if="this.model.qita>5 " style="color: red">[{{ this.model.qita }}]</span><span-->
 <!--                    v-if="this.model.qita<5 " style="color: green">[{{ this.model.qita }}]</span>-->
                   </a-radio-group>
-                  <div v-if="operatorTypeNull" style="color: red">请选择运营商类型</div>
+                  <div v-if="operatorTypeNull" style="color: red">请选择客户现用号码一证通查结果</div>
                 </a-form-model-item>
               </a-col>
             </a-row>
@@ -248,16 +248,16 @@
 
 
               </a-col>
-              <a-col :span="9">
-                <a-form-model-item label="客户现用号码一证通查结果" prop="modelOperator" :labelCol="{ span:10 }"
-                                   :wrapperCol="{ span: 13}" style="margin: 0px 0px">
-                  <a-radio-group v-model="model.operator" button-style="solid" id="operator" @change="showCheck0('operator')" v-bind:disabled="isDisabled">
-                    <a-radio value="1"  >本地运营商</a-radio>
-                    <a-radio value="2"  >异地运营商</a-radio>
-                  </a-radio-group>
-                  <div v-if="operatorNull" style="color: red">请选择客户现用号码一证通查结果</div>
-                </a-form-model-item>
-              </a-col>
+<!--              <a-col :span="9">-->
+<!--                <a-form-model-item label="客户现用号码一证通查结果" prop="modelOperator" :labelCol="{ span:10 }"-->
+<!--                                   :wrapperCol="{ span: 13}" style="margin: 0px 0px">-->
+<!--                  <a-radio-group v-model="model.operator" button-style="solid" id="operator" @change="showCheck0('operator')" v-bind:disabled="isDisabled">-->
+<!--                    <a-radio value="1"  >本地运营商</a-radio>-->
+<!--                    <a-radio value="2"  >异地运营商</a-radio>-->
+<!--                  </a-radio-group>-->
+<!--                  <div v-if="operatorNull" style="color: red">请选择客户现用号码一证通查结果</div>-->
+<!--                </a-form-model-item>-->
+<!--              </a-col>-->
 
 
             </a-row>
@@ -697,12 +697,12 @@
                   <a-col :span="24">
                     <a-form-model-item label="智能地址研判" prop="userOpenState"  :labelCol="{span:7}"
                                        :wrapperCol="{span:12}">
-                      <a-radio-group v-model="model.judgmentResearch" button-style="solid"  @change="showCheck0('judgmentResearch')" :disabled="isDisabled">
+                      <a-radio-group v-model="model.judgmentResearch" button-style="solid"  @change="showCheck0('judgmentResearch')" :disabled=true>
                         <a-radio value="1" style="color: red ">智能判研-异常</a-radio>
                         <a-radio value="2">智能判研-正常</a-radio>
                       </a-radio-group>
 
-                      <div v-if="judgmentResearchNull" style="color: red;margin-left: 40px">请选择地址研判</div>
+<!--                      <div v-if="judgmentResearchNull" style="color: red;margin-left: 40px">请选择地址研判</div>-->
                     </a-form-model-item>
                   </a-col>
                 </a-row>
@@ -1677,9 +1677,9 @@ export default {
     },
     searchKeyWordsysBusinessHall(data, nameType) {
 
-      if (nameType==='businessAddress'){
-       this.showCheck0('sysBusinessHall');
-      }
+      // if (nameType==='businessAddress'){
+      //  this.showCheck0('sysBusinessHall');
+      // }
       let that = this
       that.placeSearchComponent.search(data, function (status, result) {
         if (status === 'complete' && result.info === "OK") {
@@ -2093,29 +2093,33 @@ export default {
             if (result != null) {
               var i=0;
                 Object.keys(view).forEach(function (key) {
-                  if (key==='company'){
-                    that.change(result[0][key]);
+                  // if (key==='company'){
+                  //   that.change(result[0][key]);
+                  // }
+                  if (key==='cardNo' || key ==='cardName' || key==='idCardAddress'){
+                    view[key] = result[0][key];
                   }
-                  view[key] = result[0][key];
+
+
                   if (key==='newPhone'){
                     if (  result[0][key]!==null &&  result[0][key]!==''){
                       newPhones = result[0][key].split(',');
                     }
                   }
-                  if (key==='industry'){
-
-                    var a=0;
-                    for (var s in  that.getDataSysDictItem) {
-                      if (that.getDataSysDictItem[s].text.match(RegExp(result[0][key]))){
-                          a++;
-                      }
-                    }
-                    if (a===0){
-                      view.industry='其它';
-                      that.industryQiTa= result[0][key];
-                      that.industryNullQiTa=true;
-                    }
-                  }
+                  // if (key==='industry'){
+                  //
+                  //   var a=0;
+                  //   for (var s in  that.getDataSysDictItem) {
+                  //     if (that.getDataSysDictItem[s].text.match(RegExp(result[0][key]))){
+                  //         a++;
+                  //     }
+                  //   }
+                  //   if (a===0){
+                  //     view.industry='其它';
+                  //     that.industryQiTa= result[0][key];
+                  //     that.industryNullQiTa=true;
+                  //   }
+                  // }
 
                 })
               for (var item of  newPhones) {
@@ -2139,30 +2143,30 @@ export default {
                   this.model.newPhone5=item.replace('newPhone5+','')
                 }
               }
-                for (var item of this.sysCompany) {
-                  if (item.id === this.model.company) {
-                    this.companyName = item.name;
-                    this.change(item.id);
-
-                    for (var it of item.sysBusinessHallList) {
-                      if (it.id === this.model.sysBusinessHall) {
-                        this.hallName = it.name;
-                        this.model.sysBusinessHall=it.id
-                      }
-                    }
-                  }
-                }
+              //   for (var item of this.sysCompany) {
+              //     if (item.id === this.model.company) {
+              //       this.companyName = item.name;
+              //       this.change(item.id);
+              //
+              //       for (var it of item.sysBusinessHallList) {
+              //         if (it.id === this.model.sysBusinessHall) {
+              //           this.hallName = it.name;
+              //           this.model.sysBusinessHall=it.id
+              //         }
+              //       }
+              //     }
+              //   }
                 this.isSizeNumberResults = result[0]["isSizeNumberResults"];
-                if (this.model.wordAddress!=='' && this.model.wordAddress!==null){
-                  this.searchKeyWordsysBusinessHall(this.model.wordAddress,'wordAddress');
-                }
-
-                if (this.hallName!=='' && this.hallName!==null){
-                  this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
-                }
-                if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
-                  this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
-                }
+                // if (this.model.wordAddress!=='' && this.model.wordAddress!==null){
+                //   this.searchKeyWordsysBusinessHall(this.model.wordAddress,'wordAddress');
+                // }
+                //
+                // if (this.hallName!=='' && this.hallName!==null){
+                //   this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
+                // }
+                // if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
+                //   this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
+                // }
                 if (info===''){
                   this.model.id=null;
                 }
@@ -2175,8 +2179,8 @@ export default {
                 }
 
 
-              this.disabledListAdd()
-              this.showCheck0('all');
+              //this.disabledListAdd()
+             // this.showCheck0('all');
 
               //   this.$confirm({
               //     title: "确认是否继续...",
@@ -2310,21 +2314,22 @@ 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==="operator"){   if (this.model.operator==='' || this.model.operator===null){
-        this.operatorNull=true;
-        info=false;
-      }else {
-        this.operatorNull=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;
+      // }else {
+      //   this.operatorNull=false;
+      // }
+      // }
        if (data==='all' || data==="company"||data==='all' || data==="operatorType" ){
              if (this.model.operatorType==='' || this.model.operatorType===null){
               this.operatorTypeNull=true;

src/views/networkAccess/registrationSelect.vue

@@ -25,9 +25,12 @@
 <!--            <registation-Modal ref="registationModel" @ok="modalFormOk2"></registation-Modal> :row-class-name="tableRowClassName"-->
             <div>
 <!--              <a-button type="primary" @click="showModal">研判结果异常展示</a-button>         :transformCellText="dataShow"       -->
-              <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 }"  :rowClassName="cellStyle"   >
+              <a-modal v-model:open="open" title="研判结果异常展示"   @ok="handleOk"  :width="1000">
+                <template slot="footer" >
+                  <a-button type="primary" style="display:block;margin:0 auto"
+                            @click="handleOk" >已阅</a-button>
+                </template>
+                <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 1500, y: 300 }"  :rowClassName="cellStyle"    >
                   <template #bodyCell="{ column }">
                     <template v-if="column.key === 'operation'">
 

src/views/networkAccess/registrationUpdate.vue

@@ -25,9 +25,12 @@
 <!--            <registation-Modal ref="registationModel" @ok="modalFormOk2"></registation-Modal> :row-class-name="tableRowClassName"-->
             <div>
 <!--              <a-button type="primary" @click="showModal">研判结果异常展示</a-button>         :transformCellText="dataShow"       -->
-              <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 }"  :rowClassName="cellStyle"   >
+              <a-modal v-model:open="open" title="研判结果异常展示"   @ok="handleOk"  :width="1000">
+                <template slot="footer" >
+                  <a-button type="primary" style="display:block;margin:0 auto"
+                            @click="handleOk" >已阅</a-button>
+                </template>
+                <a-table :columns="columns" :data-source="dataList" :scroll="{ x: 1500, y: 300 }"  :rowClassName="cellStyle"    >
                   <template #bodyCell="{ column }">
                     <template v-if="column.key === 'operation'">