From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/views/business/sysParams.vue | 153 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 54 deletions(-)
diff --git a/admin/src/views/business/sysParams.vue b/admin/src/views/business/sysParams.vue
index 5fbf631..de0cddd 100644
--- a/admin/src/views/business/sysParams.vue
+++ b/admin/src/views/business/sysParams.vue
@@ -1,65 +1,76 @@
<template>
<TableLayout>
<template v-slot:table-wrap>
- <div class="params-container">
- <div class="section">
- <h3 class="section-title">鍙告満瑙勫垯</h3>
- <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="label">娆★紝瓒呰繃娆℃暟鍚庯紝浠婃棩涓嶅彲鎶㈠崟</span>
+ <div class="params-container" :style="' height: '+contentHeight+'px;'">
+ <div class="section">
+ <h3 class="section-title">鍙告満瑙勫垯</h3>
+ <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="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="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>
- <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="label">涓紝瓒呰繃璇ユ暟閲忎笉鍏佽鎶㈠崟<span class="red">锛堝嵆璁㈠崟鐘舵��=寰呭彇浠�/閰嶉�佷腑锛�</span></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="label">鍒嗛挓鏈湁鍙告満鎶㈠崟锛岀郴缁熸帹閫佸钩鍙扮鐞嗗憳</span>
- <el-input-number v-model="form.orderAcceptLimit" :min="0" controls-position="right"></el-input-number>
- <span class="label">鎻愰啋鍔犳�ユ淳鍗曞鐞嗐��</span>
- </div>
- </div>
- <div class="section">
- <h3 class="section-title">璁㈠崟瑙勫垯</h3>
- <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="label">鍒嗛挓鏈敮浠橈紝璁㈠崟鑷姩鍙栨秷</span>
+ <div class="section">
+ <h3 class="section-title">璁㈠崟瑙勫垯</h3>
+ <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="label">鍒嗛挓鏈敮浠橈紝璁㈠崟鑷姩鍙栨秷</span>
+ </div>
+ <div class="form-item">
+ <span class="label">鎬ラ�熻揪璁㈠崟璁′环绯绘暟</span>
+ <el-input-number v-model="form.urgentCoefficient" :min="0" :precision="2" controls-position="right"></el-input-number>
+ </div>
+ <div class="form-item">
+ <span class="label">鐗╁搧淇濊垂姣斾緥</span>
+ <el-input-number v-model="form.insuranceRate" :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.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="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="label">澶╁悗绯荤粺缁撶畻璁㈠崟锛屽苟缁欎笌鍙備笌瑙掕壊鎸夋瘮渚嬪垎鎴�</span>
+ </div>
</div>
- <div class="form-item">
- <span class="label">鎬ラ�熻揪璁㈠崟璁′环绯绘暟</span>
- <el-input-number v-model="form.urgentCoefficient" :min="0" :precision="2" controls-position="right"></el-input-number>
- </div>
- <div class="form-item">
- <span class="label">鐗╁搧淇濊垂姣斾緥</span>
- <el-input-number v-model="form.insuranceRate" :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.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="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="label">澶╁悗绯荤粺缁撶畻璁㈠崟锛屽苟缁欎笌鍙備笌瑙掕壊鎸夋瘮渚嬪垎鎴�</span>
- </div>
- </div>
- <div class="footer">
- <el-button type="primary" @click="handleSave" :loading="isWorking.save">淇濆瓨</el-button>
+ <div class="footer">
+ <el-button type="primary" @click="handleSave" :loading="isWorking.save">淇濆瓨</el-button>
+ </div>
</div>
- </div>
</template>
</TableLayout>
</template>
@@ -67,22 +78,29 @@
<script>
import TableLayout from '@/layouts/TableLayout'
import { getParams, saveParams } from '@/api/business/sysParams'
+import { allList } from '@/api/system/user'
export default {
name: 'SysParams',
components: { TableLayout },
data () {
return {
+ contentHeight: 600,
form: {
autoCancelTime: '',
autoConfirmReceipt: '',
driverDailyCancelLimit: '',
insuranceRate: '',
orderAcceptLimit: '',
+ noGrabNotifyUsers: '',
+ noGrabNotifyTime: '',
+ defaultDeliveryRange: '',
settlementDate: '',
unpickedDiscount: '',
urgentCoefficient: ''
},
+ userIds: [],
+ userList: [],
isWorking: {
save: false
}
@@ -90,8 +108,17 @@
},
created () {
this.loadData()
+ this.loadUserlist()
+ this.contentHeight = window.innerHeight -110;
},
methods: {
+ loadUserlist () {
+ allList().then(res => {
+ this.userList = res || []
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ },
loadData () {
getParams().then(res => {
this.form = {
@@ -99,10 +126,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)
@@ -110,6 +143,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 => {
@@ -125,6 +162,14 @@
<style scoped>
.params-container {
padding: 20px;
+ overflow: auto;
+ display: block;
+}
+/deep/ .el-main{
+ width: 100%;
+//height: 100%;
+ overflow-y: auto !important ;
+ height: calc(100% - 94px);
}
.section {
margin-bottom: 40px;
--
Gitblit v1.9.3