|
|
|
|
@ -65,8 +65,8 @@
|
|
|
|
|
</div> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handlebill" >创建提货单</el-button>--> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')" >通知提货</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')" >再次通知</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1','1')" >通知提货</el-button> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1','2')" >再次通知</el-button> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
|
@ -131,11 +131,53 @@
|
|
|
|
|
placeholder="请填写内容" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="历史跟进" :label-width="formLabelWidth"> |
|
|
|
|
<el-form-item label="历史跟进" :label-width="formLabelWidth" v-if="lishi"> |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="dataHistorical" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border"> |
|
|
|
|
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>--> |
|
|
|
|
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
|
|
|
|
<el-table-column v-if="option.index" label="序号" type="index" width="70" align="center"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<template v-for="(item,index) in option.columnWayBill"> |
|
|
|
|
<!-- table字段 --> |
|
|
|
|
<el-table-column v-if="item.hide!==true" |
|
|
|
|
:prop="item.prop" |
|
|
|
|
:label="item.label" |
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
<!-- 操作栏模块 --> |
|
|
|
|
<!-- <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-edit" @click="handleEdit(row)">编辑</el-button>--> |
|
|
|
|
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
<!-- </el-table-column>--> |
|
|
|
|
</el-table> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
<el-pagination align="right" |
|
|
|
|
background |
|
|
|
|
@size-change="sizeChangeCall" |
|
|
|
|
@current-change="currentChangeCall" |
|
|
|
|
:current-page="pageCall.currentPage" |
|
|
|
|
:page-sizes="[10, 20, 30, 40, 50, 100]" |
|
|
|
|
:page-size="pageCall.pageSize" |
|
|
|
|
layout="total, sizes, prev, pager, next, jumper" |
|
|
|
|
:total="pageCall.total"> |
|
|
|
|
</el-pagination> |
|
|
|
|
</div> |
|
|
|
|
<template #footer> |
|
|
|
|
<span class="dialog-footer"> |
|
|
|
|
<el-button @click="dialogFormVisible = false">取消</el-button> |
|
|
|
|
@ -333,6 +375,7 @@ import { addService } from "@/api/distribution/distributionServiceLog";
|
|
|
|
|
import option from "@/option/distribution/distributionStockArticle"; |
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
import { getListCallDelivery } from '@/api/distribution/distrilbutionCallDelivery'; |
|
|
|
|
import dayjs from 'dayjs'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
@ -441,6 +484,24 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'consigneeUnit', |
|
|
|
|
label: '收货单位', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'consigneePerson', |
|
|
|
|
label: '收货人', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'handQuantity', |
|
|
|
|
label: '在库件数', |
|
|
|
|
type: 1, |
|
|
|
|
@ -449,6 +510,118 @@ export default {
|
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'availableQuantity', |
|
|
|
|
label: '可用数量', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'handQuantity', |
|
|
|
|
label: '未入库数量', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'sortingQuantity', |
|
|
|
|
label: '分拣数量', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'deliveryQuantity', |
|
|
|
|
label: '配送数量', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'transferQuantity', |
|
|
|
|
label: '中转数量', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'signinQuantity', |
|
|
|
|
label: '签收数量', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
},{ |
|
|
|
|
prop: 'handQuantity', |
|
|
|
|
label: '上架状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
},{ |
|
|
|
|
prop: 'allocation', |
|
|
|
|
label: '货区-货位-货架', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
},{ |
|
|
|
|
prop: 'resource', |
|
|
|
|
label: '订单来源', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'trays', |
|
|
|
|
label: '所在托盘', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'freeze_status', |
|
|
|
|
label: '冻结状态', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'state', |
|
|
|
|
label: '状态', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'completeSetName', |
|
|
|
|
@ -469,10 +642,20 @@ export default {
|
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'brand', |
|
|
|
|
// label: '品牌', |
|
|
|
|
// type: 2, |
|
|
|
|
// values: '', |
|
|
|
|
// width: '150', |
|
|
|
|
// checkarr: [], |
|
|
|
|
// fixed: false, |
|
|
|
|
// sortable: true, |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
prop: 'brand', |
|
|
|
|
label: '品牌', |
|
|
|
|
type: 2, |
|
|
|
|
prop: 'typeName', |
|
|
|
|
label: '服务类型', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
@ -480,12 +663,21 @@ export default {
|
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'typeService', |
|
|
|
|
label: '服务类型', |
|
|
|
|
type: 1, |
|
|
|
|
prop: 'notification', |
|
|
|
|
label: '通知状态', |
|
|
|
|
type: 3, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
checkarr: [ |
|
|
|
|
{ |
|
|
|
|
value: '2', |
|
|
|
|
label: '已通知', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
value: '1', |
|
|
|
|
label: '未通知', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
@ -528,6 +720,42 @@ export default {
|
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'createUser', |
|
|
|
|
label: '创建人', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'createTime', |
|
|
|
|
label: '创建时间', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'inventoryDate', |
|
|
|
|
label: '最新盘点时间', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, { |
|
|
|
|
prop: 'inventoryPerson', |
|
|
|
|
label: '盘点人', |
|
|
|
|
type: 1, |
|
|
|
|
values: '', |
|
|
|
|
width: '150', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: '', |
|
|
|
|
@ -542,6 +770,7 @@ export default {
|
|
|
|
|
// 更多列的配置... |
|
|
|
|
], |
|
|
|
|
columnListedit: [], |
|
|
|
|
|
|
|
|
|
drawerShow: false, |
|
|
|
|
height: 0, |
|
|
|
|
// 弹框标题 |
|
|
|
|
@ -562,6 +791,11 @@ export default {
|
|
|
|
|
pageSize: 10, |
|
|
|
|
total: 40 |
|
|
|
|
}, |
|
|
|
|
pageCall: { |
|
|
|
|
currentPage: 1, |
|
|
|
|
pageSize: 10, |
|
|
|
|
total: 40 |
|
|
|
|
}, |
|
|
|
|
// 表单数据 |
|
|
|
|
form: {}, |
|
|
|
|
formCall: {},// 通知 |
|
|
|
|
@ -573,12 +807,14 @@ export default {
|
|
|
|
|
option: option, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
dataHistorical: [], |
|
|
|
|
distributionType: [], |
|
|
|
|
dialogTableVisible: false, |
|
|
|
|
dialogFormVisible: false, |
|
|
|
|
dialogFormCustomer: false, //多选客户弹窗 |
|
|
|
|
dialogFormCustomerOwn: false, //单独的客户标识 |
|
|
|
|
dialogFormService: false, |
|
|
|
|
lishi: false, |
|
|
|
|
formLabelWidth: '120px', |
|
|
|
|
handler:true, //首次 |
|
|
|
|
trade:false, // 商 |
|
|
|
|
@ -836,8 +1072,8 @@ export default {
|
|
|
|
|
callFordelivery(inde){ |
|
|
|
|
switch (inde) { |
|
|
|
|
case '1': |
|
|
|
|
console.log(this.formCall); |
|
|
|
|
this.formCall.waybillNumber = this.ids; |
|
|
|
|
// console.log(this.formCall); |
|
|
|
|
this.formCall.stockArticleId = this.ids; |
|
|
|
|
addCallDelivery(this.formCall).then(() => { |
|
|
|
|
this.$message({ |
|
|
|
|
type: "success", |
|
|
|
|
@ -904,7 +1140,7 @@ export default {
|
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//通知提货 |
|
|
|
|
handleCallDelivery(ind){ |
|
|
|
|
handleCallDelivery(ind,ty){ |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
this.$message.warning("请选择至少一条数据"); |
|
|
|
|
return; |
|
|
|
|
@ -912,11 +1148,39 @@ export default {
|
|
|
|
|
switch (ind) { |
|
|
|
|
case '1': |
|
|
|
|
let ids = []; |
|
|
|
|
this.selectionList.forEach(ele => { |
|
|
|
|
ids.push(ele.orderSelfNumbering); |
|
|
|
|
let idde = []; |
|
|
|
|
let nus = { }; |
|
|
|
|
let nu = ''; |
|
|
|
|
let d = false; |
|
|
|
|
this.selectionList.some(ele => { |
|
|
|
|
if(!!nu){ |
|
|
|
|
if(nus.customerName != ele.customerName){ |
|
|
|
|
d= true; |
|
|
|
|
return ; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
ids.push(ele.waybillNumber); |
|
|
|
|
idde.push(ele.id); |
|
|
|
|
nus.customerName = ele.customerName; |
|
|
|
|
nu = ele.customerName; |
|
|
|
|
nus.customerTelephone = ele.customerTelephone; |
|
|
|
|
}); |
|
|
|
|
if(d){ |
|
|
|
|
this.$message.warning("请选择一样的联系人！！！"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
if(ty =='1'){ |
|
|
|
|
this.lishi = false; |
|
|
|
|
}else if(ty == '2'){ |
|
|
|
|
this.lishi = true; |
|
|
|
|
//查询历史记录 |
|
|
|
|
this.getHistorical(this.pageCall,idde); |
|
|
|
|
} |
|
|
|
|
this.formCall.waybill = ids; |
|
|
|
|
this.formCall.customerName = nus.customerName; |
|
|
|
|
this.formCall.customerTelephone = nus.customerTelephone; |
|
|
|
|
this.dialogFormVisible = true; |
|
|
|
|
|
|
|
|
|
break; |
|
|
|
|
case '2': |
|
|
|
|
|
|
|
|
|
@ -928,6 +1192,18 @@ export default {
|
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//历史通知记录 |
|
|
|
|
async getHistorical(page,ids){ |
|
|
|
|
let i = ''; |
|
|
|
|
if(!!ids){ |
|
|
|
|
i = ids.join(','); |
|
|
|
|
} |
|
|
|
|
let a =await getListCallDelivery(page.currentPage,page.pageSize,{ stockArticleId : i}); |
|
|
|
|
console.log("a>>>>",a.data.data); |
|
|
|
|
this.dataHistorical= a.data.data.records; |
|
|
|
|
this.pageCall.total = a.data.data.total; |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
init () { |
|
|
|
|
this.height = this.setPx(document.body.clientHeight - 340); |
|
|
|
|
@ -1121,6 +1397,14 @@ export default {
|
|
|
|
|
this.page.pageSize = pageSize; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
currentChangeCall (currentPage) { |
|
|
|
|
this.pageCall.currentPage = currentPage; |
|
|
|
|
this.getHistorical(this.pageCall); |
|
|
|
|
}, |
|
|
|
|
sizeChangeCall (pageSize) { |
|
|
|
|
this.pageCall.pageSize = pageSize; |
|
|
|
|
this.getHistorical(this.pageCall); |
|
|
|
|
}, |
|
|
|
|
onLoad (page, params = {}) { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.query.genre = 1; |
|
|
|
|
@ -1128,6 +1412,13 @@ export default {
|
|
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
const data = res.data.data; |
|
|
|
|
this.page.total = data.total; |
|
|
|
|
data.records.some(i =>{ |
|
|
|
|
if(i.notification == '1'){ |
|
|
|
|
i.notification = '未通知' |
|
|
|
|
}else{ |
|
|
|
|
i.notification = '已通知' |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.data = data.records; |
|
|
|
|
this.loading = false; |
|
|
|
|
this.selectionClear(); |
|
|
|
|
|
0.0
2 years ago