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. 815
      src/views/distribution/turndelivery/deliveryDiscuss.vue

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

@ -755,322 +755,321 @@
</template>
<script>
import { getDictionaryBiz } from '@/api/system/dict';
import option from '@/option/distribution/distributionReservation';
import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
import { deliveryBusinessTask } from '@/api/distribution/distributionReservation';
import { getListUser } from '@/api/distribution/distributionStockup';
import { getPostList } from '@/api/system/post';
import { getListOwn } from '@/api/system/user';
import { getPackageList } from '@/api/distribution/distributionParcelList';
import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { selectStockArticleList } from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
import { getDeliveryList } from '@/api/distribution/distributionDeliveryList';
import { getDictionaryBiz } from '@/api/system/dict';
import option from '@/option/distribution/distributionReservation';
import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
import { deliveryBusinessTask } from '@/api/distribution/distributionReservation';
import { getListUser } from '@/api/distribution/distributionStockup';
import { getPostList } from '@/api/system/post';
import { getListOwn } from '@/api/system/user';
import { getPackageList } from '@/api/distribution/distributionParcelList';
import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { selectStockArticleList } from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
import { getDeliveryList } from '@/api/distribution/distributionDeliveryList';
export default {
data() {
return {
height: 0,
loading: false,
error: null,
form: {},
data: [],
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40,
},
query: {},
aaa: true,
bbb: false,
option: option,
deliveryTypeData: [],
//配送类型字典列表
resvervationStatusData: [],
//备货状态
stockupStatusData: [],
//订单来源
orderSourceData: [],
//预约时段
periodOfTimeData: [],
//配送方式
deliveryWayData: [],
//服务内容
addvalueServeTypeData: [],
//基础车辆信息
vehicleData: [],
//叉车信息
forkliftData: [],
//班组信息
loaderData: [],
//备货区信息
goodsAreaData: [],
//部门信息
deptId: '',
//司机信息
driverData: [],
//装卸班组
loadAndUnloadData: [],
//装卸
tripartiteSourceData: [],
//装卸只能
loadAndUnload: [],
//车辆信息
vehicleIds: [],
//配送司机信息
deliveryDriver: [],
//司机配置
isDriverShow: false,
//车辆表格信息
driverInfo: [],
//司机表格信息
vehticleInfo: [],
//主司机
masterDriverName: '',
//主车辆
masterVehictleName: '',
//司机配置选中行信息
multipleSelection: [],
//
multipleTable: {},
driverList: [],
vehticleList: [],
//订单数据
orderData: [],
//库存品数据
inventoryData: [],
//
selectionList: [],
addvalue: {},
//订单弹窗
orderShow: false,
//库存品弹窗
stockListShow: false,
//在库订单数据
stockArticleInfo: [],
//库存品信息列表
inventoryInfo: [],
//包件弹窗控制
isShowPackage: false,
//包件数据
packageData: [],
//班组职能
loadAndUnload: [],
//服务类型
serveType: [],
//外协数据来源
tripartiteSourceData: [],
deliveryListId: '',
};
},
created() {
this.$watch(
() => this.$route.params,
() => {
this.fetchData();
},
// 组件创建完后获取数据，
// 此时 data 已经被 observed 了
{ immediate: true }
);
export default {
data() {
return {
height: 0,
loading: false,
error: null,
form: {},
data: [],
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
query:{},
aaa: true,
bbb: false,
option: option,
deliveryTypeData: [],
//配送类型字典列表
resvervationStatusData: [],
//备货状态
stockupStatusData: [],
//订单来源
orderSourceData: [],
//预约时段
periodOfTimeData: [],
//配送方式
deliveryWayData: [],
//服务内容
addvalueServeTypeData: [],
//基础车辆信息
vehicleData: [],
//叉车信息
forkliftData: [],
//班组信息
loaderData: [],
//备货区信息
goodsAreaData: [],
//部门信息
deptId: '',
//司机信息
driverData: [],
//装卸班组
loadAndUnloadData: [],
//装卸
tripartiteSourceData: [],
//装卸只能
loadAndUnload: [],
//车辆信息
vehicleIds: [],
//配送司机信息
deliveryDriver: [],
//司机配置
isDriverShow: false,
//车辆表格信息
driverInfo: [],
//司机表格信息
vehticleInfo: [],
//主司机
masterDriverName: '',
//主车辆
masterVehictleName: '',
//司机配置选中行信息
multipleSelection: [],
//
multipleTable: {},
driverList: [],
vehticleList: [],
//订单数据
orderData:[],
//库存品数据
inventoryData:[],
//
selectionList:[],
addvalue: {},
//订单弹窗
orderShow:false,
//库存品弹窗
stockListShow:false,
//在库订单数据
stockArticleInfo:[],
//库存品信息列表
inventoryInfo:[],
//包件弹窗控制
isShowPackage:false,
//包件数据
packageData:[],
//班组职能
loadAndUnload:[],
//服务类型
serveType:[],
//外协数据来源
tripartiteSourceData:[],
deliveryListId:'',
this.getDictionary();
this.getFork();
this.getTeam();
this.getvehicleData();
this.getMasterDriverData();
},
computed: {},
mounted() {
this.onLoad(this.page);
},
methods: {
//查询叉车人员
async getFork() {
let ides = '';
let ide = {};
await getListUser().then(res => {
console.log('res>>>', res.data.data);
ides = res.data.data.tenantId;
this.deptId = res.data.data.deptId;
});
await getPostList(ides).then(res => {
console.log('>>>>', res.data.data);
// this.forkliftData = res.data.data;
res.data.data.forEach(i => {
if (i.postName == '叉车') {
ide = i;
}
});
});
// console.log("ied>>>>>",ide);
let params = {
postId: ide.id, //岗位
deptId: this.deptId, //部门
// roleId: '', //角色
};
getListOwn(Object.assign(params, this.query)).then(res => {
// console.log(".............",res.data.data);
let fo = [];
res.data.data.forEach(i => {
let a = {
dictKey: i.id,
dictValue: i.name,
};
fo.push(a);
});
this.forkliftData = fo;
});
await this.getStorageArea();
await this.getTeam();
},
//查询班组
async getTeam() {
let params = {
department: this.deptId,
};
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,
};
fo.push(a);
});
this.loaderData = fo;
});
},
//备货区
async getStorageArea() {
let params = {
department: this.deptId,
};
stockUp(params).then(res => {
let fo = [];
res.data.data.forEach(i => {
let v = {
dictKey: i.id,
dictValue: i.name + '-' + i.headline,
};
fo.push(v);
});
this.goodsAreaData = fo;
});
},
//查询司机信息
getMasterDriverData() {
getDriverList(1, 10, '').then(res => {
this.driverData = res.data.data.records;
});
},
selectionChange(list) {
this.selectionList = list;
},
//查询车辆信息
getvehicleData() {
getVehicleList(1, 10, '').then(res => {
this.vehicleData = res.data.data.records;
console.log(res.data.data);
});
created() {
this.$watch(
() => this.$route.params,
() => {
this.fetchData();
},
// 组件创建完后获取数据，
// 此时 data 已经被 observed 了
{ immediate: true }
);
this.getDictionary();
this.getFork();
this.getTeam();
this.getvehicleData();
this.getMasterDriverData();
},
fetchData() {
this.error = this.post = null;
this.loading = true;
if (this.$route.query.id) {
this.deliveryListId = this.$route.query.id;
}
computed: {},
mounted() {
this.onLoad(this.page);
},
viewDriverInfo() {
console.log(this.driverInfo.length);
console.log(this.vehticleInfo.length);
if (this.driverList.length !== this.vehticleList.length) {
this.$message({
message: '司机车辆数量有误!!!',
type: 'warning',
methods: {
//查询叉车人员
async getFork() {
let ides = '';
let ide = {};
await getListUser().then(res => {
console.log('res>>>', res.data.data);
ides = res.data.data.tenantId;
this.deptId = res.data.data.deptId;
});
return;
}
this.isDriverShow = true;
},
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
},
/**
* 查看包件
*/
viewStockArticlePackage(row) {
this.isShowPackage = true;
// this.loading = true;
this.orderData.forEach(item => {
if (item.id === row.id) {
item.packageList = [];
await getPostList(ides).then(res => {
console.log('>>>>', res.data.data);
// this.forkliftData = res.data.data;
res.data.data.forEach(i => {
if (i.postName == '叉车') {
ide = i;
}
});
});
// console.log("ied>>>>>",ide);
let params = {
postId: ide.id, //岗位
deptId: this.deptId //部门
// roleId: '', //角色
};
getListOwn(Object.assign(params, this.query)).then(res => {
// console.log(".............",res.data.data);
let fo = [];
res.data.data.forEach(i => {
let a = {
dictKey: i.id,
dictValue: i.name
};
fo.push(a);
});
this.forkliftData = fo;
});
await this.getStorageArea();
await this.getTeam();
},
//查询班组
async getTeam() {
let params = {
department: this.deptId
};
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
};
fo.push(a);
});
this.loaderData = fo;
});
},
//备货区
async getStorageArea() {
let params = {
department: this.deptId
};
stockUp(params).then(res => {
let fo = [];
res.data.data.forEach(i => {
let v = {
dictKey: i.id,
dictValue: i.name + '-' + i.headline
};
fo.push(v);
});
this.goodsAreaData = fo;
});
},
//查询司机信息
getMasterDriverData() {
getDriverList(1, 10, '').then(res => {
this.driverData = res.data.data.records;
});
},
selectionChange(list) {
this.selectionList = list;
},
//查询车辆信息
getvehicleData() {
getVehicleList(1, 10, '').then(res => {
this.vehicleData = res.data.data.records;
console.log(res.data.data);
});
},
fetchData() {
this.error = this.post = null;
this.loading = true;
if (this.$route.query.id) {
this.deliveryListId = this.$route.query.id;
}
});
getPackageList('1', '10', { stockArticleId: row.id }).then(res => {
const packages = res.data.data;
console.log('>>>>>>>', packages);
this.packageData = packages.records;
this.loading = false;
});
},
/**
* 提交包件信息
*/
onSubmitPackage() {
//这里提交包件主要是对包件进行数量的统计
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
//这里就需要将具体的包件信息和订单进行关系绑定
this.orderData.forEach(o => {
this.selectionList.forEach(p => {
if (p.stockArticleId === o.id) {
o.packageList.push(p);
},
viewDriverInfo() {
console.log(this.driverInfo.length);
console.log(this.vehticleInfo.length);
if (this.driverList.length !== this.vehticleList.length) {
this.$message({
message: '司机车辆数量有误!!!',
type: 'warning'
});
return;
}
this.isDriverShow = true;
},
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {
});
},
/**
* 查看包件
*/
viewStockArticlePackage(row){
this.isShowPackage = true;
// this.loading = true;
this.orderData.forEach(item=>{
if (item.id===row.id){
item.packageList = [];
}
})
getPackageList('1', '10', { stockArticleId: row.id }).then(res => {
const packages = res.data.data;
console.log('>>>>>>>', packages);
this.packageData = packages.records;
this.loading = false;
});
});
this.isShowPackage = false;
console.log(this.orderData);
},
removeStockArticle(row) {
this.orderData.forEach((item, index) => {
if (item.id === row.id) {
this.orderData.splice(index, 1);
},
/**
* 提交包件信息
*/
onSubmitPackage(){
//这里提交包件主要是对包件进行数量的统计
if (this.selectionList.length === 0 ){
this.$message.warning('请选择至少一条数据');
return;
}
console.log(item);
});
console.log('>>>>>>>>>>>>>>>row', row);
},
onSubmitInventory() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
if (this.orderData.length) {
this.selectionList.some(i => {
let a = this.inventoryData.filter(ele => ele.id == i.id).length >= 1;
if (!a) {
this.inventoryData.push(i);
//这里就需要将具体的包件信息和订单进行关系绑定
this.orderData.forEach(o=>{
this.selectionList.forEach(p=>{
if (p.stockArticleId === o.id){
o.packageList.push(p);
}
})
});
this.isShowPackage = false;
console.log(this.orderData);
},
removeStockArticle(row) {
this.orderData.forEach((item, index) => {
if (item.id === row.id) {
this.orderData.splice(index, 1);
}
console.log(item);
});
} else {
this.inventoryData = this.selectionList;
}
console.log('>>>>>>>>>>>>>>>row', row);
},
onSubmitInventory(){
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
if (this.orderData.length) {
this.selectionList.some(i => {
let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
if (!a) {
this.inventoryData.push(i);
}
});
} else {
this.inventoryData = this.selectionList;
}
this.stockListShow = false;
},
@ -1313,47 +1312,42 @@ export default {
});
},
ccc() {
this.aaa = true;
this.bbb = false;
this.form = {};
this.loadAndUnload = [];
},
ddd() {
this.aaa = false;
this.bbb = true;
this.form = {};
this.loadAndUnload = [];
},
handleAddOrder() {
this.query.typeService = 1;
let page = this.page;
let params = {};
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;
});
this.page.total = data.total;
this.stockArticleInfo = data.records;
this.loading = false;
this.selectionClear();
});
this.selectionList = [];
this.orderShow = true;
},
handleAddInventory() {
this.form.deliveryType = '2';
let params = {};
let page = this.page;
getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
res => {
ccc() {
this.aaa = true;
this.bbb = false;
this.form = {};
this.loadAndUnload = [];
},
ddd() {
this.aaa = false;
this.bbb = true;
this.form = {};
this.loadAndUnload = [];
},
handleAddOrder() {
this.query.typeService=1;
let page =this.page;
let params = {};
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;
});
this.page.total = data.total;
this.stockArticleInfo = data.records;
this.loading = false;
this.selectionClear();
})
this.selectionList = [];
this.orderShow = true;
},
handleAddInventory() {
this.form.deliveryType ='2';
let params = {};
let page = this.page;
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,59 +1355,100 @@ export default {
this.inventoryInfo = inventoryList.records;
this.loading = false;
this.selectionClear();
});
this.selectionList = [];
this.stockListShow = true;
},
onSubmitOrder() {
this.orderData=this.selectionList;
this.orderShow = false;
},
selectionClear() {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
onLoad(page, params = {}) {
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)
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.selectionList = [];
this.stockListShow = true;
},
onSubmitOrder() {
this.orderData = this.selectionList;
this.orderShow = false;
},
selectionClear() {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
onLoad(page, params = {}) {
console.log('》》》》》》》》》》》》》》》', this.deliveryListId);
if (this.deliveryListId) {
getDeliveryList(this.deliveryListId).then(res => {
let data = res.data.data;
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;
// 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);
// 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 => {});
// 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;
// console.log('>>>>>>>>this.form', this.form);
// console.log(res.data.data);
// this.orderData = data.stockArticleList;
// });
// }
// this.loading = false;
},
},
};

Write Preview
Loading…
Cancel
Save