From 47a7c6d2458ebd3c4722cbd1938d3f28a99e78ad Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 26 四月 2024 15:03:42 +0800
Subject: [PATCH] qxtj
---
src/views/reservation/reservations/index.vue | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 57af5f6..dda05d6 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -49,6 +49,7 @@
<template slot-scope="scope">
<span v-if="scope.row.sex == '0'">鐢�</span>
<span v-if="scope.row.sex == '1'">濂�</span>
+ <span v-if="scope.row.sex == '2'">鏈煡</span>
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="age" width="60px" :show-overflow-tooltip="true" />
@@ -276,7 +277,7 @@
<!-- <div class="tab1"> -->
<!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></el-input>
+ <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 " disabled style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="浼樻儬鎶樻墸">
<!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
@@ -284,7 +285,7 @@
:step="0.1" :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px"></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px" disabled></el-input>
</el-form-item>
<el-form-item>
@@ -315,9 +316,9 @@
item.parentName +
" (搴旀敹閲戦:" +
item.ordPrice +
- ".00鍏� / 瀹炴敹閲戦:" +
+ " / 瀹炴敹閲戦:" +
item.nowPrice +
- ".00鍏�)"
+ "鍏�)"
}}
</template>
<el-table :data="item.list" border style="width: 100%" height="270">
@@ -348,7 +349,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
@@ -368,7 +369,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
@@ -522,7 +523,7 @@
<el-form-item label="鍗″彿" prop="indexCard">
<el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
</el-form-item>
- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+ <!-- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button> -->
</el-form>
</div>
@@ -615,7 +616,7 @@
<!-- <div class="tab1"> -->
<!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></el-input>
+ <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1" disabled style="width: 160px"></el-input>
</el-form-item>
<el-form-item label="浼樻儬鎶樻墸">
<!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
@@ -627,7 +628,7 @@
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">棰勭害淇敼</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
@@ -667,7 +668,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
@@ -690,7 +691,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
@@ -710,7 +711,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
@@ -749,6 +750,17 @@
"sys_user_sex", "dict_team", "tj_time_region", "dict_tjtype", "dict_job",
"dict_user_cardtype", "dict_ageunit",],
data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ console.log( value)
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback('');
+ } else if(value != undefined && value != ""){
+ return callback();
+ }else if (!patter.test(value)) {
+ return callback('');
+ }
+ };
return {
isfalse: false,
tijiao1: true,
@@ -876,24 +888,24 @@
fmobj: {},
// 琛ㄥ崟鏍￠獙
rules: {
- cusName: [{ required: true, message: "濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
+ cusName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
cusSex: [
- { required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
cusBrithday: [
- { required: true, message: "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// cusAddr: [
// { required: true, message: "鐜板眳浣忓湴鍧�涓嶈兘涓虹┖", trigger: "blur" },
// ],
cusPhone: [
- { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
reservationTime: [
- { required: true, message: "棰勭害鏃ユ湡涓嶈兘涓虹┖", trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
timeRegion: [
- { required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
},
options: [
@@ -947,21 +959,21 @@
name: [
{
required: true,
- message: "濮撳悕涓嶈兘涓虹┖",
+ validator: checkPhoneNum,
trigger: "blur",
},
],
idCard: [
{
required: true,
- message: "韬唤璇佸彿涓嶈兘涓虹┖",
+ validator: checkPhoneNum,
trigger: "blur",
},
],
phoe: [
{
required: true,
- message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖",
+ validator: checkPhoneNum,
trigger: "blur",
},
],
--
Gitblit v1.8.0