Browse Source

修复已知bug

dev-xx
马远东 8 months ago
parent
commit
88edc5fe09
  1. 3
      src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
  2. 29
      src/views/mail/order/add.vue
  3. 20
      src/views/mail/order/list.vue

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

@ -531,7 +531,8 @@ const Pricingrules = () => {
carModel:form.value.carModel,// carModel:form.value.carModel,//
} }
$_expenseDispatchPricesave(data).then(res=>{ $_expenseDispatchPricesave(data).then(res=>{
console.log(res,'res'); console.log(res,'提交成功');
}) })

29
src/views/mail/order/add.vue

@ -214,6 +214,7 @@
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<!-- <el-text--> <!-- <el-text-->
<!-- v-if="inventoryShow"--> <!-- v-if="inventoryShow"-->
<!-- type="primary"--> <!-- type="primary"-->
@ -2461,21 +2462,41 @@
let inventoryIds = []; let inventoryIds = [];
let inventoryList = []; let inventoryList = [];
let stockArticleList = []; let stockArticleList = [];
// let operation = true;
// this.inventoryData.forEach(item => {
// if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
// this.$message({
// type: 'warning',
// message: '',
// });
// operation = false;
// return;
// }
// item.reservationNum = item.reservationNum;
// inventoryIds.push(item.id);
// inventoryList.push(item);
// });
// if(!operation){
// return
// }
let operation = true; let operation = true;
this.inventoryData.forEach(item => { for (let i = 0; i < this.inventoryData.length; i++) {
const item = this.inventoryData[i];
if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) { if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '存在无效的预约数量', message: '存在无效的预约数量',
}); });
operation = false; operation = false;
return; break; //
} }
item.reservationNum = item.reservationNum;
inventoryIds.push(item.id); inventoryIds.push(item.id);
inventoryList.push(item); inventoryList.push(item);
}); }
if (!operation) {
return;
}
orderIds.join(','); orderIds.join(',');
inventoryIds.join(','); inventoryIds.join(',');
this.form.stockArticleIds = orderIds.toString(); this.form.stockArticleIds = orderIds.toString();

20
src/views/mail/order/list.vue

@ -507,16 +507,16 @@ export default {
fixed: false, fixed: false,
sortable: true, sortable: true,
}, },
{ // {
prop: 'availableQuantity', // prop: 'availableQuantity',
label: '可用数量', // label: '',
type: 2, // type: 2,
values: '', // values: '',
width: '140', // width: '140',
checkarr: [], // checkarr: [],
fixed: false, // fixed: false,
sortable: true, // sortable: true,
}, // },
{ {
prop: 'notReceived', prop: 'notReceived',
label: '未入库数量', label: '未入库数量',

Loading…
Cancel
Save