From 6d5807a11995300bef0fc37a7fd0ed1d3834e031 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 28 四月 2026 17:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/sysParams.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/sysParams.vue b/admin/src/views/business/sysParams.vue
index 4d975db..209942d 100644
--- a/admin/src/views/business/sysParams.vue
+++ b/admin/src/views/business/sysParams.vue
@@ -7,12 +7,30 @@
<div class="form-item">
<span class="label">鍙告満姣忔棩鍙彇娑堣鍗曟鏁颁负</span>
<el-input-number v-model="form.driverDailyCancelLimit" :min="0" controls-position="right"></el-input-number>
- <span class="desc">娆★紝瓒呰繃娆℃暟鍚庯紝浠婃棩涓嶅彲鎶㈠崟</span>
+ <span class="label">娆★紝瓒呰繃娆℃暟鍚庯紝浠婃棩涓嶅彲鎶㈠崟</span>
</div>
<div class="form-item">
<span class="label">鍙告満鏈�澶у悓鏃惰繘琛屼腑璁㈠崟鏁伴噺涓�</span>
<el-input-number v-model="form.orderAcceptLimit" :min="0" controls-position="right"></el-input-number>
- <span class="desc">涓紝瓒呰繃璇ユ暟閲忎笉鍏佽鎶㈠崟<span class="red">锛堝嵆璁㈠崟鐘舵��=寰呭彇浠�/閰嶉�佷腑锛�</span></span>
+ <span class="label">涓紝瓒呰繃璇ユ暟閲忎笉鍏佽鎶㈠崟<span class="red">锛堝嵆璁㈠崟鐘舵��=寰呭彇浠�/閰嶉�佷腑锛�</span></span>
+ </div>
+ <div class="form-item">
+ <span class="label">瀹㈡埛涓嬪崟鍚庢瘡闅�</span>
+ <el-input-number v-model="form.noGrabNotifyTime" :min="0" controls-position="right"></el-input-number>
+ <span class="label">鍒嗛挓鏈湁鍙告満鎶㈠崟锛岀郴缁熸帹閫佸钩鍙扮鐞嗗憳</span>
+ <el-select v-model="userIds" multiple clearable placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :label="item.realname"
+ :value="item.id+''" />
+ </el-select>
+ <span class="label">鎻愰啋鍔犳�ユ淳鍗曞鐞嗐��</span>
+ </div>
+ <div class="form-item">
+ <span class="label">闂ㄥ簵榛樿閰嶉�佽寖鍥�</span>
+ <el-input-number v-model="form.defaultDeliveryRange" :min="0" controls-position="right"></el-input-number>
+ <span class="label">锛堝叕閲岋級</span>
</div>
</div>
@@ -21,7 +39,7 @@
<div class="form-item">
<span class="label">瓒呮椂</span>
<el-input-number v-model="form.autoCancelTime" :min="0" controls-position="right"></el-input-number>
- <span class="desc">鍒嗛挓鏈敮浠橈紝璁㈠崟鑷姩鍙栨秷</span>
+ <span class="label">鍒嗛挓鏈敮浠橈紝璁㈠崟鑷姩鍙栨秷</span>
</div>
<div class="form-item">
<span class="label">鎬ラ�熻揪璁㈠崟璁′环绯绘暟</span>
@@ -33,19 +51,19 @@
<span class="desc">%</span>
</div>
<div class="form-item">
- <span class="label">寮傚湴瀵勯�佹ā寮忎笅锛岃嫢鐗╁搧宸查�佽揪锛岃�屽鎴峰綋澶╂湭鍙栦欢锛屽垯鍚庣画绯荤粺鎸�</span>
+ <span class="label">鍚屽煄瀵勯�佹ā寮忎笅锛岃嫢鐗╁搧宸查�佽揪锛岃�屽鎴峰綋澶╂湭鍙栦欢锛屽垯鍚庣画绯荤粺鎸�</span>
<el-input-number v-model="form.unpickedDiscount" :min="0" :precision="2" controls-position="right"></el-input-number>
<span class="desc">鎶樻墸绯绘暟璁＄畻</span>
</div>
<div class="form-item">
<span class="label">璁㈠崟閫佽揪鍚庨粯璁�</span>
<el-input-number v-model="form.autoConfirmReceipt" :min="0" controls-position="right"></el-input-number>
- <span class="desc">澶╁悗鑷姩纭鏀惰揣<span class="red">锛堜粎闄愭敹浠跺湴鍧�涓嶆槸鏈嶅姟鐐圭殑鎯呭喌锛�</span></span>
+ <span class="label">澶╁悗鑷姩纭鏀惰揣<span class="red">锛堜粎闄愭敹浠跺湴鍧�涓嶆槸鏈嶅姟鐐圭殑鎯呭喌锛�</span></span>
</div>
<div class="form-item">
<span class="label">璁㈠崟瀹屾垚鍚�</span>
<el-input-number v-model="form.settlementDate" :min="0" controls-position="right"></el-input-number>
- <span class="desc">澶╁悗绯荤粺缁撶畻璁㈠崟锛屽苟缁欎笌鍙備笌瑙掕壊鎸夋瘮渚嬪垎鎴�</span>
+ <span class="label">澶╁悗绯荤粺缁撶畻璁㈠崟锛屽苟缁欎笌鍙備笌瑙掕壊鎸夋瘮渚嬪垎鎴�</span>
</div>
</div>
@@ -60,6 +78,7 @@
<script>
import TableLayout from '@/layouts/TableLayout'
import { getParams, saveParams } from '@/api/business/sysParams'
+import { allList } from '@/api/system/user'
export default {
name: 'SysParams',
@@ -72,10 +91,15 @@
driverDailyCancelLimit: '',
insuranceRate: '',
orderAcceptLimit: '',
+ noGrabNotifyUsers: '',
+ noGrabNotifyTime: '',
+ defaultDeliveryRange: '',
settlementDate: '',
unpickedDiscount: '',
urgentCoefficient: ''
},
+ userIds: [],
+ userList: [],
isWorking: {
save: false
}
@@ -83,8 +107,16 @@
},
created () {
this.loadData()
+ this.loadUserlist()
},
methods: {
+ loadUserlist () {
+ allList().then(res => {
+ this.userList = res || []
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ },
loadData () {
getParams().then(res => {
this.form = {
@@ -92,10 +124,16 @@
autoConfirmReceipt: res.autoConfirmReceipt || '',
driverDailyCancelLimit: res.driverDailyCancelLimit || '',
insuranceRate: res.insuranceRate || '',
+ defaultDeliveryRange: res.defaultDeliveryRange || '',
+ noGrabNotifyTime: res.noGrabNotifyTime || '',
orderAcceptLimit: res.orderAcceptLimit || '',
+ noGrabNotifyUsers: res.noGrabNotifyUsers || '',
settlementDate: res.settlementDate || '',
unpickedDiscount: res.unpickedDiscount || '',
urgentCoefficient: res.urgentCoefficient || ''
+ }
+ if (this.form.noGrabNotifyUsers) {
+ this.userIds = this.form.noGrabNotifyUsers.split(',')
}
}).catch(e => {
this.$tip.apiFailed(e)
@@ -103,6 +141,10 @@
},
handleSave () {
this.isWorking.save = true
+ this.form.noGrabNotifyUsers = ''
+ if (this.userIds) {
+ this.form.noGrabNotifyUsers = this.userIds.join(',')
+ }
saveParams(this.form).then(res => {
this.$tip.apiSuccess(res || '淇濆瓨鎴愬姛')
}).catch(e => {
--
Gitblit v1.9.3