From 5ab6d86bd921830edf180a21bca9cf9a6eb3c0a8 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Thu, 15 May 2025 21:26:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E9=A2=84=E5=94=AE=E7=9A=84=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../presale/products/popup/add-or-update.vue | 115 +++++++++++++++---
1 file changed, 97 insertions(+), 18 deletions(-)
diff --git a/src/views/modules/presale/products/popup/add-or-update.vue b/src/views/modules/presale/products/popup/add-or-update.vue
index 4493216..00ea79d 100644
--- a/src/views/modules/presale/products/popup/add-or-update.vue
+++ b/src/views/modules/presale/products/popup/add-or-update.vue
@@ -22,6 +22,7 @@
@change="getOrderTime"
format="yyyy-MM-dd HH:mm"
data-format="yyyy-MM-dd HH:mm"
+ popper-class="show-time-hint"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="orderTime"
type="datetimerange"
@@ -44,6 +45,7 @@
data-format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="arrears"
+ popper-class="show-time-hint"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
@@ -63,6 +65,7 @@
value-format="yyyy-MM-dd HH:mm:ss"
@change="deliveryTime"
v-model="delivery"
+ popper-class="show-time-hint"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
@@ -70,7 +73,9 @@
:picker-options="pickerOptions3"
>
-
顾客支付定金时、可对此区间的日期进行预约,卖家须在顾客已选预约日进行发货
+
+ 顾客支付定金时、可对此区间的日期进行预约,卖家须在顾客已选预约日进行发货
+
@@ -178,7 +183,8 @@
{{
- Number(scope.row.presalePrice) && Number(scope.row.earnestMoney)
+ Number(scope.row.presalePrice) &&
+ Number(scope.row.earnestMoney)
? parseFloat(
String(
scope.row.presalePrice - scope.row.earnestMoney
@@ -290,7 +297,8 @@
v-if="scope.row.isAdvanceSell"
@change="
scope.row.balancePayment =
- Number(scope.row.presalePrice) && Number(scope.row.earnestMoney)
+ Number(scope.row.presalePrice) &&
+ Number(scope.row.earnestMoney)
? parseFloat(
String(
scope.row.presalePrice -
@@ -314,7 +322,8 @@
{
if (valid) {
console.log(valid)
- if (dayjs(this.ruleForm.startTime).isAfter(dayjs(this.ruleForm.balancePaymentStartTime))) {
- this.$message.error('付尾款开始时间必须大于等于定金开始时间')
+ if (
+ dayjs(this.ruleForm.startTime).isAfter(
+ dayjs(this.ruleForm.balancePaymentStartTime)
+ )
+ ) {
+ this.$message.error(
+ '付尾款开始时间必须大于等于定金开始时间'
+ )
return
}
- if (dayjs(this.ruleForm.endTime).isAfter(dayjs(this.ruleForm.balancePaymentEndTime))) {
- this.$message.error('付尾款结束时间必须大于等于定金结束时间')
+ if (
+ dayjs(this.ruleForm.endTime).isAfter(
+ dayjs(this.ruleForm.balancePaymentEndTime)
+ )
+ ) {
+ this.$message.error(
+ '付尾款结束时间必须大于等于定金结束时间'
+ )
return
}
if (
@@ -712,12 +743,24 @@ export default {
} else {
this.$refs.ruleForm.validate(valid => {
if (valid) {
- if (dayjs(this.ruleForm.startTime).isAfter(dayjs(this.ruleForm.balancePaymentStartTime))) {
- this.$message.error('付尾款开始时间必须大于等于定金开始时间')
+ if (
+ dayjs(this.ruleForm.startTime).isAfter(
+ dayjs(this.ruleForm.balancePaymentStartTime)
+ )
+ ) {
+ this.$message.error(
+ '付尾款开始时间必须大于等于定金开始时间'
+ )
return
}
- if (dayjs(this.ruleForm.endTime).isAfter(dayjs(this.ruleForm.balancePaymentEndTime))) {
- this.$message.error('付尾款结束时间必须大于等于定金结束时间')
+ if (
+ dayjs(this.ruleForm.endTime).isAfter(
+ dayjs(this.ruleForm.balancePaymentEndTime)
+ )
+ ) {
+ this.$message.error(
+ '付尾款结束时间必须大于等于定金结束时间'
+ )
return
}
console.log(valid)
@@ -778,4 +821,40 @@ export default {
asyncComputed: {}
}
-
+