diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue
index c763b67..4ac7f19 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue
@@ -82,16 +82,19 @@
+ 编辑
+ 明细
+ 占位
@@ -560,18 +563,20 @@
}
let temp = 0
let qudao_count = PlanDetaiInfo.value.coutsInfo.length
+ let lastValidIndex = -1
for (let i = 0; i < qudao_count; i++) {
if (PlanDetaiInfo.value.coutsInfo[i].ratio === 0) continue
+ lastValidIndex = i
PlanDetaiInfo.value.coutsInfo[i].max_total = PlanDetaiInfo.value.max_total
PlanDetaiInfo.value.coutsInfo[i].count = Math.round(PlanDetaiInfo.value.max_total * (PlanDetaiInfo.value
.coutsInfo[i].ratio / 100))
temp = temp + PlanDetaiInfo.value.coutsInfo[i].count
- //如果各个渠道的总和与设置的总数不一致,最后1项适当加减,平衡总数
- if (i === qudao_count - 1 && temp !== PlanDetaiInfo.value.max_total) {
- PlanDetaiInfo.value.coutsInfo[i].count = PlanDetaiInfo.value.coutsInfo[i].count - (temp - PlanDetaiInfo
- .value.max_total)
- }
+ }
+ // 如果各个渠道的总和与设置的总数不一致,最后一个有效渠道做差额修正
+ if (lastValidIndex !== -1 && temp !== PlanDetaiInfo.value.max_total) {
+ PlanDetaiInfo.value.coutsInfo[lastValidIndex].count = PlanDetaiInfo.value.coutsInfo[lastValidIndex].count - (temp - PlanDetaiInfo
+ .value.max_total)
}
}
//保存修改
@@ -845,6 +850,7 @@
font-size: 14px;
color: #333;
position: relative;
+ min-height: 60px;
padding-top: 6px;
padding-bottom: 10px;
padding-right: 8px;
@@ -887,6 +893,13 @@
align-items: center;
border-radius: 4px;
.icon_k {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ cursor: pointer;
+ margin: 0 4px;
+ }
+ .icon_k .el-icon {
height: 30px;
width: 30px;
border-radius: 50%;
@@ -895,8 +908,15 @@
align-items: center;
border: 1px solid #ccc;
background-color: #fff;
- margin-left: 6px;
-
+ }
+ .icon_text {
+ font-size: 11px;
+ color: #409eff;
+ background-color: #fff;
+ padding: 1px 4px;
+ border-radius: 3px;
+ margin-top: 3px;
+ white-space: nowrap;
}
}
diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue b/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue
index 42ea3d2..91eee25 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanListAdmin.vue
@@ -573,18 +573,20 @@
}
let temp = 0
let qudao_count = PlanDetaiInfo.value.coutsInfo.length
+ let lastValidIndex = -1
for (let i = 0; i < qudao_count; i++) {
if (PlanDetaiInfo.value.coutsInfo[i].ratio === 0) continue
+ lastValidIndex = i
PlanDetaiInfo.value.coutsInfo[i].max_total = PlanDetaiInfo.value.max_total
PlanDetaiInfo.value.coutsInfo[i].count = Math.round(PlanDetaiInfo.value.max_total * (PlanDetaiInfo.value
.coutsInfo[i].ratio / 100))
temp = temp + PlanDetaiInfo.value.coutsInfo[i].count
- //如果各个渠道的总和与设置的总数不一致,最后1项适当加减,平衡总数
- if (i === qudao_count - 1 && temp !== PlanDetaiInfo.value.max_total) {
- PlanDetaiInfo.value.coutsInfo[i].count = PlanDetaiInfo.value.coutsInfo[i].count - (temp - PlanDetaiInfo
- .value.max_total)
- }
+ }
+ // 如果各个渠道的总和与设置的总数不一致,最后一个有效渠道做差额修正
+ if (lastValidIndex !== -1 && temp !== PlanDetaiInfo.value.max_total) {
+ PlanDetaiInfo.value.coutsInfo[lastValidIndex].count = PlanDetaiInfo.value.coutsInfo[lastValidIndex].count - (temp - PlanDetaiInfo
+ .value.max_total)
}
}
//保存修改
@@ -859,6 +861,7 @@
font-size: 14px;
color: #333;
position: relative;
+ min-height: 60px;
padding-top: 6px;
padding-bottom: 10px;
padding-right: 8px;
diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue b/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
index 4d0bcb3..7dcda01 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanModel.vue
@@ -82,11 +82,13 @@
+ 编辑
+ 占位
@@ -1227,6 +1229,7 @@
font-size: 14px;
color: #333;
position: relative;
+ min-height: 60px;
padding-top: 18px;
padding-bottom: 10px;
@@ -1302,6 +1305,13 @@
align-items: center;
border-radius: 4px;
.icon_k {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ cursor: pointer;
+ margin: 0 4px;
+ }
+ .icon_k .el-icon {
height: 30px;
width: 30px;
border-radius: 50%;
@@ -1310,7 +1320,15 @@
align-items: center;
border: 1px solid #ccc;
background-color: #fff;
-
+ }
+ .icon_text {
+ font-size: 11px;
+ color: #409eff;
+ background-color: #fff;
+ padding: 1px 4px;
+ border-radius: 3px;
+ margin-top: 3px;
+ white-space: nowrap;
}
}
}
diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue b/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue
index 23b80b7..9ae7539 100644
--- a/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue
+++ b/YiJi-admin/src/views/AppointmentMngr/PlanModelAdmin.vue
@@ -1243,6 +1243,7 @@
font-size: 14px;
color: #333;
position: relative;
+ min-height: 60px;
padding-top: 18px;
padding-bottom: 10px;