From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/components/Edit.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/combo/components/Edit.vue b/admin/src/views/combo/components/Edit.vue
index 51b16fd..ee6f0a0 100644
--- a/admin/src/views/combo/components/Edit.vue
+++ b/admin/src/views/combo/components/Edit.vue
@@ -100,13 +100,13 @@
</div>
</el-form-item>
<el-form-item label="鎬婚檺棰�">
- <el-input class="w400" v-model="param.saleLimit" oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 12)"
+ <el-input class="w400" v-model="param.saleLimit" oninput="value=value.replace(/^(-1+)|[^\d]+/g, '').slice(0, 12)"
placeholder="璇疯緭鍏ユ�诲彂鍞暟閲�" v-trim />
<div class="placeholder9">璇疯緭鍏ユ�诲彂鍞暟閲忥紝閿�閲忓ぇ浜庤鏁伴噺鍚庯紝涓嶅啀鏀寔閿�鍞紱涓虹┖琛ㄧず涓嶉檺鍒�</div>
</el-form-item>
<el-form-item label="鏃ラ檺棰�">
<el-input class="w400" v-model="param.saleDayLimit"
- oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 12)" placeholder="璇疯緭鍏ュ崟鏃ュ彂鍞暟閲�" v-trim />
+ oninput="value=value.replace(/^(-1+)|[^\d]+/g, '').slice(0, 12)" placeholder="璇疯緭鍏ュ崟鏃ュ彂鍞暟閲�" v-trim />
<div class="placeholder9">璇疯緭鍏ユ棩鍙戝敭鏁伴噺锛屽綋鏃ラ攢閲忓ぇ浜庤鏁伴噺鍚庯紝涓嶅啀鏀寔閿�鍞紱涓虹┖琛ㄧず涓嶉檺鍒�</div>
</el-form-item>
@@ -227,10 +227,10 @@
comboDetailPost(id).then(res => {
this.param = res
this.$set(this.param, 'saleDate', [res.startDate, res.endDate])
- if (res.useStartDate && res.useEndDate) {
+ if (res.useStartDate && res.useEndDate && res.type != 0) {
this.$set(this.param, 'useDate', [res.useStartDate, res.useEndDate])
}
- this.$set(this.param, id, type == 'copy' ? null : this.param.id)
+ this.$set(this.param, 'id', type == 'copy' ? null : this.param.id)
})
},
}
--
Gitblit v1.9.3