Browse Source

修复已知bug

dev-xx
马远东 7 months ago
parent
commit
748daae600
  1. 28
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  2. 15
      src/views/distribution/turndelivery/deliveryDiscuss.vue

28
src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue

@ -702,7 +702,6 @@ const configurationdetails = async row => {
}; };
// //
const EditRules = async row => { const EditRules = async row => {
loading.value = true; loading.value = true;
form.value.dialogPricingrules = true; // form.value.dialogPricingrules = true; //
@ -773,14 +772,34 @@ const Categoryprocessing = (value, data, type) => {
// //
const Oversizedbillingprocessing = (value, data) => { const Oversizedbillingprocessing = (value, data) => {
OversizedbillingData.value.forEach(item => { 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 = { let _data = {
province: item.region[0], // province, //
city: item.region[1], // city, //
district: item.region[2], // district, //
provinceName: provinceObj?.label || '', //
cityName: cityObj?.label || '', //
districtName: districtObj?.label || '', //
overZoneCost: item.overZoneCost, // overZoneCost: item.overZoneCost, //
overZoneKilometer: item.overZoneKilometer, // overZoneKilometer: item.overZoneKilometer, //
id: item.id, id: item.id,
}; };
//
data.push(_data); data.push(_data);
}); });
}; };
@ -997,7 +1016,6 @@ const Templateconfiguration = () => {
if (res.data.code == 200) { if (res.data.code == 200) {
if (res.data.data) { if (res.data.data) {
Template.value = res.data.data; Template.value = res.data.data;
State.value = true;
} }
} }
}) })

15
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -572,7 +572,9 @@
<el-button v-if="!QuantityEntryStatus" color="#172e60" type="success" @click="ModifyLCL" <el-button v-if="!QuantityEntryStatus" color="#172e60" type="success" @click="ModifyLCL"
>修改(零担订单)</el-button >修改(零担订单)</el-button
> >
<el-button color="#172e60" type="success" @click="SubmitLoad">提交(零担订单)</el-button> <el-button v-else color="#172e60" type="success" @click="SubmitLoad"
>提交(零担订单)</el-button
>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
@ -1713,7 +1715,7 @@ const QuantityEntry = async val => {
console.log(dataInfo.value, 'dataInfo.value'); console.log(dataInfo.value, 'dataInfo.value');
dataId.value = findIndexById(val.id); // dataId.value = findIndexById(val.id); //
editLoading.value=true editLoading.value = true;
// //
if (RouteId.value) { if (RouteId.value) {
await $_getDeliveryZeroOrderDetail({ await $_getDeliveryZeroOrderDetail({
@ -1796,6 +1798,7 @@ const SubmitLoad = () => {
}); });
let max = dataInfo.value[dataId.value].handQuantity - sum; let max = dataInfo.value[dataId.value].handQuantity - sum;
console.log(dataInfo.value, ' dataInfo.value['); console.log(dataInfo.value, ' dataInfo.value[');
if (Numberoperations > max) { if (Numberoperations > max) {
ElMessage({ ElMessage({
message: '操作数量总和不能大于冻结数量总和', message: '操作数量总和不能大于冻结数量总和',
@ -1848,7 +1851,15 @@ const SubmitLoad = () => {
console.log(isZeroTable.value, '提交零担的值'); console.log(isZeroTable.value, '提交零担的值');
}); });
} }
dataInfo.value[dataId.value].parcelNumberVOS = isZeroTable.value; dataInfo.value[dataId.value].parcelNumberVOS = isZeroTable.value;
//
let _summation = 0;
dataInfo.value[0].parcelNumberVOS.forEach(item => {
_summation += item.reservationNum;
});
dataInfo.value[dataId.value].reservationNum = _summation;
comprehensive.value = false; // comprehensive.value = false; //
EnteringLibrary.value = false; // EnteringLibrary.value = false; //
QuantityEntryStatus.value = false; // QuantityEntryStatus.value = false; //

Loading…
Cancel
Save