修改 无个人桩时 隐藏 以及 兜底检验

jsowell-ui/src/views/member/info/detail.vue

@@ -52,7 +52,7 @@
           </el-card>
         </div>
 
-        <div class="advContent" >
+        <div class="advContent" v-if="personalPileInfoList">
           <el-card class="box-card" shadow="hover">
             <div slot="header" class="clearfix">
               <span>个人桩信息</span>
@@ -252,18 +252,18 @@
     </el-row>
 
     <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
-      <el-form ref="form" :model="form" label-width="150px" label-position="right">
+      <el-form ref="form" :rules="rules" :model="form" label-width="150px" label-position="right">
 <!--        <el-form-item label="会员id" prop="memberId" >-->
 <!--          <el-input v-model="form.memberId" placeholder="memberId" />-->
 <!--        </el-form-item>-->
-        <el-form-item label="车牌号" prop="toUpdatePlateNumber">
+        <el-form-item label="车牌号" prop="plateNumber">
           <el-input v-model="form.plateNumber"  placeholder="请输入车牌号" />
         </el-form-item>
+        <el-form-item style="display: flex">
+          <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+          <el-button @click="cancel('form')">取 消</el-button>
+        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
     </el-dialog>
 
   </div>
@@ -284,7 +284,23 @@ export default {
   components: {Template},
   dicts: ['order_status', 'start_mode', 'pay_mode', 'pay_status', 'pile_status'],
   data() {
+    const plateNumber = (rule,value,callback) =>{
+      const re = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
+      if(!value) {
+        return callback(new Error('车牌号不能为空'))
+      }
+      setTimeout(() =>{
+        if(re.test(value)){
+          callback()
+        } else{
+          callback(new Error('请输入正确的车牌号'))
+        }
+      },100)
+    }
     return {
+      rules:{
+        plateNumber:[{validator:plateNumber,trigger:'blur',required:true}]
+      },
       memberId: this.$route.params.memberId,
       // 会员信息
       memberInfo: {},
@@ -357,29 +373,33 @@ export default {
     // 修改车牌号
     handleUpdate(plateNumber){
       this.reset()
-      this.title = '修改车牌号信息'
+      this.title = '修改车牌号信息(请输入大写)'
       this.open = true;
       // this.form.plateNumber = plateNumber;
       this.$set(this.form,'plateNumber',plateNumber)
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm(form) {
-      if (!this.checkPlateNumber(this.form.plateNumber)) {
+      // if (!this.checkPlateNumber(this.form.plateNumber)) {
-        this.$message('请输入正确的车牌号码');
+      //   this.$message('请输入正确的车牌号码');
-        return;
+      //   return;
-      }
+      // }
       const param = {
         memberId: this.memberId,
         licensePlateNumber: this.form.plateNumber
       }
       console.log("form:", this.form);
-      this.$refs['form'].validate((valid) => {
+      this.$refs.form.validate((valid) => {
-        updatePlateNumber(param).then((response) => {
+        if(valid){
-          this.$modal.msgSuccess('修改成功')
+          updatePlateNumber(param).then((response) => {
-          this.reset()
+            this.$modal.msgSuccess('修改成功')
-          this.open = false
+            this.reset()
-          this.getMemberInfo()
+            this.open = false
-        })
+            this.getMemberInfo()
+          })
+        } else{
+          return false
+        }
       })
     },
     // 取消按钮
@@ -454,7 +474,7 @@ export default {
     },
     // 车牌号校验
     checkPlateNumber (plateNumber) {
-      const re = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DGF]$)|([DGF][A-HJ-NP-Z0-9][0-9]{4}$))/
+      const re = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
       const reg = new RegExp(re)
       return reg.test(plateNumber)
     },