tx/bick_back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tx:master
Branches Tags
tx:master
tx:qzz
..
compare: tx:qzz
Branches Tags
tx:master
tx:qzz

No commits in common. "master" and "qzz" have entirely different histories.
master ... qzz

2 changed files with 53 additions and 104 deletions
Show Stats Expand all files Collapse all files

49
src/views/system/area/index.vue
View File

@ -241,20 +241,24 @@
</el-row>
<el-row v-if="form.areaTime==2">
<el-col :span="12">
<el-form-item label="自定义">
<el-form-item label="自定义" >
<el-time-picker
v-model="form.areaTimeStart"
value-format="HH:mm:ss"
v-model="value1"
:picker-options="{
selectableRange: '18:30:00 - 20:30:00'
}"
placeholder="开始时间">
</el-time-picker>
<el-time-picker
arrow-control
v-model="form.areaTimeEnd"
value-format="HH:mm:ss"
v-model="value2"
:picker-options="{
selectableRange: '18:30:00 - 20:30:00'
}"
placeholder="结束时间">
</el-time-picker>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
@ -344,43 +348,11 @@
<el-input-number style="width: 50%" v-model="form.undercharge" placeholder="低于电量（%）不得骑行"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="骑行押金" label-width="150">
<el-input-number style="width: 50%" v-model="form.deposit" placeholder="骑行前需要充值的押金"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预约服务费" label-width="150">
<el-input-number style="width: 50%" v-model="form.appointmentServiceFee" placeholder="预约时每十分钟的计费"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="调度费" label-width="150">
<el-input-number style="width: 50%" v-model="form.dispatchFee" placeholder="车辆超出运行区外的调度费用"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="管理费" label-width="150">
<el-input-number style="width: 50%" v-model="form.vehicleManagementFee" placeholder="车辆在运营区内但没在停车区产生的调度费用"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="电量低于多少值自动生成换电订单" label-width="150" prop="autoReplacementOrder">
<el-input-number style="width: 50%" v-model="form.autoReplacementOrder" placeholder="电量低于多少值自动生成换电订单"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最大预约时间" label-width="150">
<el-input-number style="width: 50%" v-model="form.timeoutMinutes" placeholder="车辆可最长预约多少分钟"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
@ -489,7 +461,6 @@ export default {
areaName: [{ required: true, message: "运营区域不能为空", trigger: "blur" }],
contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
autoReplacementOrder: [{ required: true, message: "最低电量不能为空", trigger: "blur" }],
},
};
},

92
src/views/system/fee/index.vue
View File

