Merge remote-tracking branch 'origin/master'

k94314517

2025-07-17 bbd9c436f23f5fdbe712c4a22d90b457066bdf38

 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
            }
          }
        })
    },