调整收费套餐页面
This commit is contained in:
parent
6cd03185f5
commit
094294af4a
|
|
@ -231,7 +231,7 @@
|
|||
<span>在</span>
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
<el-input v-model="interval.start" :placeholder="'请输入'" />
|
||||
<el-input v-model="interval.start" :placeholder="'请输入'" :disabled="true"/>
|
||||
</el-col>
|
||||
<el-col :span="0.5" style="line-height: 32px;">
|
||||
~
|
||||
|
|
@ -267,7 +267,7 @@
|
|||
<span>大于</span>
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
<el-input placeholder="请输入" v-model="more.start" />
|
||||
<el-input placeholder="请输入" v-model="more.start" disabled/>
|
||||
</el-col>
|
||||
<el-col :span="3" style="line-height: 32px;">
|
||||
{{ timeUnit }} 之后，每
|
||||
|
|
@ -356,6 +356,23 @@ export default {
|
|||
'form.deptId': function(deptId) {
|
||||
this.getAreaListByDeptId(deptId);
|
||||
},
|
||||
'rule': {
|
||||
handler(newVal) {
|
||||
newVal.forEach((interval, index) => {
|
||||
// 跳过第一条，从第二条开始更新
|
||||
if (index > 0) {
|
||||
interval.start = newVal[index - 1].end || ''; // 动态更新 start
|
||||
}
|
||||
});
|
||||
|
||||
// 更新 more.start 的值为新数组最后一条的 end 值
|
||||
if (newVal.length > 0) {
|
||||
this.more.start = newVal[newVal.length - 1].end || ''; // 设置 more.start
|
||||
}
|
||||
},
|
||||
deep: true, // 深度监听
|
||||
immediate: true // 初始化立即执行
|
||||
}
|
||||
},
|
||||
props: {
|
||||
// 用户id
|
||||
|
|
@ -418,7 +435,7 @@ export default {
|
|||
startingTime: '1',
|
||||
timeoutPrice: '5',
|
||||
enablelnterval: false,
|
||||
rule: [{ start: '', end: '', eachUnit: '', fee: '' }],
|
||||
rule: [{ start: '0', end: '', eachUnit: '', fee: '' }],
|
||||
more: { start: '', end: '9999', eachUnit: '', fee: '' },
|
||||
timeUnit: '分钟',
|
||||
rules: {
|
||||
|
|
@ -467,14 +484,6 @@ export default {
|
|||
deptId: [
|
||||
{ required: true, message: '请选择代理商', trigger: 'change' },
|
||||
]
|
||||
// startingTime: [
|
||||
// { required: true, message: '请输入起步时间', trigger: 'blur' },
|
||||
// { pattern: /^\d+$/, message: '起步时间必须为正整数', trigger: 'blur' }
|
||||
// ],
|
||||
// timeoutTime: [
|
||||
// { required: true, message: '请输入超时时间', trigger: 'blur' },
|
||||
// { pattern: /^\d+$/, message: '超时时间必须为正整数', trigger: 'blur' }
|
||||
// ],
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -528,8 +537,98 @@ export default {
|
|||
this.addInterval();
|
||||
}
|
||||
},
|
||||
validateMore() {
|
||||
const { start, end, eachUnit, fee } = this.more;
|
||||
// 检查开始和结束值是否为空
|
||||
if (start === '' || end === '') {
|
||||
this.$modal.msgError('区间计费：大于分钟数不能为空');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查分钟数和金额是否为空
|
||||
if (eachUnit === '') {
|
||||
this.$modal.msgError('区间计费：大于每分钟数不能为空');
|
||||
return false;
|
||||
}
|
||||
|
||||
if (fee === '') {
|
||||
this.$modal.msgError('区间计费：大于分钟之后的金额不能为空');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查开始和结束值是否为数值
|
||||
if (isNaN(Number(start)) || isNaN(Number(end))) {
|
||||
this.$modal.msgError('区间计费：大于分钟数必须是数值');
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查分钟数和金额是否为数值
|
||||
if (isNaN(Number(eachUnit))) {
|
||||
this.$modal.msgError('区间计费：大于每分钟数必须是数值');
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isNaN(Number(fee))) {
|
||||
this.$modal.msgError('区间计费：大于分钟之后的金额必须是数值');
|
||||
return false;
|
||||
}
|
||||
return true; // 校验通过
|
||||
},
|
||||
validateRules() {
|
||||
for (let i = 0; i < this.rule.length; i++) {
|
||||
const { start, end, eachUnit, fee } = this.rule[i];
|
||||
if (start === '' || end === '') {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的开始或结束值不能为空`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (eachUnit === '') {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的分钟数不能为空`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (fee === '') {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的金额不能为空`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查开始和结束值是否为数值
|
||||
if (isNaN(Number(start)) || isNaN(Number(end))) {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的开始和结束值必须是数值`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isNaN(Number(eachUnit))) {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的分钟数必须是数值`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isNaN(Number(fee))) {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的金额必须是数值`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (parseFloat(start) >= parseFloat(end)) {
|
||||
this.$modal.msgError(`区间计费：第 ${i + 1} 区间的结束值必须小于开始值`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true; // 校验通过
|
||||
},
|
||||
addInterval() {
|
||||
this.rule.push({ start: '', end: '', eachUnit: '', fee: '' });
|
||||
// this.rule.push({ start: '', end: '', eachUnit: '', fee: '' });
|
||||
const lastInterval = this.rule[this.rule.length - 1];
|
||||
const newInterval = { start: '', end: '', eachUnit: '', fee: '' };
|
||||
|
||||
// 如果存在上一条规则，则将新规则的 start 设置为上一条的 end
|
||||
if (lastInterval && lastInterval.end) {
|
||||
newInterval.start = lastInterval.end;
|
||||
}else{
|
||||
this.$modal.msgError('请先设置上一条规则的结束值');
|
||||
return;
|
||||
}
|
||||
|
||||
this.rule.push(newInterval);
|
||||
},
|
||||
removeInterval(index) {
|
||||
this.rule.splice(index, 1);
|
||||
|
|
@ -563,8 +662,8 @@ export default {
|
|||
areaId: null
|
||||
}
|
||||
this.enablelnterval = false,
|
||||
this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
|
||||
this.rule = [{ start: '', end: '', eachUnit: '', fee: '' }],
|
||||
this.more = { start: '', end: '9999', eachUnit: '', fee: '' }
|
||||
this.rule = [{ start: '0', end: '', eachUnit: '', fee: '' }],
|
||||
this.timeoutTime = '60',
|
||||
this.startingPrice = '5',
|
||||
this.startingTime = '60',
|
||||
|
|
@ -634,6 +733,12 @@ export default {
|
|||
},
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if(!this.validateRules()){
|
||||
return
|
||||
}
|
||||
if (!this.validateMore()) {
|
||||
return; // 校验未通过，阻止提交
|
||||
}
|
||||
if (valid) {
|
||||
// 如何不是整数，弹窗提示
|
||||
if (!/^\d+$/.test(this.startingTime)) {
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@
|
|||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="flowList" @selection-change="handleSelectionChange">
|
||||
<el-table v-loading="loading" :data="flowList" show-summary @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="流水id" align="center" prop="flowId" />-->
|
||||
<el-table-column label="交易时间" align="center" prop="createTime" width="150">
|
||||
|
|
@ -131,7 +131,6 @@
|
|||
</router-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="关联订单号" width="180" align="center" prop="orderNo" />-->
|
||||
<el-table-column align="center" label="关联订单号" width="180" prop="orderNo">
|
||||
<template slot-scope="scope">
|
||||
<router-link :to="'/system/order/index/' + scope.row.orderNo" class="link-type">
|
||||
|
|
@ -150,22 +149,8 @@
|
|||
<dict-tag :options="dict.type.et_business_type" :value="scope.row.busType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="交易金额" align="center" prop="amount" :formatter="formatAmount"/>-->
|
||||
<!-- <el-table-column label="支付手续费" align="center" prop="handlingCharge" :formatter="formatAmount"/>-->
|
||||
<!-- <el-table-column label="平台服务费" align="center" prop="platformServiceFee" :formatter="formatAmount"/>-->
|
||||
<el-table-column label="账变金额" align="left" prop="operatorDividend" :formatter="formatAmount2"/>
|
||||
<el-table-column label="代理商结余" align="center" prop="operatorBalance" :formatter="formatAmount"/>
|
||||
<!-- <el-table-column label="合伙人分账" align="center" prop="partnerDividend" :formatter="formatAmount"/>-->
|
||||
<!-- <el-table-column label="支付方式" align="center" prop="payType">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <dict-tag :options="dict.type.et_pay_type" :value="scope.row.payType"/>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column label="状态" align="center" prop="status">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <dict-tag :options="dict.type.et_flow_status" :value="scope.row.status"/>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="车型" align="center" prop="model" />
|
||||
</el-table>
|
||||
|
||||
|
|
|
|||
|
|
@ -1112,13 +1112,39 @@ export default {
|
|||
},
|
||||
/** 提交退款 */
|
||||
submitRefund(){
|
||||
// console.log("=====submitRefund======="+this.form2)
|
||||
console.log("=====submitRefund======="+this.form2)
|
||||
if(!this.refundValidate()){
|
||||
return
|
||||
}
|
||||
refund(this.form2).then(response => {
|
||||
this.$modal.msgSuccess("退款成功");
|
||||
this.open2 = false;
|
||||
this.getList();
|
||||
});
|
||||
},
|
||||
refundValidate(){
|
||||
// 需要校验的字段
|
||||
const fields = [
|
||||
this.form2.appointmentFee,
|
||||
this.form2.ridingFee,
|
||||
this.form2.dispatchFee,
|
||||
this.form2.manageFee
|
||||
];
|
||||
|
||||
// 计算总和
|
||||
const total = fields.reduce((sum, fee) => sum + (Number(fee) || 0), 0);
|
||||
|
||||
// 调试信息，保留总和
|
||||
console.log('总和:', total);
|
||||
|
||||
// 校验总和是否为 0
|
||||
if (total === 0) {
|
||||
this.$modal.msgError("退款金额不能为0");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="refundList" show-summary="total" @selection-change="handleSelectionChange">
|
||||
<el-table v-loading="loading" :data="refundList" show-summary @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="时间" align="center" prop="day" />
|
||||
<el-table-column label="代理商" align="center" prop="deptName" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user