sunyize 2 éve
szülő
commit
f7ccbf391e

+ 40 - 21
src/views/networkAccess/registration.vue

@@ -25,7 +25,7 @@
 <!--            <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-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"   >
                   <template #bodyCell="{ column }">
@@ -34,6 +34,10 @@
                     </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>
@@ -65,22 +69,23 @@
                 </a-table>
               </a-modal>
             </div>
-<!--            <a-button type="link" @click="keyupInfoSelect()">身份证件号检索</a-button>-->
+<!--            <a-button type="link" @click="keyupInfoSelect()">证件号检索</a-button>-->
             <a-row>
               <a-col :span="6">
-                <a-form-model-item required label="身份证件号" prop="cardNo"   :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
+                <a-form-model-item required label="证件号" prop="cardNo"   :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
 
 <!--                  <a-radio-group v-model="model.cardNo" button-style="solid"    slot-scope="text, record">-->
-                    <a-input v-model="model.cardNo" placeholder="请输入身份证件号" @keyup="keyupInfo('')" id="cardNo" :disabled="isDisabled" @blur="showCheck0('cardNo')"></a-input>
+                    <a-input v-model="model.cardNo" placeholder="请输入证件号" @keyup="keyupInfo('')" id="cardNo" :disabled="isDisabled" @blur="showCheck0('cardNo')"></a-input>
 <!--                  </a-radio-group>--><a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
                 </a-form-model-item>
 
               </a-col>
 
               <a-col :span="6">
-                <a-form-model-item label="身份证姓名"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
+                <a-form-model-item label="客户名称"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
 <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
-                    <a-input v-model="model.cardName" placeholder="身份证姓名"  id="cardName"  @blur="showCheck0('cardName')" :disabled="isDisabled"></a-input>
+                    <a-input v-model="model.cardName" placeholder="客户名称"  id="cardName"  @blur="showCheck0('cardName')" :disabled="isDisabled"></a-input>
+<!--                  </a-radio-group>-->
 <!--                  </a-radio-group>-->
                 </a-form-model-item>
               </a-col>
@@ -90,11 +95,14 @@
               <!--                </a-form-item>-->
               <!--              </a-col>-->
               <a-col :span="6">
-                <a-form-model-item label="身份证地址"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
-                  <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
-                  <a-input v-model="model.idCardAddress" placeholder="身份证地址"  id="idCardAddress"  @blur="showCheck0('idCardAddress')" :disabled="isDisabled"></a-input>
-                  <!--                  </a-radio-group>-->
-                </a-form-model-item>
+                <div>
+                    <div  style="float:left;margin: 10px 3px;">  <div class="redInfo"  v-if="showIdCardAddress">*</div> 证件地址:</div>
+                    <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
+                  <div style="float:left;margin: 5px 0px;">
+                    <a-input v-model="model.idCardAddress" placeholder="证件地址"  id="idCardAddress"  @blur="showCheck0('idCardAddress')" :disabled="isDisabled"></a-input>
+                  </div>
+                    <!--                  </a-radio-group>-->
+                </div>
               </a-col>
               <a-col :span="6"  >
 <!--                <a-form-item label="身份证证件有效期"  prop="industry" @click="showCheck0('cardStartTime')" :labelCol="{ span:6 }"   :wrapperCol="{ span: 16 }"   style="margin: 0px 0px">-->
@@ -562,7 +570,7 @@
           <div id="showInfo" v-if="!riskShow">
 <!--            <a-col :span="24">-->
 
-<!--              <div>身份证件号码 : 【 {{ this.model.cardNo }} 】 身份证姓名:【 {{ this.model.cardName }} 】 身份证证件有效期【-->
+<!--              <div>证件编号 : 【 {{ this.model.cardNo }} 】 客户名称:【 {{ this.model.cardName }} 】 身份证证件有效期【-->
 <!--                {{ this.model.cardStartTime }}~{{ this.model.cardEndTime }}】-->
 <!--              </div>-->
 <!--              <div>拨测联系电话: 【 {{ this.model.phone }} 】 拨测结果: 【 {{ this.calltestResultsName }}】</div>-->
