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 

# Conflicts:
#	src/views/distribution/turndelivery/deliveryDiscuss.vue
dev-warehouse
zhangsiyu 2 years ago
parent
7ef4ba3c54 90291a00b0
commit
c6e6f785e9
1 changed files with 425 additions and 390 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. 117
      src/views/distribution/turndelivery/deliveryDiscuss.vue

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

@ -782,7 +782,7 @@ export default {
page: {
currentPage: 1,
pageSize: 10,
total: 40,
total: 40
},
query:{},
aaa: true,
@ -865,6 +865,8 @@ export default {
//外协数据来源
tripartiteSourceData:[],
deliveryListId:'',
};
},
created() {
@ -911,7 +913,7 @@ export default {
// console.log("ied>>>>>",ide);
let params = {
postId: ide.id, //岗位
deptId: this.deptId, //部门
deptId: this.deptId //部门
// roleId: '', //角色
};
getListOwn(Object.assign(params, this.query)).then(res => {
@ -920,7 +922,7 @@ export default {
res.data.data.forEach(i => {
let a = {
dictKey: i.id,
dictValue: i.name,
dictValue: i.name
};
fo.push(a);
});
@ -932,18 +934,14 @@ export default {
//查询班组
async getTeam() {
let params = {
department: this.deptId,
department: this.deptId
};
getListTeam(
this.page.currentPage,
this.page.pageSize,
Object.assign(params, this.query)
).then(res => {
getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
let fo = [];
res.data.data.records.forEach(i => {
let a = {
dictKey: i.id,
dictValue: i.name + '-' + i.groupName,
dictValue: i.name + '-' + i.groupName
};
fo.push(a);
});
@ -953,14 +951,14 @@ export default {
//备货区
async getStorageArea() {
let params = {
department: this.deptId,
department: this.deptId
};
stockUp(params).then(res => {
let fo = [];
res.data.data.forEach(i => {
let v = {
dictKey: i.id,
dictValue: i.name + '-' + i.headline,
dictValue: i.name + '-' + i.headline
};
fo.push(v);
});
@ -996,7 +994,7 @@ export default {
if (this.driverList.length !== this.vehticleList.length) {
this.$message({
message: '司机车辆数量有误!!!',
type: 'warning',
type: 'warning'
});
return;
}
@ -1007,7 +1005,8 @@ export default {
.then(_ => {
done();
})
.catch(_ => {});
.catch(_ => {
});
},
/**
* 查看包件
@ -1019,7 +1018,7 @@ export default {
if (item.id===row.id){
item.packageList = [];
}
});
})
getPackageList('1', '10', { stockArticleId: row.id }).then(res => {
const packages = res.data.data;
console.log('>>>>>>>', packages);
@ -1042,7 +1041,7 @@ export default {
if (p.stockArticleId === o.id){
o.packageList.push(p);
}
});
})
});
this.isShowPackage = false;
console.log(this.orderData);
@ -1063,7 +1062,7 @@ export default {
}
if (this.orderData.length) {
this.selectionList.some(i => {
let a = this.inventoryData.filter(ele => ele.id == i.id).length >= 1;
let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
if (!a) {
this.inventoryData.push(i);
}
@ -1329,11 +1328,7 @@ export default {
this.query.typeService=1;
let page =this.page;
let params = {};
selectStockArticleList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
).then(res => {
selectStockArticleList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
const data = res.data.data;
data.records.forEach(item => {
item.reservationNum = item.handQuantity;
@ -1342,7 +1337,7 @@ export default {
this.stockArticleInfo = data.records;
this.loading = false;
this.selectionClear();
});
})
this.selectionList = [];
this.orderShow = true;
},
@ -1350,10 +1345,9 @@ export default {
this.form.deliveryType ='2';
let params = {};
let page = this.page;
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
res => {
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const inventoryList = res.data.data;
console.log('>>>>>>>>>>', inventoryList);
console.log(">>>>>>>>>>",inventoryList);
inventoryList.records.forEach(item => {
item.reservationNum = '0';
});
@ -1361,8 +1355,7 @@ export default {
this.inventoryInfo = inventoryList.records;
this.loading = false;
this.selectionClear();
}
);
});
this.selectionList = [];
this.stockListShow = true;
},
@ -1375,45 +1368,87 @@ export default {
// this.$refs.table.clearSelection();
},
onLoad(page, params = {}) {
console.log('》》》》》》》》》》》》》》》', this.deliveryListId);
console.log("》》》》》》》》》》》》》》》",this.deliveryListId);
if (this.deliveryListId){
getDeliveryList(this.deliveryListId).then(res=>{
let data = res.data.data;
Object.assign(this.form, data.reservationInfo);
Object.assign(this.form, data.stockupInfo);
Object.assign(this.form,data.reservationInfo)
Object.assign(this.form,data.stockupInfo)
this.form.deliveryType = '2';
this.serveType = data.reservationInfo.serveType.split(',');
this.serveType = data.reservationInfo.serveType.split(",");
if (data.stockupInfo){
this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
this.loadAndUnload = data.stockupInfo.teamResponsibility.split(",");
}
this.form.loader = data.stockupInfo.loaderName;
this.form.forklift = data.stockupInfo.forkliftName;
this.form.remarks = data.stockupInfo.remarks;
if (data.kind === '1') {
if (data.kind === "1"){
//自主配送
let self = data.deliverySelfVO;
let vehicle = this.vehicleData;
console.log('___________________vahicle', vahicle);
console.log("___________________vahicle",vahicle);
vehicle.forEach(item=>{
console.log('___________________', item);
self.forEach(s => {});
});
console.log("___________________",item);
self.forEach(s=>{
})
})
}else {
this.aaa = false;
this.bbb = true;
//外协配送
}
this.vehicleData.forEach(item => {});
this.vehicleData.forEach(item=>{
})
console.log('>>>>>>>>this.form', this.form);
console.log(">>>>>>>>this.form",this.form);
console.log(res.data.data);
this.orderData = data.stockArticleList;
});
})
}
this.loading = false;
// Object.assign(this.form, data.reservationInfo);
// Object.assign(this.form, data.stockupInfo);
// this.form.deliveryType = '2';
// this.serveType = data.reservationInfo.serveType.split(',');
// if (data.stockupInfo) {
// this.loadAndUnload = data.stockupInfo.teamResponsibility.split(',');
// }
// this.form.loader = data.stockupInfo.loaderName;
// this.form.forklift = data.stockupInfo.forkliftName;
// this.form.remarks = data.stockupInfo.remarks;
// if (data.kind === '1') {
// //自主配送
// let self = data.deliverySelfVO;
// let vehicle = this.vehicleData;
// console.log('___________________vahicle', vahicle);
// vehicle.forEach(item => {
// console.log('___________________', item);
// self.forEach(s => {});
// });
// } else {
// this.aaa = false;
// this.bbb = true;
// //外协配送
// }
// this.vehicleData.forEach(item => {});
// console.log('>>>>>>>>this.form', this.form);
// console.log(res.data.data);
// this.orderData = data.stockArticleList;
// });
// }
// this.loading = false;
},
},
};

Write Preview
Loading…
Cancel
Save