Browse Source

修复零担问题

dev
qb 10 months ago
parent
commit
43c14c902f
  1. 4
      src/views/distribution/reservation/reservationAddFrom.vue
  2. 1
      src/views/distribution/turndelivery/deliveryMarket.vue
  3. 6
      vite.config.js

4
src/views/distribution/reservation/reservationAddFrom.vue

@ -2485,6 +2485,7 @@ export default {
inventoryIds.push(item.id);
inventoryList.push(item);
});
if (!operation) return;
orderIds.join(',');
inventoryIds.join(',');
this.form.stockArticleIds = orderIds.toString();
@ -2535,6 +2536,8 @@ export default {
operation = false;
return;
}
if (!operation) return;
// this.form.stockArticleList = this.packageList;
console.log('>>>>>>>>', this.form);
if (this.reservationId) {
@ -3205,6 +3208,7 @@ export default {
this.orderData = reservation.stockArticleList;
this.inventoryData = reservation.inventoryList;
this.inventoryData.forEach(item => {
item.quantityOccupied -= item.reservationNum;
item.applyNum = item.quantityStock - item.quantityOccupied;
});
this.form.deliveryType = reservation.deliveryType;

1
src/views/distribution/turndelivery/deliveryMarket.vue

@ -1482,6 +1482,7 @@ export default {
console.log('this.data------------>', this.data);
if (!this.deliveryListId) {
data.reservationIds = this.reservationIds;
data.reservationIds = this.reservationData.map(val => val.id).join(',');
if (this.reservationData.length < 1) {
this.$message({
message: '无效的配送计划',

6
vite.config.js

@ -25,14 +25,14 @@ export default ({ mode, command }) => {
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.10.25:13000',
// target: 'http://192.168.10.25:2888',
target: 'http://192.168.6.148:9777',
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.148:9777',
// target: 'http://192.168.10.57:13000',
// tjj
// sst
// target: 'http://192.168.10.94:8888',
// target: 'http://192.168.10.29:13000',
// target: 'http://h5uapi.huitongys.com',
// target: 'http://test.api.huitongys.com',
target: 'http://test.api.huitongys.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),
},

Loading…
Cancel
Save