From a0708d365b30d638e239661214016dc14a6c76f7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 18:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/orderSet.vue | 86 +++++++++++++++++++-----------------------
1 files changed, 39 insertions(+), 47 deletions(-)
diff --git a/admin/src/views/business/orderSet.vue b/admin/src/views/business/orderSet.vue
index 7f04bf9..dab87ff 100644
--- a/admin/src/views/business/orderSet.vue
+++ b/admin/src/views/business/orderSet.vue
@@ -1,83 +1,84 @@
<template>
<div class="box" style="max-height:calc(100% - 60px);margin-bottom:50px;overflow-y: auto" >
- <el-form :model="form" ref="form" label-width="140px">
- <div style="margin: 0px 0 50px 0">
+ <el-form :model="form" ref="form">
+ <div style="margin: 20px 0 20px 0;background-color: rgba(140,147,157,0.61)">
<span style="font-size: 15px; font-weight: bold">銆�1銆戝彂鍗曟柟鍙栨秷璁㈠崟閰嶇疆</span>
</div>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="releaseCancelTime">
鎺ュ崟鍚庯紝璺濈浠诲姟寮�濮嬪墠
<el-input
- style="width: 100px;margin: 0px 20px"
+ style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.releaseCancelTime"
placeholder="璇疯緭鍏�"
v-trim
/>灏忔椂锛屼笉鍙彇娑�
</el-form-item>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="releaseCancelTimes">
姣忔棩鍙富鍔ㄥ彇娑�
<el-input
style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.releaseCancelTimes"
placeholder="璇疯緭鍏�"
v-trim
/>娆�<span style="font-size: 12px;color: #8c939d">锛堟敞锛氳鍗曟帴鍗曞悗鍙彇娑堟椂闂磋寖鍥村唴锛�</span>
</el-form-item>
- <div style="margin:20px 0 50px 0">
+ <div style="margin:50px 0 20px 0;background-color: rgba(140,147,157,0.61)">
<span style="font-size: 15px; font-weight: bold">銆�2銆戞帴鍗曟柟鍙栨秷璁㈠崟閰嶇疆锛�</span>
</div>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="receiveCancelTime">
鎺ュ崟鍚庯紝璺濈浠诲姟寮�濮嬪墠
<el-input
style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.receiveCancelTime"
placeholder="璇疯緭鍏�"
v-trim
/>灏忔椂锛屼笉鍙彇娑�
</el-form-item>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="receiveCancelTimes">
姣忔棩鍙富鍔ㄥ彇娑�
<el-input
style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.receiveCancelTimes"
placeholder="璇疯緭鍏�"
v-trim
/>娆�<span style="font-size: 12px;color: #8c939d">锛堟敞锛氳鍗曟帴鍗曞悗鍙彇娑堟椂闂磋寖鍥村唴锛�</span>
- <div style="margin:20px 0 50px 0">
+ </el-form-item>
+ <div style="margin:50px 0 20px 0;background-color: rgba(140,147,157,0.61)">
<span style="font-size: 15px; font-weight: bold">銆�3銆戣嚜鍔ㄦ淳鍗曪細</span>
</div>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="autoDispatch">
<el-input
style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.autoDispatch"
placeholder="璇疯緭鍏�"
v-trim
/>鍒嗛挓鏃犱汉鎺ュ崟锛岀郴缁熻嚜鍔ㄦ淳鍗�
</el-form-item>
- <div style="margin:20px 0 50px 0">
+ <div style="margin:50px 0 20px 0;background-color: rgba(140,147,157,0.61)">
<span style="font-size: 15px; font-weight: bold">銆�4銆戞淳鍗曡寖鍥达細</span>
</div>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="autoDispatchDistance">
璺濈鐢ㄥ伐鍦扮偣<el-input
style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.autoDispatchDistance"
placeholder="璇疯緭鍏�"
v-trim
/>km鑼冨洿鍐咃紝杩涜娲惧崟
</el-form-item>
- <div style="margin:20px 0 50px 0">
- <span style="font-size: 15px; font-weight: bold">銆�5銆戣鍗曚慨锛�</span>
+ <div style="margin:50px 0 20px 0;background-color: rgba(140,147,157,0.61)">
+ <span style="font-size: 15px; font-weight: bold">銆�5銆戣鍗曚慨鏀癸細</span>
</div>
- <el-form-item label="" label-width="10px" prop="address">
+ <el-form-item label="" label-width="10px" prop="autoConfirm">
璁㈠崟淇敼鍚庯紝鎺ュ崟鏂�<el-input
style="width: 100px;margin: 0px 20px"
type="number"
- v-model="form.address"
+ v-model="form.autoConfirm"
placeholder="璇疯緭鍏�"
v-trim
/>鍒嗛挓鍚庢湭纭锛岀郴缁熻嚜鍔ㄥ悓鎰�
@@ -93,7 +94,6 @@
import { getPlatformConfig, updPlatformConfig } from '@/api/system/dictData'
export default {
name: '',
- components: { },
data () {
return {
uploadData: {
@@ -102,16 +102,13 @@
isUploading: false,
working: false,
form: {
- address: null,
- footImgUrl: 0,
- footFullImgUrl: 0,
- footImgUrl2: 0,
- footFullImgUrl2: 0,
- footWords: 0,
- linkMobile: 0,
- linkPhone: 0,
- serverTime: '',
- qyemail: ''
+ releaseCancelTimes: null,
+ releaseCancelTime: null,
+ receiveCancelTimes: null,
+ receiveCancelTime: null,
+ autoDispatch: null,
+ autoDispatchDistance: null,
+ autoConfirm: null
}
}
},
@@ -125,20 +122,15 @@
getPlatformConfig({})
.then(res => {
if (res) {
- this.form.address = res.address
- this.form.footImgUrl = res.footImgUrl
- this.form.footFullImgUrl = res.footFullImgUrl
- this.form.footImgUrl2 = res.footImgUrl2
- this.form.footFullImgUrl2 = res.footFullImgUrl2
- this.form.footWords = res.footWords
- this.form.linkMobile = res.linkMobile
- this.form.linkPhone = res.linkPhone
- this.form.qyemail = res.qyemail
- this.form.serverTime = res.serverTime
- this.form.solveScheme = res.solveScheme || [{ name: '', address: '' }]
- this.form.wisdomSystem = res.wisdomSystem || [{ name: '', address: '' }]
- this.form.honors = res.honors || [{ name: '', address: '' }]
- this.form.yqlinks = res.yqlinks || [{ name: '', address: '' }]
+ this.form ={
+ releaseCancelTimes: res.releaseCancelTimes || null,
+ releaseCancelTime: res.releaseCancelTime|| null,
+ receiveCancelTimes: res.receiveCancelTimes|| null,
+ receiveCancelTime: res.receiveCancelTime|| null,
+ autoDispatch: res.autoDispatch|| null,
+ autoDispatchDistance: res.autoDispatchDistance|| null,
+ autoConfirm: res.autoConfirm|| null
+ }
}
})
},
--
Gitblit v1.9.3