From 777bcb6c5660c0ed14d85207377b62b779d81dde Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/views/business/sysParams.vue | 109 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 20 deletions(-)
diff --git a/admin/src/views/business/sysParams.vue b/admin/src/views/business/sysParams.vue
index a20b6e0..9c38446 100644
--- a/admin/src/views/business/sysParams.vue
+++ b/admin/src/views/business/sysParams.vue
@@ -69,31 +69,68 @@
<h3 class="section-title">浼樻儬鍒稿彂鏀捐鍒�</h3>
<div class="form-item">
<span class="label">涓嬪崟鏁伴噺姣忔弧</span>
- <el-input-number v-model="form.orderCouponOrderCount" :min="0" controls-position="right"></el-input-number>
+ <el-input-number v-model="form.orderCouponOrderCount" :min="1" controls-position="right"></el-input-number>
<span class="label">鍗曪紝鑷冲</span>
- <el-input-number v-model="form.orderCouponGiftCount" :min="0" controls-position="right"></el-input-number>
+ <el-input-number v-model="form.orderCouponGiftCount" :min="1" controls-position="right"></el-input-number>
<span class="label">娆★紝骞冲彴璧犻�佷紭鎯犲埜 </span>
- <el-select v-model="form.orderCouponId" multiple style="width: 130px;" placeholder="浼樻儬鍒�">
+ <el-select v-model="form.orderCouponId" style="width: 130px;" placeholder="浼樻儬鍒�">
<el-option v-for="item in couponList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
<span class="label"><span class="red">锛堜互琛屾潕宸插瘎瀛橀棬搴椾负鍑嗭紝鍗充究閫�鍗曚害涓嶆敹鍥烇紝榛樿姣忔鍙戞斁1寮狅級</span></span>
</div>
<div class="form-item">
<span class="label">浼氬憳娉ㄥ唽姣忔弧</span>
- <el-input-number v-model="form.registerCouponYears" :min="0" controls-position="right"></el-input-number>
+ <el-input-number v-model="form.registerCouponYears" :min="1" controls-position="right"></el-input-number>
<span class="label">骞达紝鑷冲</span>
- <el-input-number v-model="form.registerCouponGiftCount" :min="0" controls-position="right"></el-input-number>
+ <el-input-number v-model="form.registerCouponGiftCount" :min="1" controls-position="right"></el-input-number>
<span class="label">娆★紝骞冲彴璧犻�佷紭鎯犲埜 </span>
- <el-select v-model="form.registerCouponId" multiple style="width: 130px;" placeholder="浼樻儬鍒�">
+ <el-select v-model="form.registerCouponId" style="width: 130px;" placeholder="浼樻儬鍒�">
<el-option v-for="item in couponList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
<span class="label"><span class="red">锛堟寜娉ㄥ唽鏃堕棿锛屾棤璁轰細鍛樻槸鍚︿笅鍗曪紱榛樿姣忔鍙戞斁1寮狅級</span></span>
</div>
<div class="form-item">
<span class="label">鏂版敞鍐屼細鍛橀�佸钩鍙拌禒閫佷紭鎯犲埜</span>
- <el-select v-model="form.registerGiftCouponIds" multiple style="width: 130px;" placeholder="浼樻儬鍒�">
+ <el-select v-model="form.registerGiftCouponId" style="width: 130px;" placeholder="浼樻儬鍒�">
<el-option v-for="item in couponList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
+ </div>
+ </div>
+
+ <div class="section">
+ <h3 class="section-title">寮�绁ㄨ鍒�</h3>
+ <div class="form-item">
+ <span class="label">瓒呮椂</span>
+ <el-input-number v-model="form.invoiceMonthLimit" :min="1" controls-position="right"></el-input-number>
+ <span class="label">涓湀鐨勮鍗曚笉鍏佽寮�鍙戠エ</span>
+ </div>
+ </div>
+
+ <div class="section">
+ <h3 class="section-title">鍙告満濂栧姳瑙勫垯</h3>
+ <div class="table-container">
+ <el-table :data="driverRewardList" border style="width: 100%">
+ <el-table-column prop="registerRewardAmount" label="娉ㄥ唽濂栧姳锛堝厓/鍗曪級">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.registerRewardAmount" :min="1" controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column prop="registerRewardOrderCount" label="娉ㄥ唽濂栧姳鍗曟暟">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.registerRewardOrderCount" :min="1" controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column prop="platformRewardAmount" label="骞冲彴濂栧姳锛堝厓/鍗曪級">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.platformRewardAmount" :min="1" controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column prop="platformRewardOrderCount" label="骞冲彴濂栧姳鍗曟暟">
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.platformRewardOrderCount" :min="1" controls-position="right"></el-input-number>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
</div>
@@ -115,10 +152,15 @@
data () {
return {
contentHeight: 600,
+ driverRewardList: [],
form: {
- autoCancelTime: '',
- autoConfirmReceipt: '',
- driverDailyCancelLimit: '',
+ autoCancelTime: '',
+ autoConfirmReceipt: '',
+ registerRewardAmount: 0,
+ registerRewardOrderCount: 0,
+ platformRewardAmount: 0,
+ platformRewardOrderCount: 0,
+ driverDailyCancelLimit: '',
insuranceRate: '',
orderAcceptLimit: '',
noGrabNotifyUsers: '',
@@ -131,9 +173,10 @@
orderCouponGiftCount: '',
registerCouponYears: '',
registerCouponGiftCount: '',
- orderCouponId: [],
- registerCouponId: [],
- registerGiftCouponIds: []
+ orderCouponId: null,
+ registerCouponId: null,
+ registerGiftCouponIds: null,
+ invoiceMonthLimit: ''
},
couponList: [],
userIds: [],
@@ -183,10 +226,22 @@
orderCouponGiftCount: res.orderCouponGiftCount || '',
registerCouponYears: res.registerCouponYears || '',
registerCouponGiftCount: res.registerCouponGiftCount || '',
- orderCouponId: res.orderCouponId ? res.orderCouponId.split(',').map(item => Number(item)) : [],
- registerCouponId: res.registerCouponId ? res.registerCouponId.split(',').map(item => Number(item)) : [],
- registerGiftCouponIds: res.registerGiftCouponIds ? res.registerGiftCouponIds.split(',').map(item => Number(item)) : []
+ orderCouponId: res.orderCouponId ? Number(res.orderCouponId) : null,
+ registerCouponId: res.registerCouponId ? Number(res.registerCouponId) : null,
+ registerGiftCouponIds: res.registerGiftCouponIds ? Number(res.registerGiftCouponIds) : '',
+ registerRewardAmount: res.registerRewardAmount || 0,
+ registerRewardOrderCount: res.registerRewardOrderCount || 0,
+ platformRewardAmount: res.platformRewardAmount || 0,
+ platformRewardOrderCount: res.platformRewardOrderCount || 0,
+ invoiceMonthLimit: res.invoiceMonthLimit || ''
}
+ // 鍒濆鍖栧徃鏈哄鍔辫鍒欒〃鏍兼暟鎹�
+ this.driverRewardList = [{
+ registerRewardAmount: this.form.registerRewardAmount || 0,
+ registerRewardOrderCount: this.form.registerRewardOrderCount || 0,
+ platformRewardAmount: this.form.platformRewardAmount || 0,
+ platformRewardOrderCount: this.form.platformRewardOrderCount || 0
+ }]
if (this.form.noGrabNotifyUsers) {
this.userIds = this.form.noGrabNotifyUsers.split(',')
}
@@ -201,10 +256,24 @@
submitForm.noGrabNotifyUsers = ''
if (this.userIds) {
submitForm.noGrabNotifyUsers = this.userIds.join(',')
- }
- submitForm.orderCouponId = submitForm.orderCouponId.join(',')
- submitForm.registerCouponId = submitForm.registerCouponId.join(',')
- submitForm.registerGiftCouponIds = submitForm.registerGiftCouponIds.join(',')
+ }
+ // 鍚屾鍙告満濂栧姳琛ㄦ牸鏁版嵁鍒拌〃鍗�
+ if (this.driverRewardList.length > 0) {
+ const rewardData = this.driverRewardList[0]
+ submitForm.registerRewardAmount = rewardData.registerRewardAmount
+ submitForm.registerRewardOrderCount = rewardData.registerRewardOrderCount
+ submitForm.platformRewardAmount = rewardData.platformRewardAmount
+ submitForm.platformRewardOrderCount = rewardData.platformRewardOrderCount
+ }
+ if (submitForm.orderCouponId) {
+ submitForm.orderCouponId = String(submitForm.orderCouponId)
+ }
+ if (submitForm.registerCouponId) {
+ submitForm.registerCouponId = String(submitForm.registerCouponId)
+ }
+ // if (submitForm.registerGiftCouponIds) {
+ // submitForm.registerGiftCouponIds = submitForm.registerGiftCouponIds
+ // }
saveParams(submitForm).then(res => {
this.$tip.apiSuccess(res || '淇濆瓨鎴愬姛')
}).catch(e => {
--
Gitblit v1.9.3