@@ -777,8 +785,8 @@ export default {
       
 
       riskShow:true,
-      columns:[{ title: '身份证件号', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
-        { title: '身份证姓名', width: 150, dataIndex: 'cardName', key: 'cardName' , scopedSlots: {customRender: 'cardName'} },
+      columns:[{ title: '证件号', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
+        { title: '客户名称', width: 150, dataIndex: 'cardName', key: 'cardName' , scopedSlots: {customRender: 'cardName'} },
         { title: '年龄', width: 150, dataIndex: 'age', key: 'age' , scopedSlots: {customRender: 'age'} },
         { title: '证件是否在期', dataIndex: 'cardStartTimeAndEnd', key: '1', width: 150 , scopedSlots: {customRender: 'cardStartTimeAndEnd'}},
         { title: '创建人', dataIndex: 'createBy', key: 'createBy', width: 150 },
@@ -1037,7 +1045,7 @@ export default {
       //校验的规则
       rules: {
         cardNo: [
-          {required: true, message: '请输入身份证号码!'},
+          {required: true, message: '请输入证号码!'},
           {validator: this.validateCardNo}
         ],
         cardName: [{
@@ -1143,6 +1151,7 @@ export default {
       industryQiTa:'',
       isDisabled:false,
       spin:false,
+      showIdCardAddress:false,
       //表单信息
       model: {
         cardStartTimeAndEnd: '',
@@ -1567,11 +1576,17 @@ export default {
 
     // 校验身份证
     validateCardNo(rule,value,callback){
+      if(value.length ===16 || value.length ===18){
         if (!value || new RegExp(/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/).test(value)) {
+          // 若是将证件地址改为必输
+          this.showIdCardAddress=true;
           callback();
         } else {
+          this.showIdCardAddress=false;
           callback("您的身份证格式不正确!");
         }
+      }
+
     },
     //校验姓名
     validateName(rule,value,callback){
@@ -2210,12 +2225,16 @@ export default {
         }else {
           document.getElementById('cardNo').style.borderColor = "#d9d9d9";
         }  }
-      if (data==='all' || data==='idCardAddress'){ if (this.model.idCardAddress==='' || this.model.idCardAddress===null){
-        document.getElementById('idCardAddress').style.borderColor = "red";
-        info=false;
-      }else {
-        document.getElementById('idCardAddress').style.borderColor = "#d9d9d9";
-      }  }
+      if (data==='all' || data==='idCardAddress'){
+        if (this.showIdCardAddress){
+          if (this.model.idCardAddress==='' || this.model.idCardAddress===null){
+            document.getElementById('idCardAddress').style.borderColor = "red";
+            info=false;
+          }else {
+            document.getElementById('idCardAddress').style.borderColor = "#d9d9d9";
+          }
+        }
+      }
      if (data==='all' || data==="cardName"){ if (this.model.cardName==='' || this.model.cardName===null){
        document.getElementById('cardName').style.borderColor = "red";
        info=false;

+ 35 - 19
src/views/networkAccess/registrationSelect.vue

@@ -65,22 +65,22 @@
                 </a-table>
               </a-modal>
             </div>
-<!--            <a-button type="link" @click="keyupInfoSelect()">身份证件号检索</a-button>-->
+<!--            <a-button type="link" @click="keyupInfoSelect()">证件号检索</a-button>-->
             <a-row>
               <a-col :span="6">
-                <a-form-model-item required label="身份证件号" prop="cardNo"   :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
+                <a-form-model-item required label="证件号" prop="cardNo"   :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
 
 <!--                  <a-radio-group v-model="model.cardNo" button-style="solid"    slot-scope="text, record">-->
-                    <a-input v-model="model.cardNo" placeholder="请输入身份证件号" @keyup="keyupInfo('')" id="cardNo" :disabled="isDisabled" @blur="showCheck0('cardNo')"></a-input>
+                    <a-input v-model="model.cardNo" placeholder="请输入证件号" @keyup="keyupInfo('')" id="cardNo" :disabled="isDisabled" @blur="showCheck0('cardNo')"></a-input>
 <!--                  </a-radio-group>--><a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
                 </a-form-model-item>
 
               </a-col>
 
               <a-col :span="6">
-                <a-form-model-item label="身份证姓名"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
+                <a-form-model-item label="客户名称"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
 <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
-                    <a-input v-model="model.cardName" placeholder="身份证姓名"  id="cardName"  @blur="showCheck0('cardName')" :disabled="isDisabled"></a-input>
+                    <a-input v-model="model.cardName" placeholder="客户名称"  id="cardName"  @blur="showCheck0('cardName')" :disabled="isDisabled"></a-input>
 <!--                  </a-radio-group>-->
                 </a-form-model-item>
               </a-col>
@@ -90,11 +90,14 @@
               <!--                </a-form-item>-->
               <!--              </a-col>-->
               <a-col :span="6">
-                <a-form-model-item label="身份证地址"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
+                <div>
+                  <div  style="float:left;margin: 10px 3px;">  <div class="redInfo"  v-if="showIdCardAddress">*</div> 证件地址:</div>
                   <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
-                  <a-input v-model="model.idCardAddress" placeholder="身份证地址"  id="idCardAddress"  @blur="showCheck0('idCardAddress')" :disabled="isDisabled"></a-input>
+                  <div style="float:left;margin: 5px 0px;">
+                    <a-input v-model="model.idCardAddress" placeholder="证件地址"  id="idCardAddress"  @blur="showCheck0('idCardAddress')" :disabled="isDisabled"></a-input>
+                  </div>
                   <!--                  </a-radio-group>-->
-                </a-form-model-item>
+                </div>
               </a-col>
               <a-col :span="6"  >
 <!--                <a-form-item label="身份证证件有效期"  prop="industry" @click="showCheck0('cardStartTime')" :labelCol="{ span:6 }"   :wrapperCol="{ span: 16 }"   style="margin: 0px 0px">-->
@@ -562,7 +565,7 @@
           <div id="showInfo" v-if="!riskShow">
 <!--            <a-col :span="24">-->
 
-<!--              <div>身份证件号码 : 【 {{ this.model.cardNo }} 】 身份证姓名:【 {{ this.model.cardName }} 】 身份证证件有效期【-->
+<!--              <div>证件编号 : 【 {{ this.model.cardNo }} 】 客户名称:【 {{ this.model.cardName }} 】 身份证证件有效期【-->
 <!--                {{ this.model.cardStartTime }}~{{ this.model.cardEndTime }}】-->
 <!--              </div>-->
 <!--              <div>拨测联系电话: 【 {{ this.model.phone }} 】 拨测结果: 【 {{ this.calltestResultsName }}】</div>-->
@@ -777,8 +780,8 @@ export default {
       
 
       riskShow:true,
-      columns:[{ title: '身份证件号', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
-        { title: '身份证姓名', width: 150, dataIndex: 'cardName', key: 'cardName' , scopedSlots: {customRender: 'cardName'} },
+      columns:[{ title: '证件号', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
+        { title: '客户名称', width: 150, dataIndex: 'cardName', key: 'cardName' , scopedSlots: {customRender: 'cardName'} },
         { title: '年龄', width: 150, dataIndex: 'age', key: 'age' , scopedSlots: {customRender: 'age'} },
         { title: '证件是否在期', dataIndex: 'cardStartTimeAndEnd', key: '1', width: 150 , scopedSlots: {customRender: 'cardStartTimeAndEnd'}},
         { title: '创建人', dataIndex: 'createBy', key: 'createBy', width: 150 },
@@ -1037,7 +1040,7 @@ export default {
       //校验的规则
       rules: {
         cardNo: [
-          {required: true, message: '请输入身份证号码!'},
+          {required: true, message: '请输入证号码!'},
           {validator: this.validateCardNo}
         ],
         cardName: [{
@@ -1143,6 +1146,7 @@ export default {
       industryQiTa:'',
       isDisabled:false,
       spin:false,
+      showIdCardAddress:false,
       //表单信息
       model: {
         cardStartTimeAndEnd: '',
@@ -1566,11 +1570,17 @@ export default {
 
     // 校验身份证
     validateCardNo(rule,value,callback){
+      if(value.length ===16 || value.length ===18){
         if (!value || new RegExp(/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/).test(value)) {
+          // 若是将证件地址改为必输
+          this.showIdCardAddress=true;
           callback();
         } else {
+          this.showIdCardAddress=false;
           callback("您的身份证格式不正确!");
         }
+      }
+
     },
     //校验姓名
     validateName(rule,value,callback){
@@ -2222,12 +2232,18 @@ export default {
         }else {
           document.getElementById('cardNo').style.borderColor = "#d9d9d9";
         }  }
-      if (data==='all' || data==='idCardAddress'){ if (this.model.idCardAddress==='' || this.model.idCardAddress===null){
-        document.getElementById('idCardAddress').style.borderColor = "red";
-        info=false;
-      }else {
-        document.getElementById('idCardAddress').style.borderColor = "#d9d9d9";
-      }  }
+      if (data==='all' || data==='idCardAddress') {
+        if (this.model.idCardAddress === '' || this.model.idCardAddress === null) {
+          if (this.showIdCardAddress) {
+            if (this.model.idCardAddress === '' || this.model.idCardAddress === null) {
+              document.getElementById('idCardAddress').style.borderColor = "red";
+              info = false;
+            } else {
+              document.getElementById('idCardAddress').style.borderColor = "#d9d9d9";
+            }
+          }
+        }
+      }
      if (data==='all' || data==="cardName"){ if (this.model.cardName==='' || this.model.cardName===null){
        document.getElementById('cardName').style.borderColor = "red";
        info=false;
@@ -2569,7 +2585,7 @@ export default {
         //身份证是否到期
         if (key==='cardStartTimeAndEnd'){
           if (dataLists[0]['cardStartTimeAndEnd']==='否'){
-            map.name ='【入网提示卡】 身份证号:【'+dataLists[0]['cardNo']+'】 是否在有效期' ;
+            map.name ='【入网提示卡】 证件编号:【'+dataLists[0]['cardNo']+'】 是否在有效期' ;
             map.text = dataLists[0]['cardStartTimeAndEnd'];
             that.dataRisk.push(map)
           }

+ 35 - 19
src/views/networkAccess/registrationUpdate.vue

@@ -65,22 +65,22 @@
                 </a-table>
               </a-modal>
             </div>
-<!--            <a-button type="link" @click="keyupInfoSelect()">身份证件号检索</a-button>-->
+<!--            <a-button type="link" @click="keyupInfoSelect()">证件号检索</a-button>-->
             <a-row>
               <a-col :span="6">
-                <a-form-model-item required label="身份证件号" prop="cardNo"   :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
+                <a-form-model-item required label="证件号" prop="cardNo"   :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"    >
 
 <!--                  <a-radio-group v-model="model.cardNo" button-style="solid"    slot-scope="text, record">-->
-                    <a-input v-model="model.cardNo" placeholder="请输入身份证件号" @keyup="keyupInfo('')" id="cardNo" :disabled="isDisabled" @blur="showCheck0('cardNo')"></a-input>
+                    <a-input v-model="model.cardNo" placeholder="请输入证件号" @keyup="keyupInfo('')" id="cardNo" :disabled="isDisabled" @blur="showCheck0('cardNo')"></a-input>
 <!--                  </a-radio-group>--><a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
                 </a-form-model-item>
 
               </a-col>
 
               <a-col :span="6">
-                <a-form-model-item label="身份证姓名"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
+                <a-form-model-item label="客户名称"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
 <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
-                    <a-input v-model="model.cardName" placeholder="身份证姓名"  id="cardName"  @blur="showCheck0('cardName')" :disabled="isDisabled"></a-input>
+                    <a-input v-model="model.cardName" placeholder="客户名称"  id="cardName"  @blur="showCheck0('cardName')" :disabled="isDisabled"></a-input>
 <!--                  </a-radio-group>-->
                 </a-form-model-item>
               </a-col>
@@ -90,11 +90,14 @@
               <!--                </a-form-item>-->
               <!--              </a-col>-->
               <a-col :span="6">
-                <a-form-model-item label="身份证地址"   prop="industry" :labelCol="{ span:8 }"   :wrapperCol="{ span: 14 }"   >
+                <div>
+                  <div  style="float:left;margin: 10px 3px;">  <div class="redInfo"  v-if="showIdCardAddress">*</div> 证件地址:</div>
                   <!--                  <a-radio-group v-model="model.cardName" button-style="solid" prop="cardNo">-->
-                  <a-input v-model="model.idCardAddress" placeholder="身份证地址"  id="idCardAddress"  @blur="showCheck0('idCardAddress')" :disabled="isDisabled"></a-input>
+                  <div style="float:left;margin: 5px 0px;">
+                    <a-input v-model="model.idCardAddress" placeholder="证件地址"  id="idCardAddress"  @blur="showCheck0('idCardAddress')" :disabled="isDisabled"></a-input>
+                  </div>
                   <!--                  </a-radio-group>-->
-                </a-form-model-item>
+                </div>
               </a-col>
               <a-col :span="6"  >
 <!--                <a-form-item label="身份证证件有效期"  prop="industry" @click="showCheck0('cardStartTime')" :labelCol="{ span:6 }"   :wrapperCol="{ span: 16 }"   style="margin: 0px 0px">-->
@@ -562,7 +565,7 @@
           <div id="showInfo" v-if="!riskShow">
 <!--            <a-col :span="24">-->
 
-<!--              <div>身份证件号码 : 【 {{ this.model.cardNo }} 】 身份证姓名:【 {{ this.model.cardName }} 】 身份证证件有效期【-->
+<!--              <div>证件编号 : 【 {{ this.model.cardNo }} 】 客户名称:【 {{ this.model.cardName }} 】 身份证证件有效期【-->
 <!--                {{ this.model.cardStartTime }}~{{ this.model.cardEndTime }}】-->
 <!--              </div>-->
 <!--              <div>拨测联系电话: 【 {{ this.model.phone }} 】 拨测结果: 【 {{ this.calltestResultsName }}】</div>-->
@@ -777,8 +780,8 @@ export default {
       
 
       riskShow:true,
-      columns:[{ title: '身份证件号', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
-        { title: '身份证姓名', width: 150, dataIndex: 'cardName', key: 'cardName' , scopedSlots: {customRender: 'cardName'} },
+      columns:[{ title: '证件号', width: 180, dataIndex: 'cardNo', key: 'cardNo'  },
+        { title: '客户名称', width: 150, dataIndex: 'cardName', key: 'cardName' , scopedSlots: {customRender: 'cardName'} },
         { title: '年龄', width: 150, dataIndex: 'age', key: 'age' , scopedSlots: {customRender: 'age'} },
         { title: '证件是否在期', dataIndex: 'cardStartTimeAndEnd', key: '1', width: 150 , scopedSlots: {customRender: 'cardStartTimeAndEnd'}},
         { title: '创建人', dataIndex: 'createBy', key: 'createBy', width: 150 },
@@ -1037,7 +1040,7 @@ export default {
       //校验的规则
       rules: {
         cardNo: [
-          {required: true, message: '请输入身份证号!'},
+          {required: true, message: '请输入证件编号!'},
           {validator: this.validateCardNo}
         ],
         cardName: [{
@@ -1143,6 +1146,7 @@ export default {
       industryQiTa:'',
       isDisabled:false,
       spin:false,
+      showIdCardAddress:false,
       //表单信息
       model: {
         cardStartTimeAndEnd: '',
@@ -1565,11 +1569,17 @@ export default {
 
     // 校验身份证
     validateCardNo(rule,value,callback){
+      if(value.length ===16 || value.length ===18){
         if (!value || new RegExp(/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/).test(value)) {
+          // 若是将证件地址改为必输
+          this.showIdCardAddress=true;
           callback();
         } else {
+          this.showIdCardAddress=false;
           callback("您的身份证格式不正确!");
         }
+      }
+
     },
     //校验姓名
     validateName(rule,value,callback){
@@ -2217,12 +2227,18 @@ export default {
         }else {
           document.getElementById('cardNo').style.borderColor = "#d9d9d9";
         }  }
-      if (data==='all' || data==='idCardAddress'){ if (this.model.idCardAddress==='' || this.model.idCardAddress===null){
-        document.getElementById('idCardAddress').style.borderColor = "red";
-        info=false;
-      }else {
-        document.getElementById('idCardAddress').style.borderColor = "#d9d9d9";
-      }  }
+      if (data==='all' || data==='idCardAddress') {
+        if (this.model.idCardAddress === '' || this.model.idCardAddress === null) {
+          if (this.showIdCardAddress) {
+            if (this.model.idCardAddress === '' || this.model.idCardAddress === null) {
+              document.getElementById('idCardAddress').style.borderColor = "red";
+              info = false;
+            } else {
+              document.getElementById('idCardAddress').style.borderColor = "#d9d9d9";
+            }
+          }
+        }
+      }
      if (data==='all' || data==="cardName"){ if (this.model.cardName==='' || this.model.cardName===null){
        document.getElementById('cardName').style.borderColor = "red";
        info=false;
@@ -2564,7 +2580,7 @@ export default {
         //身份证是否到期
         if (key==='cardStartTimeAndEnd'){
           if (dataLists[0]['cardStartTimeAndEnd']==='否'){
-            map.name ='【入网提示卡】 身份证号:【'+dataLists[0]['cardNo']+'】 是否在有效期' ;
+            map.name ='【入网提示卡】 证件编号:【'+dataLists[0]['cardNo']+'】 是否在有效期' ;
             map.text = dataLists[0]['cardStartTimeAndEnd'];
             that.dataRisk.push(map)
           }

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

@@ -26,13 +26,13 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="身份证姓名">
-                <j-input placeholder="请输入身份证姓名" v-model="queryParam.cardName"></j-input>
+              <a-form-item label="客户名称">
+                <j-input placeholder="请输入客户名称" v-model="queryParam.cardName"></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.cardNo"></j-input>
+              <a-form-item label="证件编号">
+                <j-input placeholder="请输入证件编号" v-model="queryParam.cardNo"></j-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -304,14 +304,14 @@ export default {
           scopedSlots: {customRender: 'rowIndex'}
         },
         {
-          title: '身份证号',
+          title: '证件编号',
           align: "center",
           sorter: true,
           dataIndex: 'cardNo',
           scopedSlots: {customRender: 'cardNo'}
 
         }, {
-          title: '姓名',
+          title: '客户名称',
           align: "center",
           sorter: true,
           dataIndex: 'cardName'