From 19d17f0f0fb02f46342d70b5180e40a0ad1b66d3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十一月 2023 18:16:13 +0800
Subject: [PATCH] MrShi
---
admin/src/components/business/OperaPriceConfigWindow.vue | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/admin/src/components/business/OperaPriceConfigWindow.vue b/admin/src/components/business/OperaPriceConfigWindow.vue
index 88b841f..574c1f9 100644
--- a/admin/src/components/business/OperaPriceConfigWindow.vue
+++ b/admin/src/components/business/OperaPriceConfigWindow.vue
@@ -6,11 +6,12 @@
width="600px"
@confirm="confirm"
>
-
+
<el-form :model="form" ref="form" :rules="rules" label-suffix="锛�">
<el-form-item label="杞﹀瀷鍚嶇О" prop="bikeTypeName">
{{ form.bikeTypeName }}
</el-form-item>
+<!-- base-->
<el-form-item label="宸ヤ綔鏃ヨ璐�" prop="base">
<el-select v-model="form.baseType" @change="selectBaseType">
<el-option
@@ -20,7 +21,7 @@
:value="item.id"
></el-option>
</el-select>
- <div class="setting" v-if="form.baseType == 1" style="display: flex;">
+ <div class="setting" v-if="form.baseType === 1" style="display: flex;">
<el-input v-model="form.basePrice" type="number" placeholder="" v-trim/>
鍏冿紝鐣呴獞涓�鏁村ぉ
</div>
@@ -74,36 +75,39 @@
components: { GlobalAlertWindow },
data () {
const baseRule = (rule, value, callback) => {
- if (this.form.baseType==1) {
- if (!this.form.basePrice || this.form.basePrice<0) {
- callback(new Error())
- } else {
+ if (this.form.baseType == 1) {
+ if (/^[1-9]\d*$|^0$/.test(this.form.basePrice)) {
callback()
+ } else {
+ callback(new Error())
}
} else {
- if (!this.form.basePrice || this.form.basePrice<0 || !this.form.baseTime || this.form.baseTime <0
- || !this.form.unitPrice || this.form.unitPrice<0 || !this.form.unitTime || this.form.unitTime <0
- ) {
- callback(new Error())
- } else {
+ if (
+ (/^[1-9]\d*$|^0$/.test(this.form.basePrice)) &&
+ (/^[1-9]\d*$|^0$/.test(this.form.baseTime)) &&
+ (/^[1-9]\d*$|^0$/.test(this.form.unitPrice)) &&
+ (/^[1-9]\d*$|^0$/.test(this.form.unitTime))) {
callback()
+ } else {
+ callback(new Error())
}
}
}
const holidayRule = (rule, value, callback) => {
- if (this.form.holidayBaseType==1) {
- if (!this.form.holidayBasePrice || this.form.holidayBasePrice<0) {
- callback(new Error())
- } else {
+ if (this.form.holidayBaseType === 1) {
+ if (/^[1-9]\d*$|^0$/.test(this.form.holidayBasePrice)) {
callback()
+ } else {
+ callback(new Error())
}
} else {
- if (!this.form.holidayBasePrice || this.form.holidayBasePrice<0 || !this.form.holidayBaseTime || this.form.holidayBaseTime <0
- || !this.form.holidayBasePrice || this.form.holidayBasePrice<0 || !this.form.holidayUnitTime || this.form.holidayUnitTime <0
- ) {
- callback(new Error())
- } else {
+ if (
+ (/^[1-9]\d*$|^0$/.test(this.form.holidayBasePrice)) &&
+ (/^[1-9]\d*$|^0$/.test(this.form.holidayBaseTime)) &&
+ (/^[1-9]\d*$|^0$/.test(this.form.holidayUnitTime))) {
callback()
+ } else {
+ callback(new Error())
}
}
}
@@ -111,8 +115,8 @@
// 琛ㄥ崟鏁版嵁
form: {
id: null,
- pricePramId: null,
- bikeTypeId: null,
+ pricePramId: '',
+ bikeTypeId: '',
bikeTypeName: '',
baseType: '',
baseTime: '',
@@ -139,10 +143,10 @@
{ required: true, validator: holidayRule, message: '璇峰畬鍠勮妭鍋囨棩璁′环淇℃伅', tigger: 'blur'},
]
},
-
+
}
},
-
+
methods: {
/**
* 鎵撳紑绐楀彛
@@ -165,9 +169,8 @@
for (const key in this.form) {
this.form[key] = target[key]
}
- this.form.baseType = target.baseTime==-1 ? 1 : 2
- this.form.holidayBaseType = target.holidayBaseTime==-1 ? 1 : 2
-
+ this.form.baseType = target.baseTime === -1 ? 1 : 2
+ this.form.holidayBaseType = target.holidayBaseTime === -1 ? 1 : 2
// this.form.backReason = ''
// this.form.backInfo = ''
// this.$refs.form.clearValidate()
--
Gitblit v1.9.3