diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue
index ce02447..cf31c7a 100644
--- a/src/views/system/fee/index.vue
+++ b/src/views/system/fee/index.vue
@@ -231,7 +231,7 @@
在
-
+
~
@@ -267,7 +267,7 @@
大于
-
+
{{ 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)) {
diff --git a/src/views/system/flow/index.vue b/src/views/system/flow/index.vue
index 274d889..65049cc 100644
--- a/src/views/system/flow/index.vue
+++ b/src/views/system/flow/index.vue
@@ -114,7 +114,7 @@
-
+
@@ -131,7 +131,6 @@
-
@@ -150,22 +149,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 332f6a5..a0c99c0 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -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 => {
diff --git a/src/views/system/reconciliation/index.vue b/src/views/system/reconciliation/index.vue
index ec16d1f..96c2e19 100644
--- a/src/views/system/reconciliation/index.vue
+++ b/src/views/system/reconciliation/index.vue
@@ -42,7 +42,7 @@
-
+