Merge remote-tracking branch 'origin/master'

src/views/lotCheck/modules/TaskCheckList.vue

@@ -217,6 +217,7 @@
               <a-col :md="9" :sm="24">
                 <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
                 <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
+                <a-button type="danger" @click="transfer"   style="margin-left: 8px">转派</a-button>
                 <!--              <a-button type="danger" @click="transfer"   style="margin-left: 8px">转派</a-button>-->
 
               </a-col>
@@ -562,11 +563,11 @@ export default {
         if (res.success) {
 
           this.statusList=res.result
-          this.visible = true;
+          //this.visible = true;
           return
         }
       })
-      this.showModal();
+      //this.showModal();
 
     },
     showModal() {
@@ -625,10 +626,10 @@ export default {
         this.$message.warn('未选择需转派的数据!')
         return
       }
-      if ( this.orgCode===''){
-        this.$message.warn('部门不可为空!')
-        return
-      }
+      // if ( this.orgCode===''){
+      //   this.$message.warn('部门不可为空!')
+      //   return
+      // }
       let url = '/smsCheck/customerData/transfer';
       let params = {
         userId : this.selectedRowKeys2[0],

src/views/networkAccess/registration.vue

@@ -72,7 +72,7 @@
 <!--            <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>
@@ -1431,6 +1431,13 @@ export default {
       if(this.model.id){
         param.id = this.model.id
       }
+      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();
+        }
+      }
       if(value){
         let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
         if(reg.test(value)){

src/views/smscheck/modules/TaskCheckList.vue

@@ -204,6 +204,7 @@
             <a-col :md="9" :sm="24">
               <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
               <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="danger" @click="transfer"   style="margin-left: 8px">转派</a-button>
 <!--              <a-button type="danger" @click="transfer"   style="margin-left: 8px">转派</a-button>-->
 
             </a-col>
@@ -555,7 +556,7 @@ export default {
         if (res.success) {
 
           this.statusList=res.result
-          this.visible = true;
+          //this.visible = true;
           return
         }
       })
@@ -618,10 +619,10 @@ export default {
         this.$message.warn('未选择需转派的数据!')
         return
       }
-      if ( this.orgCode===''){
-        this.$message.warn('部门不可为空!')
-        return
-      }
+      // if ( this.orgCode===''){
+      //   this.$message.warn('部门不可为空!')
+      //   return
+      // }
       let url = '/smsCheck/customerData/transfer';
       let params = {
         userId : this.selectedRowKeys2[0],

src/views/truckCheck/modules/TaskCheckList.vue

@@ -197,6 +197,7 @@
             <a-col :md="9" :sm="24">
               <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
               <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button type="danger" @click="transfer"   style="margin-left: 8px">转派</a-button>
               <!--              <a-button type="danger" @click="transfer"   style="margin-left: 8px">转派</a-button>-->
 
             </a-col>
@@ -542,7 +543,7 @@ export default {
           return
         }
       })
-      this.visible = true;
+      //this.visible = true;
 
     },
     showModal() {
@@ -601,10 +602,10 @@ export default {
         this.$message.warn('未选择需转派的数据!')
         return
       }
-      if ( this.orgCode===''){
-        this.$message.warn('部门不可为空!')
-        return
-      }
+      // if ( this.orgCode===''){
+      //   this.$message.warn('部门不可为空!')
+      //   return
+      // }
       let url = '/smsCheck/customerData/transfer';
       let params = {
         userId : this.selectedRowKeys2[0],