@ -42,9 +42,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="ruleId" />
<el-table-column label="套餐名称" align="center" prop="name" />
<el-table-column label="说明" align="center" prop="instructions" />
<!-- <el-table-column label="时间(小时)" align="center" prop="time" />
<el-table-column label="费用(元)" align="center" prop="fee" /> -->
<el-table-column label="说明" align="center" prop="explain" />
<el-table-column label="时间(小时)" align="center" prop="time" />
<el-table-column label="费用(元)" align="center" prop="fee" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
@ -76,9 +76,8 @@
<el-form-item label="套餐名称" prop="name">
<el-input v-model="form.name" placeholder="请输入套餐名称" />
</el-form-item>
<el-form-item label="说明" prop="instructions" :show-overflow-tooltip="true">
<editor v-model="form.instructions" :min-height="192"/>
<!-- <el-input v-model="form.explain" type="textarea" placeholder="请输入内容" /> -->
<el-form-item label="说明" prop="explain" :show-overflow-tooltip="true">
<el-input v-model="form.explain" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="状态" prop="status" v-if="title != '添加收费方式'">
<el-select v-model="form.status" placeholder="请选择状态">
@ -133,13 +132,13 @@
<el-form-item label="起步价">
<el-row :gutter="10">
<el-col :span="6">
<el-input v-model="startingPrice" placeholder="请输入起步价" />
<el-input v-model="startPrice" placeholder="请输入起步价" />
</el-col>
<el-col :span="2" style="line-height: 32px;">
元（含
</el-col>
<el-col :span="6">
<el-input v-model="startingTime" placeholder="请输入起步时间" />
<el-input v-model="startTime" placeholder="请输入起步时间" />
</el-col>
<el-col :span="2" style="line-height: 32px;">
{{ timeUnit }})
@ -149,13 +148,13 @@
<el-form-item label="超出价">
<el-row :gutter="10">
<el-col :span="6">
<el-input v-model="timeoutPrice" placeholder="请输入超出价格" />
<el-input v-model="exceedPrice" placeholder="请输入超出价格" />
</el-col>
<el-col :span="2" style="line-height: 32px;">
元/
</el-col>
<el-col :span="6">
<el-input v-model="timeoutTime" placeholder="请输入超出时间" />
<el-input v-model="exceedTime" placeholder="请输入超出时间" />
</el-col>
<el-col :span="4" style="line-height: 32px;">
{{ timeUnit }}（超出起步价后）
@ -260,13 +259,13 @@
<el-radio-group v-model="form.chargingCycle">
<el-radio label="1">
订单生成后
<el-input v-model="time1"
<el-input v-model="form.chargingCycleValue"
style="width: 80px; display: inline-block; margin-left: 10px;" />
小时
</el-radio>
<el-radio label="2">
自定义时刻
<el-time-picker v-model="time2" value-format="HH:mm:ss" placeholder="选择时间" style="margin-left: 10px;" />
<el-time-picker v-model="form.chargingCycleValue" placeholder="选择时间" style="margin-left: 10px;" />
</el-radio>
</el-radio-group>
</el-form-item>
@ -300,7 +299,6 @@
<script>
import { listFee, getFee, delFee, addFee, updateFee } from "@/api/system/fee";
import { time } from 'echarts';
export default {
name: "Fee",
@ -322,11 +320,9 @@ export default {
name: null,
status: null,
},
time1:'',
time2:'',
form: {
name: '',
instructions: '',
explain: '',
status: "正常",
autoRefundDeposit: '',
orderExceedMinutes: '',
@ -342,10 +338,10 @@ export default {
// chargingCycle: 1, // 默认选择第一个选项
// chargingCycleValue: '', // 对应的值
},
timeoutTime: '',
startingPrice: '',
startingTime: '',
timeoutPrice: '',
exceedTime: '',
startPrice: '',
startTime: '',
exceedPrice: '',
enablelnterval: false,
rule: [{ start: '', end: '', eachUnit: '', fee: '' }],
more: { start: '', end: '9999', eachUnit: '', fee: '' },
@ -354,7 +350,7 @@ export default {
name: [
{ required: true, message: '请输入套餐名称', trigger: 'blur' },
],
instructions: [
explain: [
{ required: true, message: '请输入说明', trigger: 'blur' },
],
status: [
@ -437,7 +433,7 @@ export default {
reset() {
this.form = {
name: '',
instructions: '',
explain: '',
status: "正常",
autoRefundDeposit: '',
orderExceedMinutes: '',
@ -455,10 +451,10 @@ export default {
this.enablelnterval = false,
this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }],
this.timeoutTime = '',
this.startingPrice = '',
this.startingTime = '',
this.timeoutPrice = '',
this.exceedTime = '',
this.startPrice = '',
this.startTime = '',
this.exceedPrice = '',
this.resetForm("form")
},
handleQuery() {
@ -484,32 +480,19 @@ export default {
const ruleId = row.ruleId || this.ids;
getFee(ruleId).then(response => {
this.form = response.data;
if(this.form.rentalUnit=='minutes'){
this.timeUnit='分钟'
}else if(this.form.rentalUnit=='hours'){
this.timeUnit='小时'
}else if(this.form.rentalUnit=='day'){
this.timeUnit='天'
}
// delete this.form.ridingRuleJson;
let json = JSON.parse(response.data.ridingRuleJson)
if (this.form.ridingRule == 1) {
this.timeoutTime = json.timeoutTime
this.startingPrice = json.startingPrice
this.startingTime = json.startingTime
this.timeoutPrice = json.timeoutPrice
this.exceedTime = json.exceedTime
this.startPrice = json.startPrice
this.startTime = json.startTime
this.exceedPrice = json.exceedPrice
} else {
this.rule = json.rule.slice(0, -1);
// 获取数组的最后一个元素
this.more = json.rule[json.rule.length - 1];
}
if(this.form.chargingCycle==1){
this.time1=this.form.chargingCycleValue
}else if(this.form.chargingCycle==2){
// this.data.chargingCycleValue=time2
this.time2=this.form.chargingCycleValue
}
console.log(this.form,'this.formthis.form');
this.open = true;
this.title = "修改收费方式";
@ -524,25 +507,20 @@ export default {
this.rule.push(this.more)
data.ridingRuleJson = {}
if (this.form.ridingRule == 2) {
data.ridingRuleJson.rule = this.rule
data.ridingRuleJson.enablelnterval = this.enablelnterval
} else {
data.ridingRuleJson.timeoutTime = this.timeoutTime
data.ridingRuleJson.startingPrice = this.startingPrice
data.ridingRuleJson.startingTime = this.startingTime
data.ridingRuleJson.timeoutPrice = this.timeoutPrice
data.ridingRuleJson.exceedTime = this.exceedTime
data.ridingRuleJson.startPrice = this.startPrice
data.ridingRuleJson.startTime = this.startTime
data.ridingRuleJson.exceedPrice = this.exceedPrice
}
data.ridingRuleJson = JSON.stringify(data.ridingRuleJson);
if(this.form.chargingCycle==1){
data.chargingCycleValue=this.time1
}else if(this.form.chargingCycle==2){
data.chargingCycleValue=this.time2
}
// console.log(data, 'mmmmmmmmmmmmm');
if (this.form.ruleId != null) {
updateFee(data).then(() => {
@ -587,10 +565,10 @@ export default {
this.enablelnterval = false
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }]
this.timeoutTime = ''
this.startingPrice = ''
this.startingTime = ''
this.timeoutPrice = ''
this.exceedTime = ''
this.startPrice = ''
this.startTime = ''
this.exceedPrice = ''
}
},
}