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

仓库所属部门调整

fix_bug_pro20231227
kilo 2 years ago
parent
915daa67da
commit
f28214adb5
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
Unified 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({ return request({
url: '/api/logpm-distribution/deliveryList/selectDiscussStockArticleInfoList', url: '/api/logpm-distribution/deliveryList/selectDiscussStockArticleInfoList',
method: 'get', method: 'get',
@ -208,11 +208,12 @@ export const selectDiscussStockArticleInfoList = (current, size, params) => {
...params, ...params,
current, current,
size, size,
deliveryListId
} }
}) })
} }
export const selectUpdateAvailableStockArticle = (current, size, id,params) => { export const selectUpdateAvailableStockArticle = (current, size,params) => {
return request({ return request({
url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle', url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle',
method: 'get', method: 'get',
@ -220,7 +221,6 @@ export const selectUpdateAvailableStockArticle = (current, size, id,params) => {
...params, ...params,
current, current,
size, size,
id,
} }
}) })
} }

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

@ -20,7 +20,6 @@
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
> >
<template #menu-left> <template #menu-left>
<el-button type="danger" <el-button type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@ -467,7 +466,6 @@
leaf: level >= stop_level leaf: level >= stop_level
}) })
})); }));
} }
if (level == 0) { if (level == 0) {
axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => { axios.get(`/api/blade-system/dept/lazy-tree?parentId=0`).then(res => {
@ -847,10 +845,12 @@
}) })
row.administrativeAreas = str.join(","); row.administrativeAreas = str.join(",");
} }
if (this.form.departmentName){ console.log("-------------->this.form.departmentName",this.form.departmentName);
this.form.department = this.department; console.log("-------------->this.department",this.department);
if (row.departmentName){
row.department = this.department;
} }
console.log(row); console.log("-------------->row",row);
add(row).then(() => { add(row).then(() => {
this.onLoad(this.page); this.onLoad(this.page);
this.$message({ this.$message({
@ -906,8 +906,8 @@
}) })
row.administrativeAreas = str.join(","); row.administrativeAreas = str.join(",");
} }
if (this.form.departmentName){ if (row.departmentName){
this.form.department = this.department; row.department = this.department;
} }
update(row).then(() => { update(row).then(() => {
this.onLoad(this.page); 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 { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle'; import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; 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 { getInventoryList } from '@/api/distribution/distributionStockList';
import { getDeliveryList, updateDeliveryList } from '@/api/distribution/distributionDeliveryList'; import { getDeliveryList, updateDeliveryList } from '@/api/distribution/distributionDeliveryList';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
@ -736,13 +739,13 @@
'$route.query.id': { '$route.query.id': {
handler(newVal, oldVal) { handler(newVal, oldVal) {
console.log(newVal, oldVal); console.log(newVal, oldVal);
if (!!this.$route.query.id){ if (!!this.$route.query.id) {
this.fetchData(); this.fetchData();
this.onLoad(this.page); this.onLoad(this.page);
} }
this.driverForm={}; this.driverForm = {};
this.vehicleIds=[]; this.vehicleIds = [];
this.deliveryDriver=[]; this.deliveryDriver = [];
}, },
deep: true, deep: true,
immediate: true immediate: true
@ -903,18 +906,18 @@
}, },
sizeOrderChange(pageSize) { sizeOrderChange(pageSize) {
this.page.pageSize = pageSize; this.page.pageSize = pageSize;
if (this.deliveryListId){ if (this.deliveryListId) {
//这里的编辑需要进行特殊处理 //这里的编辑需要进行特殊处理
this.selectDiscussStockArticle(this.page); this.onLoadEditOrder(this.page, this.deliveryListId);
}else { } else {
this.onLoadOrder(this.page); this.onLoadOrder(this.page);
} }
}, },
currentOrderChange(currentPage) { currentOrderChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
if (this.deliveryListId){ if (this.deliveryListId) {
this.selectDiscussStockArticle(this.page); this.onLoadEditOrder(this.page, this.deliveryListId);
}else { } else {
this.onLoadOrder(this.page); this.onLoadOrder(this.page);
} }
}, },
@ -1054,28 +1057,27 @@
console.log('>>>>>>>>orderData', this.orderData); console.log('>>>>>>>>orderData', this.orderData);
const data = this.stockArticleList; const data = this.stockArticleList;
let info = []; let info = [];
if (this.orderData) { // if (this.orderData) {
let a = this.orderData; // let a = this.orderData;
data.forEach(item => { // data.forEach(item => {
a.forEach(order => { // a.forEach(order => {
if (item.id === order.id) { // if (item.id === order.id) {
console.log('order----------------->', order); // console.log('order----------------->', order);
item = order; // item = order;
} // }
}); // });
info.push(item); // 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;
// }
// }); // });
// }); // }
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); console.log('+++++++++++++++', this.orderData);
this.orderShow = false; this.orderShow = false;
}, },
@ -1490,65 +1492,11 @@
this.query.typeService = 1; this.query.typeService = 1;
this.query.genre = '1'; this.query.genre = '1';
const page = this.page; const page = this.page;
let params = {}; this.query = {};
if (this.deliveryListId) { //初始化新增订单数据
//这里应该是一个单独的请求，请求会返回这个预约下的所有订单信息和能够进行操作的订单 this.onLoadOrder(page);
this.query.deliveryId = this.deliveryListId; this.query = {};
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.loading = false; 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; this.orderShow = true;
}, },
searchReset() { searchReset() {
@ -1558,31 +1506,31 @@
}; };
this.searchChange(); this.searchChange();
}, },
selectDiscussStockArticle(arg,params={}){ // selectDiscussStockArticle(arg,params={}){
this.query.typeService = 1; // this.query.typeService = 1;
this.query.genre = '1'; // this.query.genre = '1';
const page = arg; // const page = arg;
selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { // selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("----------------------------->",res.data.data); // console.log("----------------------------->",res.data.data);
const data = res.data.data; // const data = res.data.data;
// this.page.total = data.total; // // this.page.total = data.total;
this.stockArticleInfo = data.records; // this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => { // this.stockArticleInfo.forEach((item, index) => {
if (this.orderData) { // if (this.orderData) {
this.orderData.forEach(a => { // this.orderData.forEach(a => {
if (item.id === a.id) { // if (item.id === a.id) {
this.$nextTick(() => { // this.$nextTick(() => {
this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true); // this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
}); // });
console.log("item---------------->",item); // console.log("item---------------->",item);
this.checkOrder(item,index) // this.checkOrder(item,index)
} // }
}); // });
} // }
}); // });
this.page.total = data.total; // this.page.total = data.total;
}); // });
}, // },
searchChange() { searchChange() {
let params = {}; let params = {};
this.query.typeService = 1; this.query.typeService = 1;
@ -1648,14 +1596,15 @@
this.selectionList = []; this.selectionList = [];
this.query = {}; this.query = {};
}, },
selectDiscussStockArticle(arg,params={}){ onLoadEditOrder(arg, deliveryListId, params = {}) {
this.query.typeService = 1; this.query.typeService = 1;
this.query.genre = '1'; this.query.genre = '1';
const page = arg; const page = arg;
selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const id = deliveryListId;
console.log("----------------------------->",res.data.data); selectDiscussStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query), id).then(res => {
console.log('----------------------------->', res.data.data);
const data = res.data.data; const data = res.data.data;
// this.page.total = data.total; this.page.total = data.total;
this.stockArticleInfo = data.records; this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => { this.stockArticleInfo.forEach((item, index) => {
if (this.orderData) { if (this.orderData) {
@ -1664,19 +1613,19 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true); this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
}); });
console.log("item---------------->",item); console.log('item---------------->', item);
this.checkOrder(item,index) 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.typeService = 1;
this.query.genre = '1'; this.query.genre = '1';
const page =arg; const page = arg;
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log(res.data.data); console.log(res.data.data);
const data = res.data.data; const data = res.data.data;
@ -1684,7 +1633,7 @@
this.stockArticleInfo = data.records; this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => { this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结 //检查订单是否冻结
this.checkOrder(item,index) this.checkOrder(item, index);
}); });
this.page.total = data.total; this.page.total = data.total;
}); });

Write Preview
Loading…
Cancel
Save