diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 86098ea9..6040b8cb 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -702,17 +702,16 @@ const configurationdetails = async row => {
};
// 车型编辑
const EditRules = async row => {
-
loading.value = true;
-
+
form.value.dialogPricingrules = true; //开启车型配置规则弹窗
dialogtitle.value = '编辑';
console.log(row, 'row====>');
editID.value = row.id;
-
- await Templateconfiguration(); //获取模板
- await configurationdetails(row); //获取车型
- loading.value = false;
+
+ await Templateconfiguration(); //获取模板
+ await configurationdetails(row); //获取车型
+ loading.value = false;
};
// 新增
const newlyadded = async row => {
@@ -773,14 +772,34 @@ const Categoryprocessing = (value, data, type) => {
// 超区计费处理
const Oversizedbillingprocessing = (value, data) => {
OversizedbillingData.value.forEach(item => {
+ console.log(item, '超区计费-----》');
+
+ // 拆解出 region 数组中的省、市、区编码
+ const [province, city, district] = item.region;
+
+ // 查找省对象
+ const provinceObj = item.options.find(option => option.value == province);
+
+ // 根据省对象查找市集合
+ const cityObj = provinceObj?.children?.find(cityItem => cityItem.value == city);
+
+ // 根据市对象查找区集合
+ const districtObj = cityObj?.children?.find(districtItem => districtItem.value == district);
+
+ // 构建数据对象
let _data = {
- province: item.region[0], //省
- city: item.region[1], //市
- district: item.region[2], //区
- overZoneCost: item.overZoneCost, //超区后单价
- overZoneKilometer: item.overZoneKilometer, //超区公里数
+ province, // 省编码
+ city, // 市编码
+ district, // 区编码
+ provinceName: provinceObj?.label || '', // 省名称
+ cityName: cityObj?.label || '', // 市名称
+ districtName: districtObj?.label || '', // 区名称
+ overZoneCost: item.overZoneCost, // 超区后单价
+ overZoneKilometer: item.overZoneKilometer, // 超区公里数
id: item.id,
};
+
+ // 将数据对象加入数据数组中
data.push(_data);
});
};
@@ -997,7 +1016,6 @@ const Templateconfiguration = () => {
if (res.data.code == 200) {
if (res.data.data) {
Template.value = res.data.data;
- State.value = true;
}
}
})
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index a1020ba7..b0d98713 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -572,7 +572,9 @@
修改(零担订单)
- 提交(零担订单)
+ 提交(零担订单)
@@ -588,7 +590,7 @@ export default {