Commit 50b410bf authored by lixy's avatar lixy

手机号验证、预约中

parent 8ba4a963
...@@ -902,7 +902,7 @@ ...@@ -902,7 +902,7 @@
item.vehicleBookRecord.map(function (iitem) { item.vehicleBookRecord.map(function (iitem) {
if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) { if (iitem.bookStartDate <= tt && iitem.bookEndDate >=tt) {
// <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用--> // <!--bookType 2-分公司使用、1-租车、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4)){//租车、旅游、展览显示起止时间 if(iitem.bookStartDate == tt && (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4) && iitem.status == 2){//租车、旅游、展览显示起止时间
pp.timeStr = h; pp.timeStr = h;
} }
if(iitem.status == 1){ if(iitem.status == 1){
...@@ -913,7 +913,7 @@ ...@@ -913,7 +913,7 @@
} }
pp.vehicleBookRecord = iitem; pp.vehicleBookRecord = iitem;
pp.bookType = iitem.bookType; pp.bookType = iitem.bookType;
if(iitem.bookEndDate == tt){ if(iitem.bookEndDate == tt && iitem.status == 2){
if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){ if (iitem.bookType == 1 || iitem.bookType == 5 || iitem.bookType == 4){
pp.timeEtr = h; pp.timeEtr = h;
if(h == "00"){ if(h == "00"){
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<el-input v-model="form.vehicleUsername" placeholder="请输入使用人"></el-input> <el-input v-model="form.vehicleUsername" placeholder="请输入使用人"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="使用人联系方式" prop="vehicleUserPhone"> <el-form-item label="使用人联系方式" prop="vehicleUserPhone">
<el-input v-model="form.vehicleUserPhone" placeholder="请输入使用人联系方式"></el-input> <el-input v-model="form.vehicleUserPhone" type="number" placeholder="请输入使用人联系方式"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="说明"> <el-form-item label="说明">
<el-input v-model="form.remark" :rows="3" placeholder="请输入说明"></el-input> <el-input v-model="form.remark" :rows="3" placeholder="请输入说明"></el-input>
...@@ -121,6 +121,19 @@ ...@@ -121,6 +121,19 @@
props: ["currentItem"], props: ["currentItem"],
name: 'vehiclePlanModal', name: 'vehiclePlanModal',
data() { data() {
var checkPhone = (rule, value, callback) => {
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
} else {
return callback(new Error('请输入正确的手机号'));
}
}
};
return { return {
pickerOptions0: { pickerOptions0: {
disabledDate(time) { disabledDate(time) {
...@@ -161,12 +174,7 @@ ...@@ -161,12 +174,7 @@
message: '请选择还车公司', message: '请选择还车公司',
trigger: 'change' trigger: 'change'
}, },
vehicleUserPhone:{ vehicleUserPhone:{validator: checkPhone, trigger: 'blur',required: true},
type: 'string',
required: true,
message: '请输入使用人联系方式',
trigger: 'blur'
},
bookType:{ bookType:{
type: 'string', type: 'string',
required: true, required: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment