java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

fix_bug_pro20231227
zhangsiyu 2 years ago
parent
2b5f1ed467 f28214adb5
commit
ea10e1ce97
3 changed files with 84 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/api/distribution/distributionStockArticle.js
  2. 14
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  3. 199
      src/views/distribution/turndelivery/deliveryDiscuss.vue

6
src/api/distribution/distributionStockArticle.js
Unescape View File

@ -200,7 +200,7 @@ export const selectStockArticleInfoList = (current, size, params) => {
})
}
export const selectDiscussStockArticleInfoList = (current, size, params) => {
export const selectDiscussStockArticleInfoList = (current, size, params,deliveryListId) => {
return request({
url: '/api/logpm-distribution/deliveryList/selectDiscussStockArticleInfoList',
method: 'get',
@ -208,11 +208,12 @@ export const selectDiscussStockArticleInfoList = (current, size, params) => {
...params,
current,
size,
deliveryListId
}
})
}
export const selectUpdateAvailableStockArticle = (current, size, id,params) => {
export const selectUpdateAvailableStockArticle = (current, size,params) => {
return request({
url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle',
method: 'get',
@ -220,7 +221,6 @@ export const selectUpdateAvailableStockArticle = (current, size, id,params) => {
...params,
current,
size,
id,
}
})
}

14
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
Unescape View File

@ -20,7 +20,6 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<el-button type="danger"
icon="el-icon-delete"
@ -467,7 +466,6 @@
leaf: level >= stop_level
})
}));
}
if (level == 0) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => {
@ -847,10 +845,12 @@
})
row.administrativeAreas = str.join(",");
}
if (this.form.departmentName){
this.form.department = this.department;
console.log("-------------->this.form.departmentName",this.form.departmentName);
console.log("-------------->this.department",this.department);
if (row.departmentName){
row.department = this.department;
}
console.log(row);
console.log("-------------->row",row);
add(row).then(() => {
this.onLoad(this.page);
this.$message({
@ -906,8 +906,8 @@
})
row.administrativeAreas = str.join(",");
}
if (this.form.departmentName){
this.form.department = this.department;
if (row.departmentName){
row.department = this.department;
}
update(row).then(() => {
this.onLoad(this.page);

199
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -609,7 +609,10 @@
import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { selectStockArticleInfoList,selectDiscussStockArticleInfoList } from '@/api/distribution/distributionStockArticle';
import {
selectStockArticleInfoList,
selectDiscussStockArticleInfoList
} from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
import { getDeliveryList, updateDeliveryList } from '@/api/distribution/distributionDeliveryList';
import { mapGetters } from 'vuex';
@ -736,13 +739,13 @@
'$route.query.id': {
handler(newVal, oldVal) {
console.log(newVal, oldVal);
if (!!this.$route.query.id){
if (!!this.$route.query.id) {
this.fetchData();
this.onLoad(this.page);
}
this.driverForm={};
this.vehicleIds=[];
this.deliveryDriver=[];
this.driverForm = {};
this.vehicleIds = [];
this.deliveryDriver = [];
},
deep: true,
immediate: true
@ -903,18 +906,18 @@
},
sizeOrderChange(pageSize) {
this.page.pageSize = pageSize;
if (this.deliveryListId){
if (this.deliveryListId) {
//这里的编辑需要进行特殊处理
this.selectDiscussStockArticle(this.page);
}else {
this.onLoadEditOrder(this.page, this.deliveryListId);
} else {
this.onLoadOrder(this.page);
}
},
currentOrderChange(currentPage) {
this.page.currentPage = currentPage;
if (this.deliveryListId){
this.selectDiscussStockArticle(this.page);
}else {
if (this.deliveryListId) {
this.onLoadEditOrder(this.page, this.deliveryListId);
} else {
this.onLoadOrder(this.page);
}
},
@ -1054,28 +1057,27 @@
console.log('>>>>>>>>orderData', this.orderData);
const data = this.stockArticleList;
let info = [];
if (this.orderData) {
let a = this.orderData;
data.forEach(item => {
a.forEach(order => {
if (item.id === order.id) {
console.log('order----------------->', order);
item = order;
}
});
info.push(item);
});
}
this.orderData = info;
// this.orderData.forEach(item => {
// item.reservationNum = 0;
// this.stockArticleList.forEach((list, index) => {
// if (item.id === list.id) {
// list = item;
// }
// if (this.orderData) {
// let a = this.orderData;
// data.forEach(item => {
// a.forEach(order => {
// if (item.id === order.id) {
// console.log('order----------------->', order);
// item = order;
// }
// });
// info.push(item);
// });
// });
// }
data.map(item=>{
console.log(item);
this.orderData.forEach(order=>{
if (item.id !== order.id){
this.orderData.push(item);
}
})
})
// this.orderData = info;
console.log('+++++++++++++++', this.orderData);
this.orderShow = false;
},
@ -1490,65 +1492,11 @@
this.query.typeService = 1;
this.query.genre = '1';
const page = this.page;
let params = {};
if (this.deliveryListId) {
//这里应该是一个单独的请求，请求会返回这个预约下的所有订单信息和能够进行操作的订单
this.query.deliveryId = this.deliveryListId;
this.selectDiscussStockArticle(page);
// selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// console.log("----------------------------->",res.data.data);
// const data = res.data.data;
// // this.page.total = data.total;
// this.stockArticleInfo = data.records;
// this.stockArticleInfo.forEach((item, index) => {
// if (this.orderData) {
// this.orderData.forEach(a => {
// if (item.id === a.id) {
// this.$nextTick(() => {
// this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
// });
// console.log("item---------------->",item);
// this.checkOrder(item,index)
// }
// });
// }
// });
// this.page.total = data.total;
// });
this.query = {};
} else {
//初始化新增订单数据
this.onLoadOrder(page);
// selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// console.log(res.data.data);
// const data = res.data.data;
// this.page.total = data.total;
// this.stockArticleInfo = data.records;
// this.stockArticleInfo.forEach((item, index) => {
// this.checkOrder(item,index)
// });
// this.page.total = data.total;
// });
this.query = {};
}
this.query = {};
//初始化新增订单数据
this.onLoadOrder(page);
this.query = {};
this.loading = false;
// this.selectionClear();
// if (this.deliveryListId) {
// //编辑
// console.log("---->", this.stockArticleInfo);
// this.stockArticleInfo.forEach((item, index) => {
// console.log("aaa", item, index);
// this.orderData.forEach(o => {
// console.log("bbb", o);
// if (item.id === o.id) {
// this.$nextTick(() => {
// this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
// })
// }
// })
// })
// }
//新增
this.orderShow = true;
},
searchReset() {
@ -1558,31 +1506,31 @@
};
this.searchChange();
},
selectDiscussStockArticle(arg,params={}){
this.query.typeService = 1;
this.query.genre = '1';
const page = arg;
selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("----------------------------->",res.data.data);
const data = res.data.data;
// this.page.total = data.total;
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
if (this.orderData) {
this.orderData.forEach(a => {
if (item.id === a.id) {
this.$nextTick(() => {
this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
});
console.log("item---------------->",item);
this.checkOrder(item,index)
}
});
}
});
this.page.total = data.total;
});
},
// selectDiscussStockArticle(arg,params={}){
// this.query.typeService = 1;
// this.query.genre = '1';
// const page = arg;
// selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// console.log("----------------------------->",res.data.data);
// const data = res.data.data;
// // this.page.total = data.total;
// this.stockArticleInfo = data.records;
// this.stockArticleInfo.forEach((item, index) => {
// if (this.orderData) {
// this.orderData.forEach(a => {
// if (item.id === a.id) {
// this.$nextTick(() => {
// this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
// });
// console.log("item---------------->",item);
// this.checkOrder(item,index)
// }
// });
// }
// });
// this.page.total = data.total;
// });
// },
searchChange() {
let params = {};
this.query.typeService = 1;
@ -1648,14 +1596,15 @@
this.selectionList = [];
this.query = {};
},
selectDiscussStockArticle(arg,params={}){
onLoadEditOrder(arg, deliveryListId, params = {}) {
this.query.typeService = 1;
this.query.genre = '1';
const page = arg;
selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("----------------------------->",res.data.data);
const id = deliveryListId;
selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query), id).then(res => {
console.log('----------------------------->', res.data.data);
const data = res.data.data;
// this.page.total = data.total;
this.page.total = data.total;
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
if (this.orderData) {
@ -1664,19 +1613,19 @@
this.$nextTick(() => {
this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
});
console.log("item---------------->",item);
this.checkOrder(item,index)
console.log('item---------------->', item);
this.checkOrder(item, index);
}
});
}
});
this.page.total = data.total;
// this.page.total = data.total;
});
},
onLoadOrder(arg,params={}){
onLoadOrder(arg, params = {}) {
this.query.typeService = 1;
this.query.genre = '1';
const page =arg;
const page = arg;
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log(res.data.data);
const data = res.data.data;
@ -1684,7 +1633,7 @@
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结
this.checkOrder(item,index)
this.checkOrder(item, index);
});
this.page.total = data.total;
});

Write Preview
Loading…
Cancel
Save