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

市配预约编辑调整

fix_bug_pro20231227
kilo 2 years ago
parent
0110c1d319
commit
ead4608f34
5 changed files with 1577 additions and 1435 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. 13
      src/api/distribution/distributionStockArticle.js
  2. 5
      src/option/distribution/distributionReservation.js
  3. 537
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  4. 343
      src/views/distribution/reservation/reservationFrom.vue
  5. 164
      src/views/distribution/turndelivery/deliveryDiscuss.vue

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

@ -184,4 +184,17 @@ export const selectStockArticleAndParcel = (params) => {
})
}
export const selectStockArticleInfoList = (current, size, params) => {
return request({
url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleInfoList',
method: 'get',
params: {
...params,
current,
size,
}
})
}

5
src/option/distribution/distributionReservation.js
Unescape View File

@ -337,6 +337,11 @@ export default {
prop: 'serviceNumber',
width: '100'
},
{
label: '运单号',
prop: 'waybillNumber',
width: '100'
},
{
label: '订单自编号',
prop: 'orderCode',

537
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -29,7 +29,8 @@
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<!-- <span>{{deliverydata.loadingTeamType}} </span> -->
<span>装卸类型： 装 </span>
<span>装卸班组：{{deliverydata.teamResponsibility}} </span>
<!-- <span>装卸类型： 装 </span>-->
</el-col>
</el-row>
<el-divider>作业时间</el-divider>
@ -37,8 +38,11 @@
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>创建时间：{{deliverydata.createTime}} </span>
</el-col>
<!-- <el-col :xl="7" :lg="7" :md="8" :sm="24">-->
<!-- <span>备货时间：{{deliverydata.leadTime}} </span>-->
<!-- </el-col> -->
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>备货时间：{{deliverydata.leadTime}} </span>
<span>出库时间：{{deliverydata.outboundDate}} </span>
</el-col>
<el-col :xl="7" :lg="7" :md="8" :sm="24">
<span>装车时间：{{deliverydata.loadingTime}} </span>
@ -99,11 +103,21 @@
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看
</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleEdit(row)">编 辑
</el-button>
<!-- <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
<el-button type="primary" text icon="el-icon-view" @click="handleOne(row)" v-if="deliverydata.deliveryNumber > deliverydata.loadNub && row.signingStatus=='未签收'">一 键 装 车</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收' && row.driverSigning=='已签收' ">复 核 签 收</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)" v-if="row.signingStatus=='未签收' && row.driverSigning=='未签收' ">一 键 签 收</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleOne(row)"
v-if="deliverydata.deliveryNumber > deliverydata.loadNub && row.signingStatus=='未签收'">
一 键 装 车
</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSign(row)"
v-if="row.signingStatus=='未签收' && row.driverSigning=='已签收' ">复 核 签 收
</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)"
v-if="row.signingStatus=='未签收' && row.driverSigning=='未签收' ">一 键 签 收
</el-button>
</template>
</el-table-column>
</el-table>
@ -204,7 +218,6 @@
</el-tabs>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
@ -301,7 +314,7 @@ import {
getpackdetail,
getinventorydetail
} from '@/api/distribution/distributionDeliveryList';
import { update as updatesign,getOneclickq } from "@/api/distribution/distributionSignfor";
import { update as updatesign, getOneclickq } from '@/api/distribution/distributionSignfor';
import option from '@/option/basic/basicPdarecords';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@ -326,7 +339,7 @@ export default {
//是否显示新增
isadd: false,
deliverydata: {
reservationList:[],
reservationList: []
},
// 加载中
loading: true,
@ -371,78 +384,78 @@ export default {
selection: true,
column: [
{
label: "配送车次号",
prop: "trainNumber",
label: '配送车次号',
prop: 'trainNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "收货人",
prop: "consignee",
label: '收货人',
prop: 'consignee',
search: true,
width:"100px"
width: '100px'
},
{
label: "收货电话",
prop: "deliveryPhone",
label: '收货电话',
prop: 'deliveryPhone',
search: true,
width:"100px"
width: '100px'
},
{
label: "收货地址",
prop: "deliveryAddress",
label: '收货地址',
prop: 'deliveryAddress',
search: true,
width:"100px"
width: '100px'
},
{
label: "订单自编号",
prop: "orderIds",
label: '订单自编号',
prop: 'orderIds',
search: true,
width:"100px"
width: '100px'
},
{
label: "配送件数",
prop: "packageNub",
label: '配送件数',
prop: 'packageNub',
search: true,
width:"100px"
width: '100px'
},
{
label: "配送库存品数",
prop: "reservationStockListNum",
label: '配送库存品数',
prop: 'reservationStockListNum',
search: true,
width:"110px"
width: '110px'
},
{
label: "计划件数",
prop: "reservationNum",
label: '计划件数',
prop: 'reservationNum',
search: true,
width:"100px"
width: '100px'
},
{
label: "扫描件数",
prop: "loadedNub",
label: '扫描件数',
prop: 'loadedNub',
search: true,
width:"100px"
width: '100px'
},
{
label: "是否加急",
prop: "isUrgent",
label: '是否加急',
prop: 'isUrgent',
search: true,
width:"100px"
width: '100px'
},
{
label: "签收件数",
prop: "receivedQuantity",
label: '签收件数',
prop: 'receivedQuantity',
search: true,
width:"100px"
width: '100px'
},
{
label: "签收状态",
prop: "signingStatus",
label: '签收状态',
prop: 'signingStatus',
search: true,
width:"100px"
},
width: '100px'
}
]
},
@ -462,14 +475,14 @@ export default {
submitBtn: false, //隐藏提交按钮
column: [
{
label: "收货人姓名",
label: '收货人姓名',
labelWidth: '150',
span: 11,
prop: "consignee",
type: "input",
width:"150px",
prop: 'consignee',
type: 'input',
width: '150px',
align: 'center',
disabled:true,
disabled: true
// rules: [{
// required: true,
// message: "输入承运商编号",
@ -477,52 +490,52 @@ export default {
// }],
},
{
label: "收货人电话",
prop: "deliveryPhone",
label: '收货人电话',
prop: 'deliveryPhone',
labelWidth: '150',
span: 11,
type: "input",
width:"150px",
type: 'input',
width: '150px',
align: 'center',
disabled:true,
disabled: true
},
{
label: "收货地址",
prop: "deliveryAddress",
label: '收货地址',
prop: 'deliveryAddress',
labelWidth: '150',
span: 11,
type: "input",
width:"150px",
type: 'input',
width: '150px',
align: 'center',
disabled:true,
disabled: true
},
{
label: "签收类型",
prop: "signingType",
label: '签收类型',
prop: 'signingType',
labelWidth: '150',
span: 11,
type: "radio",
width:"150px",
type: 'radio',
width: '150px',
align: 'center',
disabled: false,
dicData: [
{
label: '签收',
value: '1',
value: '1'
},
{
label: '代签收',
value: '2',
value: '2'
}
],
]
},
{
label: "签收图片",
prop: "deliverySignPictures",
label: '签收图片',
prop: 'deliverySignPictures',
labelWidth: '150',
type: 'upload',
listType: 'picture-card',
width:"150px",
width: '150px',
span: 15,
multiple: true,
align: 'left',
@ -530,9 +543,9 @@ export default {
limit: 5,
propsHttp: {
res: 'data',
url: 'link',
url: 'link'
},
disabled:false,
disabled: false
},
// {
// label: "复核图片",
@ -559,14 +572,14 @@ export default {
// },
{
label: "备注",
prop: "clerkSignRemarks",
label: '备注',
prop: 'clerkSignRemarks',
labelWidth: '150',
span: 15,
type: "input",
width:"150px",
align:'center',
},
type: 'input',
width: '150px',
align: 'center'
}
]
},
@ -580,58 +593,58 @@ export default {
selection: true,
column: [
{
label: "包条码",
prop: "orderPackageCode",
label: '包条码',
prop: 'orderPackageCode',
search: true,
width:"100px"
width: '100px'
},
{
label: "仓库",
prop: "warehouse",
label: '仓库',
prop: 'warehouse',
search: true,
width:"100px"
width: '100px'
},
{
label: "一级品类",
prop: "firsts",
label: '一级品类',
prop: 'firsts',
search: true,
width:"100px"
width: '100px'
},
{
label: "二级品类",
prop: "second",
label: '二级品类',
prop: 'second',
search: true,
width:"100px"
width: '100px'
},
{
label: "三级品类",
prop: "thirdProduct",
label: '三级品类',
prop: 'thirdProduct',
search: true,
width:"100px"
width: '100px'
},
{
label: "物料编号",
prop: "materialCode",
label: '物料编号',
prop: 'materialCode',
search: true,
width:"100px"
width: '100px'
},
{
label: "物料名称",
prop: "materialName",
label: '物料名称',
prop: 'materialName',
search: true,
width:"100px"
width: '100px'
},
{
label: "托盘码",
prop: "pallet",
width:"100px"
label: '托盘码',
prop: 'pallet',
width: '100px'
},
{
label: "库位号",
prop: "goodsAllocation",
label: '库位号',
prop: 'goodsAllocation',
width:"100px"
},
width: '100px'
}
]
},
@ -643,10 +656,10 @@ export default {
selection: true,
column: [
{
label: "sku",
prop: "sku",
label: 'sku',
prop: 'sku',
search: true,
width:"100px"
width: '100px'
},
// {
// label: "订单自编号",
@ -655,10 +668,10 @@ export default {
// width:"100px"
// },
{
label: "物料名称",
prop: "descriptionGoods",
label: '物料名称',
prop: 'descriptionGoods',
search: true,
width:"100px"
width: '100px'
},
// {
// label: "单位",
@ -667,39 +680,39 @@ export default {
// width:"100px"
// },
{
label: "备货数",
prop: "deliveryNumber",
label: '备货数',
prop: 'deliveryNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "已备数量",
prop: "readyStock",
label: '已备数量',
prop: 'readyStock',
search: true,
width:"100px"
width: '100px'
},
{
label: "物料编号",
prop: "cargoNumber",
label: '物料编号',
prop: 'cargoNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "单位",
prop: "cargoUnit",
label: '单位',
prop: 'cargoUnit',
search: true,
width:"100px"
width: '100px'
},
{
label: "托盘码",
prop: "pallet",
width:"100px"
label: '托盘码',
prop: 'pallet',
width: '100px'
},
{
label: "库位信息",
prop: "goodsAllocation",
width:"100px"
},
label: '库位信息',
prop: 'goodsAllocation',
width: '100px'
}
]
@ -712,53 +725,78 @@ export default {
selection: true,
column: [
{
label: "订单自编号",
prop: "orderCode",
label: '订单自编号',
prop: 'orderCode',
search: true,
width: '100px'
},
{
label: '货物名称',
prop: 'descriptionGoods',
search: true,
width: '100px'
},
{
label: '物料名称',
prop: 'materialName',
search: true,
width: '100px'
},
{
label: '备货件数',
prop: 'deliveryNumber',
search: true,
width:"100px"
width: '100px'
},
{
label: "货物名称",
prop: "descriptionGoods",
label: '已备数量',
prop: 'readyStock',
search: true,
width:"100px"
width: '100px'
},
{
label: "物料名称",
prop: "materialName",
label: '备货状态',
prop: 'stockArticleState',
search: true,
width:"100px"
width: '100px'
},
{
label: "备货件数",
prop: "deliveryNumber",
label: '托盘码',
prop: 'pallet',
search: true,
width:"100px"
width: '100px'
},
{
label: "已备数量",
prop: "readyStock",
label: '货位信息',
prop: 'goodsAllocation',
search: true,
width:"100px"
width: '100px'
},
{
label: "备货状态",
prop: "stockArticleState",
label: '收货单位',
prop: 'consigneeUnit',
search: true,
width:"100px"
width: '100px'
},
{
label: "托盘码",
prop: "pallet",
label: '运单收货人',
prop: 'consigneePerson',
search: true,
width:"100px"
width: '100px'
},
{
label: "货位信息",
prop: "goodsAllocation",
label: '运单收货地址',
prop: 'consigneeAddress',
search: true,
width:"100px"
width: '100px'
},
{
label: '运单收货电话',
prop: 'consigneeMobile',
search: true,
width: '100px'
}
]
},
//包肩分页信息
@ -796,7 +834,7 @@ export default {
//订单列表
orddata: [],
//库存品列表
inventorydata:[],
inventorydata: []
};
},
watch: {
@ -836,7 +874,7 @@ export default {
},
methods: {
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
if (['edit', 'view'].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
@ -845,7 +883,7 @@ export default {
},
//修改
rowUpdate(row, index, done, loading) {
console.log("row>>>>>>>>",row);
console.log('row>>>>>>>>', row);
},
queryDictionary() {
getDictionaryBiz('yes_no').then(res => {
@ -868,20 +906,20 @@ export default {
this.height = this.setPx(document.body.clientHeight - 340);
},
handleTabClick(tab, event) {
console.log("tab>>>>>>>>", tab.paneName);
let tabName = tab.paneName
console.log('tab>>>>>>>>', tab.paneName);
let tabName = tab.paneName;
switch (tabName) {
case 'tab1':
console.log("ssss")
console.log('ssss');
break;
case 'tab2':
console.log("ssss")
console.log('ssss');
break;
case 'tab3':
console.log("ssss")
console.log('ssss');
break;
case 'tab4':
console.log("ssss")
console.log('ssss');
break;
}
},
@ -911,8 +949,8 @@ export default {
});
let str = {
val: false
}
this.$emit("returnproperty", str);
};
this.$emit('returnproperty', str);
});
} else {
update(this.form).then(() => {
@ -924,8 +962,8 @@ export default {
});
let str = {
val: false
}
this.$emit("returnproperty", str);
};
this.$emit('returnproperty', str);
});
}
} else {
@ -938,36 +976,36 @@ export default {
this.$refs.signform.validate(valid => {
if (valid) {
if (this.signtitle = '复核签收') {
let row = {}
row.id = this.signform.deliveryId
row.deliverySignPictures = this.signform.deliverySignPictures
row.clerkSignRemarks = this.signform.clerkSignRemarks
row.signingTime =dayjs().format("YYYY-MM-DD HH:mm:ss")
row.signingStatus = '2'
console.log("更新参数>>>>>>>>",row);
let row = {};
row.id = this.signform.deliveryId;
row.deliverySignPictures = this.signform.deliverySignPictures;
row.clerkSignRemarks = this.signform.clerkSignRemarks;
row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
row.signingStatus = '2';
console.log('更新参数>>>>>>>>', row);
// if (!!row.id){
updatesign(row).then(() => {
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!'
});
this.signBox = false;
this.onLoad()
this.onLoad();
}, error => {
console.log(error);
this.signBox = false;
});
} else {
let data ={}
data.reservationId =row.id
data.deliveryId =this.deliverydata.id
data.deliverySignPictures = this.signform.deliverySignPictures
data.clerkSignRemarks = this.signform.clerkSignRemarks
console.log("一键签收data>>>>>>>>>>",data);
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
data.deliverySignPictures = this.signform.deliverySignPictures;
data.clerkSignRemarks = this.signform.clerkSignRemarks;
console.log('一键签收data>>>>>>>>>>', data);
getOneclickq(data).then(res => {
this.$message.success(res.data.msg)
this.$message.success(res.data.msg);
this.signBox = false;
this.onLoad()
this.onLoad();
});
}
}
@ -975,43 +1013,43 @@ export default {
},
//客户列表
handleCustom() {
this.cus =true
this.pake =false
this.ord =false
this.inventory =false
this.cus = true;
this.pake = false;
this.ord = false;
this.inventory = false;
},
//订单列表
handleOrder(page) {
let params={}
params.deliveryId = this.deliverydata.id
let params = {};
params.deliveryId = this.deliverydata.id;
getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>订单>>",res.data.data);
const data =res.data.data
this.orddata = data.records
this.ordpage.total = data.total
console.log('查看>>>>>订单>>', res.data.data);
const data = res.data.data;
this.orddata = data.records;
this.ordpage.total = data.total;
});
},
//包件列表
handlePackage(page) {
let params={}
params.deliveryId = this.deliverydata.id
let params = {};
params.deliveryId = this.deliverydata.id;
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>包间>>",res.data.data);
const data =res.data.data
this.packdata = data.records
this.packpage.total = data.total
console.log('查看>>>>>包间>>', res.data.data);
const data = res.data.data;
this.packdata = data.records;
this.packpage.total = data.total;
});
},
//库存列表
handleInventory(page) {
let params={}
params.deliveryId = this.deliverydata.id
let params = {};
params.deliveryId = this.deliverydata.id;
getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>库存>>",res.data.data);
const data =res.data.data
this.inventorydata = data.records
this.inventorypage.total = data.total
console.log('查看>>>>>库存>>', res.data.data);
const data = res.data.data;
this.inventorydata = data.records;
this.inventorypage.total = data.total;
});
},
handleAdd() {
@ -1027,52 +1065,52 @@ export default {
});
},
handleView(row) {
console.log("查看>>>>>>>>>>",row);
console.log('查看>>>>>>>>>>', row);
this.title = '查看';
this.view = true;
this.box = true;
this.wid= row.id
this.getWrapdetails(this.wpage)
this.wid = row.id;
this.getWrapdetails(this.wpage);
},
handleSign(row) {
console.log("签收>>>>>>>>>>",row);
console.log('签收>>>>>>>>>>', row);
this.signtitle = '复核签收';
// this.view = true;
this.signform = row
this.signform = row;
this.signBox = true;
// this.wid= row.id
// this.getWrapdetails(this.wpage)
},
//一键签收
handleSignone(row) {
console.log("一键签收>>>>>>>>>>",row);
console.log('一键签收>>>>>>>>>>', row);
this.signtitle = '一键签收';
this.signform = row
this.signBox = true
this.signform = row;
this.signBox = true;
},
handleOne(row) {
console.log("签收>>>>>>>>>>",row);
console.log('签收>>>>>>>>>>', row);
this.$confirm('确认一键装车？')
.then(_ => {
let data ={}
data.reservationId =row.id
data.deliveryId =this.deliverydata.id
let data = {};
data.reservationId = row.id;
data.deliveryId = this.deliverydata.id;
getOneclick(data).then(res => {
this.$message.success(res.data.msg)
this.onLoad()
this.$message.success(res.data.msg);
this.onLoad();
});
})
.catch(_ => {
});
},
getWrapdetails(page) {
let params={}
params.reservationId = this.wid
let params = {};
params.reservationId = this.wid;
getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
console.log("查看>>>>>>>",res.data.data);
const data =res.data.data
this.wrapdata = data.records
this.wpage.total = data.total
console.log('查看>>>>>>>', res.data.data);
const data = res.data.data;
this.wrapdata = data.records;
this.wpage.total = data.total;
});
},
@ -1121,7 +1159,7 @@ export default {
this.view = false;
},
selectionChange(list) {
console.log("sllsls");
console.log('sllsls');
this.selectionList = list;
},
selectionClear() {
@ -1138,48 +1176,63 @@ export default {
},
wcurrentChange(currentPage) {
this.wpage.currentPage = currentPage;
this.getWrapdetails(this.wpage)
this.getWrapdetails(this.wpage);
},
wsizeChange(pageSize) {
this.wpage.pageSize = pageSize;
this.getWrapdetails(this.wpage)
this.getWrapdetails(this.wpage);
},
pcurrentChange(currentPage) {
this.packpage.currentPage = currentPage;
this.handlePackage(this.packpage)
this.handlePackage(this.packpage);
},
psizeChange(pageSize) {
this.packpage.pageSize = pageSize;
this.handlePackage(this.packpage)
this.handlePackage(this.packpage);
},
ocurrentChange(currentPage) {
this.ordpage.currentPage = currentPage;
this.handleordpage(this.ordpage)
this.handleordpage(this.ordpage);
},
osizeChange(pageSize) {
this.inventorypage.pageSize = pageSize;
this.handleordpage(this.inventorypage)
this.handleordpage(this.inventorypage);
},
icurrentChange(currentPage) {
this.inventorypage.currentPage = currentPage;
this.handleordpage(this.inventorypage)
this.handleordpage(this.inventorypage);
},
isizeChange(pageSize) {
this.inventorypage.pageSize = pageSize;
this.handleordpage(this.inventorypage)
this.handleordpage(this.inventorypage);
},
onLoad() {
//查询详情
const data = decodeURIComponent(this.$route.query.data);
this.deliverydata = JSON.parse(data);
console.log("data>>>>>>>>", this.deliverydata);
console.log('data>>>>>>>>', this.deliverydata);
this.loading = true;
let id = this.deliverydata.id;
getDetail(id).then(res => {
console.log("res.data>>>>>>>>>>>>",res.data.data);
const data = res.data.data
console.log('res.data>>>>>>>>>>>>', res.data.data);
const data = res.data.data;
this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
console.log('data.stockupInfo.teamResponsibility------------------->', data.stockupInfo.teamResponsibility);
let a = data.stockupInfo.teamResponsibility.split(',');
let b = [];
a.forEach(item => {
switch (item) {
case '1':
b.push('装');
return;
case '2':
b.push('卸');
}
});
this.deliverydata.teamResponsibility = b.join(",");
//this.deliverydata = data
this.data = data.reservationList
this.data = data.reservationList;
});
this.handleOrder(this.packpage);
this.handlePackage(this.packpage);

343
src/views/distribution/reservation/reservationFrom.vue
Unescape View File

@ -58,8 +58,8 @@
<!-- v-for="item in this.deliveryTypeData"-->
<el-radio-group v-model="form.deliveryType">
<el-radio
:label="'2'"
:value="'2'">市配&emsp;
:label="'20'"
:value="'20'">市配&emsp;
</el-radio>
</el-radio-group>
</el-form-item>
@ -469,14 +469,16 @@
<script>
import { add, update, remove, getReservationInfo } from '@/api/distribution/distributionReservation';
import { getList, getStockArticleList, selectStockArticleList,selectStockArticleAndParcel } from '@/api/distribution/distributionStockArticle';
import { getDetailDelivery, addDelivery } from '@/api/distribution/distributionDelivery';
import {
getStockArticleList,
selectStockArticleList,
selectStockArticleInfoList
} from '@/api/distribution/distributionStockArticle';
import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
import { addIncrement } from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
// import option from "@/option/distribution/distributionDelivery";
import option from '@/option/distribution/distributionStockArticle';
import StockList from '@/option/distribution/distributionStockList';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
@ -569,7 +571,8 @@
// enableStatus: [
// { required: true, message: '请选择启用状态!', trigger: 'change' }
// ],
}
},
obj:{},
};
},
created() {
@ -652,81 +655,101 @@
},
//查询出所有的市配订单
handleAddOrder() {
this.loading = true;
console.log('$$$$$$', this.orderData);
if (this.reservationId) {
//这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息
this.query.typeService = 2;
this.query.genre = '1';
//查询所有订单列表信息
let page = this.page;
let params = {};
selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => {
console.log('$$$$$$$$>', res);
let orderListData = res.data.data;
console.log('$$$$$$$$', orderListData);
this.stockArticleInfo = orderListData;
//这里进行订单的勾选回显
let a = this.orderData;
for (let i = 0; i < orderListData.length; i++) {
for (let j = 0; j < a.length; j++) {
if (orderListData[i].id === a[j].id){
console.log("@@@@@@@@@@",a[j]);
console.log("@@@@@@@@@@",orderListData[i]);
orderListData[i] = a[j];
this.$nextTick(()=> {
this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[i],true);
})
}
this.checkOrder(this.stockArticleInfo[i],i);
}
}
this.loading = false;
this.selectionClear();
});
} else {
this.query.typeService = 2;
this.query.genre = '1';
let page = this.page;
let params = {};
selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => {
console.log('$$$$$$$$>', res);
let orderData = res.data.data;
orderData.forEach((item, index) => {
item.reservationNum = item.handQuantity;
item.reservationNum = '0';
});
console.log('$$$$$$$$', orderData);
this.stockArticleInfo = orderData;
//转预约单的操作会带出订单
if (this.orderData){
const params = {};
const page = this.page;
selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
console.log('res------------>', res);
const data = res.data.data;
this.stockArticleInfo = data.records;
this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结
this.checkOrder(item, index);
if (this.orderData) {
this.orderData.forEach(o => {
if (item.id === o.id){
if (o.id === item.id) {
this.$nextTick(() => {
this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
})
}
})
if (item.reservationStatus === '30'){
this.$nextTick(()=> {
this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true);
})
});
}
this.checkOrder(item,index);
})
});
}else {
//这里是通过新增预约的按钮进入的页面
this.orderList = [];
}
this.loading = false;
this.selectionClear();
});
this.selectionList = [];
}
});
this.loading = false;
console.log("this.stockArticleInfo------------->",this.stockArticleInfo);
// if (this.reservationId) {
// //这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息
// this.query.typeService = 2;
// this.query.genre = '1';
// //查询所有订单列表信息
// let page = this.page;
// let params = {};
// selectStockArticleInfoList(Object.assign(params, this.query)).then(res => {
// let orderListData = res.data.data;
// this.stockArticleInfo = orderListData;
// //这里进行订单的勾选回显
// let a = this.orderData;
// for (let i = 0; i < orderListData.length; i++) {
// for (let j = 0; j < a.length; j++) {
// if (orderListData[i].id === a[j].id){
// orderListData[i] = a[j];
// this.$nextTick(()=> {
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[i],true);
// })
// }
// this.checkOrder(this.stockArticleInfo[i],i);
// }
// }
// this.loading = false;
// this.selectionClear();
// });
// } else {
// this.query.typeService = 2;
// this.query.genre = '1';
// let page = this.page;
// let params = {};
// selectStockArticleAndParcel(Object.assign(params, this.query)).then(res => {
// let orderData = res.data.data;
// orderData.forEach((item, index) => {
// item.reservationNum = item.handQuantity;
// item.reservationNum = '0';
// });
// this.stockArticleInfo = orderData;
// //转预约单的操作会带出订单
// if (this.orderData){
// this.stockArticleInfo.forEach((item,index)=>{
// this.orderData.forEach(o=>{
// if (item.id === o.id){
// this.$nextTick(()=> {
// this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true);
// })
// }
// })
// // if (item.reservationStatus === '30'){
// // this.$nextTick(()=> {
// // this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index],true);
// // })
// // }
// this.checkOrder(item,index);
// })
// }else {
// //这里是通过新增预约的按钮进入的页面
// }
// this.loading = false;
// this.selectionClear();
// });
// }
this.orderShow = true;
},
checkOrder(row, index) {
if (row.reservationStatus === '30' || row.reservationStatusName === '已预约' || row.freezeStatus === '30' || row.freezeStatusName === '已冻结' ){
if (row.freezeStatus === '30' || row.freezeStatusName === '已冻结') {
return false;
} else {
return true;
@ -754,12 +777,12 @@
item = inventory;
this.$nextTick(() => {
this.$refs.inventoryTable.toggleRowSelection(this.inventoryInfo[index], true);
})
});
}
})
})
});
});
}
console.log("------------->",this.inventoryData);
console.log('------------->', this.inventoryData);
this.loading = false;
this.selectionClear();
});
@ -842,30 +865,33 @@
viewStockArticlePackage(row) {
this.loading = true;
this.packageList = row.packageList;
this.obj = row;
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
if (this.reservationId) {
//这里就是编辑的数据回显问题
this.packageData = row.parcelListVOS;
let packageInfo = row.parcelListVOS
// this.packageData = row.parcelListVOS;
let packageListData = this.packageData;
if (row.packageList) {
let packageListInfo = row.packageList;
for (let i = 0; i < packageListData.length; i++) {
for (let j = 0; j < packageListInfo.length; j++) {
if (packageListData[i].id === packageListInfo[j].id){
// row.packageList.push(packageListData[i])
packageInfo.forEach((item,index)=>{
packageListInfo.forEach(p=>{
if (item.id===p.id){
this.$nextTick( ()=> {
this.$refs.packageList.toggleRowSelection(this.packageData[i],true);
this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
})
continue;
}
// this.checkPackage(packageListData[i],i);
}
})
})
}else {
//新增订单，默认全选
packageInfo.forEach((item,index)=>{
this.$nextTick( ()=> {
this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
})
})
}
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
// this.packageList = packageListInfo;
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', this.packageList);
}
this.packageData =row.parcelListVOS;
} else {
this.packageData = row.parcelListVOS;
//这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
@ -875,15 +901,15 @@
// //这里就是表示包件此时状态处于已预约，表示该订单下的这个包件信息被其他的预约信息使用，此时应该处于勾选禁用状态
this.$nextTick(() => {
this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
})
console.log("::",item);
});
console.log('::', item);
this.checkPackage(item, index);
} else if (item.orderPackageFreezeStatusName !== '已冻结' || item.orderPackageFreezeStatus !== '20') {
this.$nextTick(() => {
this.$refs.packageList.toggleRowSelection(this.packageData[index], true);
})
});
}
})
});
}
this.isaddvalue = true;
this.loading = false;
@ -945,47 +971,16 @@
this.handleAddInventory();
},
onSubmitPackage() {
console.log('>>>>>>>>>>', this.packageList);
console.log('>>>>>>>>>>', this.orderData);
if (this.packageList.length === 0) {
this.$message.warning('请选择包件!!!');
return;
}
if (this.reservationId){
this.orderData.forEach(item => {
item.reservationNum = 0;
let a = [];
this.packageList.forEach(list => {
console.log("##########",item);
console.log("list------------>",list);
//TODO 这里订单选择包件遵循的规则应该是这个预约所选择是包件不管包件状态，其他的已预约包件不能被选取
if (item.id === list.stockArticleId && list.orderPackageFreezeStatus !== '20') {
item.reservationNum += list.quantity;
a.push(list);
}
});
// console.log("a------------>",a);
// item.packageList = a;
item.packageListInfo = a;
return item
});
}else {
this.orderData.forEach(item=>{
item.reservationNum = 0;
let a = [];
this.packageList.forEach(list => {
console.log("##########",list);
if (item.id === list.stockArticleId && list.orderPackageReservationStatus === '10' && list.orderPackageFreezeStatus=== '10') {
item.reservationNum += list.quantity;
a.push(list);
if (item.id===this.obj.id){
item.packageList = this.packageList;
}
});
item.packageListInfo = a;
// item.packageList = a;
return item
});
}
console.log("this.orderData------------>",this.orderData);
})
console.log('this.orderData------------>', this.orderData);
this.isaddvalue = false;
},
onSubmit() {
@ -995,17 +990,6 @@
let inventoryList = [];
let stockArticleList = [];
let operation = true;
// this.orderData.forEach(item => {
// // if (item.reservationNum === '0') {
// // this.$message({
// // type: 'warning',
// // message: '请选择' + item.orderCode + '包件数量!'
// // });
// // operation = false;
// // }
// orderIds.push(item.id);
// stockArticleList.push(item);
// });
this.inventoryData.forEach(item => {
if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
this.$message({
@ -1023,8 +1007,14 @@
this.form.stockArticleIds = orderIds.toString();
this.form.inventoryIds = inventoryIds.toString();
this.form.inventoryList = inventoryList;
console.log("-------------->",this.orderData);
this.form.stockArticleList = this.orderData;
console.log('-------------->', this.orderData);
let order = this.orderData;
order.forEach(o=>{
if (!o.packageListInfo){
o.packageListInfo = o.packageList;
}
})
this.form.stockArticleList = order;
this.deliveryWayData.forEach(item => {
if (this.form.deliveryWay === item.dictValue) {
this.form.deliveryWay = item.dictKey;
@ -1040,17 +1030,18 @@
this.form.periodOfTime = item.dictKey;
}
});
this.form.serveType = this.serveType.join(',');
this.form.serveType = this.serveType.sort().join(',');
//服务号
this.orderData.forEach(item => {
console.log("-------------->item",item);
console.log('-------------->item', item);
if (!item.packageListInfo) {
item.packageListInfo = item.packageList;
}
})
});
// this.form.stockArticleList = this.packageList;
console.log('>>>>>>>>', this.form);
if (this.reservationId) {
this.form.id = this.reservationId;
update(this.form).then(() => {
this.$router.go(-1);
this.$message({
@ -1125,33 +1116,27 @@
this.view = false;
},
selectionChange(list) {
let a = [];
list.forEach(item=>{
if (item.reservationStatus !== '30'){
a.push(item)
}
})
this.orderList = a;
this.orderList = list;
},
selectionPackageChange(list) {
console.log("-----------<>",list);
console.log('-----------<>', list);
if (this.reservationId) {
this.packageList = list;
} else {
//新增
let a = [];
list.forEach(item => {
console.log("--------------->",item);
console.log('--------------->', item);
if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约') {
a.push(item);
}
})
});
this.packageList = a;
}
},
selectionInventoryChange(list) {
// if (this.reservationId){
console.log("-----------<>",list);
console.log('-----------<>', list);
this.inventoryList = list;
// }else {
// //新增
@ -1190,29 +1175,41 @@
* 增加订单提交
*/
onSubmitOrder() {
console.log('-------------》', this.orderList);
if (this.orderList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
let a = [];
a = this.orderList;
let b = false;
this.orderList.forEach(item => {
a.forEach(a => {
if (item.customerName !== a.customerName || item.customerTelephone !== a.customerTelephone || item.customerAddress !== a.customerAddress) {
b = true;
}
});
});
if (b) {
this.$message({
type: 'warning',
message: '请选择同一顾客订单!'
});
const list = this.orderList;
console.log("list--------",list);
let j = 0;
let name = list[0].customerName;
let address = list[0].customerAddress;
let phone = list[0].customerTelephone;
for (let i = 1; i < list.length; i++) {
if (list[i].customerName !== name || list[i].customerAddress !== address || list[i].customerTelephone !== phone){
this.$message.warning('请选择统一顾客订单!!!');
return;
}
console.log(">>>>>>>>>>>>",a);
this.orderData = a;
}
const data = this.orderList;
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);
})
}
console.log("orderList------------------->",this.orderList);
console.log("list------------------->",list);
console.log("orderData------------------->",this.orderData);
this.orderData = info;
this.orderShow = false;
},
selectionClear() {
@ -1230,7 +1227,7 @@
},
onLoad(page, params = {}) {
this.loading = true;
this.form.deliveryType = '1';
this.form.deliveryType = '10';
this.form.deliveryWay = '10';
this.form.periodOfTime = '3';
this.form.otherFee = 0;
@ -1270,7 +1267,7 @@
// stockArticleListInfo.forEach(item=>{
//
// })
console.log(">>>>>>>>",reservation);
console.log('>>>>>>>>', reservation);
this.orderData = reservation.stockArticleList;
this.inventoryData = reservation.inventoryList;
this.inventoryData.forEach(item => {
@ -1287,11 +1284,9 @@
this.form = reservation;
});
} else {
this.form.deliveryType = '2';
this.form.deliveryType = '20';
}
this.loading = false;
}
}

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

@ -295,23 +295,29 @@
<el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
</el-form-item>
<el-form-item label="运单号:">
<el-input v-model="query.customerTelephone" placeholder="请输入运单号"></el-input>
<el-input v-model="query.waybillNumber" placeholder="请输入运单号"></el-input>
</el-form-item>
<el-form-item label="订单自编号:">
<el-input v-model="query.customerTelephone" placeholder="请输入运单号"></el-input>
<el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>
</el-form-item>
<el-form-item label="服务号:">
<el-input v-model="query.customerTelephone" placeholder="请输入运单号"></el-input>
<el-input v-model="query.serviceNumber" placeholder="请输入服务号"></el-input>
</el-form-item>
<el-form-item label="顾客姓名:">
<el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>
<el-input v-model="query.customerName" placeholder="请输入客户姓名"></el-input>
</el-form-item>
<el-form-item label="顾客电话:">
<el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
</el-form-item>
<el-form-item label="顾客地址:">
<el-input v-model="query.customerAddress" placeholder="请输入顾客地址"></el-input>
</el-form-item>
<!-- 查询按钮 -->
<!-- <el-form-item>-->
<!-- <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>-->
<!-- <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
<el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
</el-form-item>
</el-form>
<!-- @selection-change="selectionChange"-->
@ -355,6 +361,23 @@
>
<el-button icon="el-icon-circle-close" @click="orderShow = false">返 回</el-button>
</el-form-item>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
</el-dialog>
<el-dialog
@ -562,11 +585,10 @@
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 { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
import { selectStockArticleAndParcel } from '@/api/distribution/distributionStockArticle';
import { selectStockArticleInfoList } from '@/api/distribution/distributionStockArticle';
import { getInventoryList } from '@/api/distribution/distributionStockList';
import { getDeliveryList ,updateDeliveryList} from '@/api/distribution/distributionDeliveryList';
import { mapGetters } from 'vuex';
@ -671,6 +693,11 @@
loadAndUnload:[],
//服务类型
serveType:[],
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
//外协数据来源
tripartiteSourceData:[],
deliveryListId:'',
@ -848,6 +875,14 @@
this.deliveryListId = this.$route.query.id;
}
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
checkPackage(row,index){
console.log(">>>>>>>>>>>>",row,index);
@ -886,7 +921,6 @@
//编辑
let params={};
console.log("^^^^^^^^",row);
this.query.stockArticleId = row.id;
//这里订单的对象中应该存在三个数组，一个数组是该订单下的所有包件细信息
//一个数组是该订单被选择使用的包件信息
//还有一个就是正在操作的包件信息
@ -915,21 +949,14 @@
//新增
//默认打开包件信息，包件列表处于全选状态
let params={};
console.log("^^^^^^^^",row);
this.query.stockArticleId = row.id;
getPackageList(Object.assign(params,this.query)).then(res=>{
console.log(res.data.data);
let data =res.data.data;
this.packageData =data.records;
this.packageData = row.parcelListVOS
this.packageData.forEach((item,index)=>{
this.$nextTick( ()=> {
this.$refs.packageList.toggleRowSelection(this.packageData[index],true);
})
})
this.selectionClear();
})
console.log("^^^^^^^^",row);
}
this.loading = false;
this.isShowPackage = true;
@ -986,23 +1013,27 @@
} else {
this.inventoryData = this.selectionList;
}
this.stockListShow = false;
},
onSubmitOrder() {
console.log('>>>>>>>>>>>>', this.stockArticleList);
console.log('>>>>>>>>orderData', this.orderData);
const data = this.stockArticleList;
let info = [];
if (this.orderData){
let a = this.orderData;
this.stockArticleList.forEach(item=>{
data.forEach(item=>{
a.forEach(order=>{
console.log("order----------------->",order);
if (item.id === order.id){
item.packageListInfo = order.packageList;
console.log("order----------------->",order);
item = order;
}
})
info.push(item);
})
}
this.orderData = info;
// this.orderData.forEach(item => {
// item.reservationNum = 0;
// this.stockArticleList.forEach((list, index) => {
@ -1011,7 +1042,6 @@
// }
// });
// });
this.orderData = this.stockArticleList;
console.log('+++++++++++++++', this.orderData);
this.orderShow = false;
},
@ -1409,34 +1439,67 @@
//TODO 这里还缺少对于订单状态的筛选条件
this.query.typeService=1;
this.query.genre = "1";
const page = this.page;
let params = {};
selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
console.log("------------->",this.query);
selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
console.log(res.data.data);
const data = res.data.data;
data.forEach(item => {
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) {
item.packageList = a.packageList;
this.$nextTick(() => {
this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
})
}
})
}
// item.reservationNum = item.handQuantity;
});
this.page.total = data.total;
this.stockArticleInfo = data;
})
this.loading = false;
this.query={};
// this.selectionClear();
if (this.deliveryListId) {
//编辑
console.log("---->", this.stockArticleInfo);
// 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(){
this.query={
typeService:1,
genre:'1'
};
this.searchChange();
},
searchChange(){
let params = {};
console.log("query------------->",this.query);
const page = this.page;
selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
console.log("------------------->",res);
const data = res.data.data
this.stockArticleInfo = data.records;
if (this.orderData){
this.stockArticleInfo.forEach((item,index)=>{
console.log("aaa", item, index);
this.orderData.forEach(o => {
console.log("bbb", o);
if (item.id === o.id) {
this.orderData.forEach(order=>{
if (item.id === order.id){
console.log("----------->");
this.$nextTick(() => {
this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
})
@ -1445,10 +1508,23 @@
})
}
})
//新增
this.orderShow = true;
// selectStockArticleAndParcel(Object.assign(params,this.query)).then(res=>{
// console.log("res------------>",res.data.data);
// const data = res.data.data
// this.stockArticleInfo = data;
// if (this.deliveryListId){
// this.stockArticleInfo.forEach((item,index)=>{
// this.orderData.forEach(order=>{
// if (item.id === order.id){
// console.log("----------->");
// this.$nextTick(() => {
// this.$refs.stockArticleTable.toggleRowSelection(this.stockArticleInfo[index], true);
// })
// }
// })
// })
// }
// })
},
handleAddInventory() {
this.form.deliveryType ='1';

Write Preview
Loading…
Cancel
Save