From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/components/business/backGoodsorderWindow.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/backGoodsorderWindow.vue b/admin/src/components/business/backGoodsorderWindow.vue
index cb98785..f86407e 100644
--- a/admin/src/components/business/backGoodsorderWindow.vue
+++ b/admin/src/components/business/backGoodsorderWindow.vue
@@ -12,10 +12,10 @@
<el-descriptions-item label="宸查��閲戦">{{ form.hasRefundMoney }}鍏�</el-descriptions-item>
<el-descriptions-item label="鍙��閲戦">{{ form.canBanlanceMoney }}鍏�</el-descriptions-item>
</el-descriptions>
- <el-form :model="form" ref="form" :rules="rules" label-suffix="锛�">
+ <el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�">
<el-form-item label="閫�娆鹃噾棰�" prop="money">
<div style="display: flex;">
- <el-input style="flex: 1;" v-model="form.money" placeholder="璇疯緭鍏ラ��娆鹃噾棰�" v-trim/>
+ <el-input style="flex: 1;" v-model="form.money" type="number" placeholder="璇疯緭鍏ラ��娆鹃噾棰�" v-trim/>
</div>
</el-form-item>
<el-form-item label="閫�娆惧師鍥�" prop="reason">
@@ -23,7 +23,7 @@
type="textarea"
:autosize="{ minRows: 2, maxRows: 4}"
v-model="form.reason"
- placeholder="璇疯緭鍏ヨ皟鏁村娉�"
+ placeholder="璇疯緭鍏ラ��娆惧師鍥�"
v-trim
/>
</el-form-item>
@@ -41,6 +41,13 @@
extends: BaseOpera,
components: { GlobalAlertWindow },
data () {
+ const moneyRule = (rule, value, callback) => {
+ if (value <=0 ) {
+ callback(new Error('閫�娆鹃噾棰濆繀椤诲ぇ浜�0'))
+ } else {
+ callback()
+ }
+ }
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -55,8 +62,8 @@
},
// 楠岃瘉瑙勫垯
rules: {
- duration: [
- { required: true, validator: numRule, message: '璇疯緭鍏ラ��娆鹃噾棰�', tigger: 'blur' }
+ money: [
+ { required: true, validator: moneyRule, tigger: 'blur' }
]
},
--
Gitblit v1.9.3