|
|
|
|
@ -45,23 +45,26 @@
|
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
<el-divider>订单列表</el-divider> |
|
|
|
|
<!-- <el-row>--> |
|
|
|
|
<!-- <div class="avue-crud__header">--> |
|
|
|
|
<!-- <!– 头部左侧按钮模块 –>--> |
|
|
|
|
<!-- <div class="avue-crud__left">--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>--> |
|
|
|
|
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </div>--> |
|
|
|
|
<!-- </el-row>--> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__header"> |
|
|
|
|
<!-- 头部左侧按钮模块 --> |
|
|
|
|
<div class="avue-crud__left"> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleCustom">客 户 列 表</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handlePackage(this.packpage)" plain>包 件 列 表</el-button> |
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleInventory" plain>库 存 列 表</el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row v-if="cus" > |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="data" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border"> |
|
|
|
|
:border="option.border" |
|
|
|
|
v-if="cus" |
|
|
|
|
> |
|
|
|
|
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in option.column"> |
|
|
|
|
<!-- table字段 --> |
|
|
|
|
@ -81,6 +84,44 @@
|
|
|
|
|
</el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row v-if="pake" > |
|
|
|
|
<!-- 列表模块 --> |
|
|
|
|
<el-table ref="table" v-loading="loading" |
|
|
|
|
@selection-change="selectionChange" |
|
|
|
|
:data="packdata" |
|
|
|
|
:height="height" |
|
|
|
|
style="width: 100%" |
|
|
|
|
:border="option.border" |
|
|
|
|
v-if="pake" |
|
|
|
|
> |
|
|
|
|
<el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column> |
|
|
|
|
<template v-for="(item,index) in wrapoption.column"> |
|
|
|
|
<!-- table字段 --> |
|
|
|
|
<el-table-column v-if="item.hide!==true" |
|
|
|
|
:prop="item.prop" |
|
|
|
|
:label="item.label" |
|
|
|
|
align="center" |
|
|
|
|
:width="item.width" |
|
|
|
|
:key="index"> |
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
</el-table> |
|
|
|
|
|
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
<el-pagination align="right" |
|
|
|
|
background |
|
|
|
|
@size-change="psizeChange" |
|
|
|
|
@current-change="pcurrentChange" |
|
|
|
|
:current-page="packpage.currentPage" |
|
|
|
|
:page-sizes="[10, 20, 30, 40, 50, 100]" |
|
|
|
|
:page-size="packpage.pageSize" |
|
|
|
|
layout="total, sizes, prev, pager, next, jumper" |
|
|
|
|
:total="packpage.total"> |
|
|
|
|
</el-pagination> |
|
|
|
|
</div> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row> |
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
@ -120,20 +161,34 @@
|
|
|
|
|
</el-table-column> |
|
|
|
|
</template> |
|
|
|
|
</el-table> |
|
|
|
|
<div class="avue-crud__pagination" style="width:100%"> |
|
|
|
|
<!-- 分页模块 --> |
|
|
|
|
<el-pagination align="right" |
|
|
|
|
background |
|
|
|
|
@size-change="wsizeChange" |
|
|
|
|
@current-change="wcurrentChange" |
|
|
|
|
:current-page="wpage.currentPage" |
|
|
|
|
:page-sizes="[10, 20, 30, 40, 50, 100]" |
|
|
|
|
:page-size="wpage.pageSize" |
|
|
|
|
layout="total, sizes, prev, pager, next, jumper" |
|
|
|
|
:total="wpage.total"> |
|
|
|
|
</el-pagination> |
|
|
|
|
</div> |
|
|
|
|
<!-- 表单按钮 --> |
|
|
|
|
<template #footer> |
|
|
|
|
<span v-if="!view" class="dialog-footer"> |
|
|
|
|
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button> |
|
|
|
|
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button> |
|
|
|
|
</span> |
|
|
|
|
</template> |
|
|
|
|
<!-- <template #footer>--> |
|
|
|
|
<!-- <span v-if="!view" class="dialog-footer">--> |
|
|
|
|
<!-- <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>--> |
|
|
|
|
<!-- <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>--> |
|
|
|
|
<!-- </span>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
</basic-container> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { getList, getDetail, add, update, remove,getPage,getstatistics,getWrapdetail } from "@/api/distribution/distributionDeliveryList"; |
|
|
|
|
import { getList, getDetail, add, update, remove,getPage,getstatistics,getWrapdetail,getpackdetail } from "@/api/distribution/distributionDeliveryList"; |
|
|
|
|
import option from '@/option/basic/basicPdarecords'; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; |
|
|
|
|
@ -156,6 +211,10 @@ export default {
|
|
|
|
|
loading: true, |
|
|
|
|
//查看按钮 |
|
|
|
|
edt:false, |
|
|
|
|
|
|
|
|
|
//隐藏 |
|
|
|
|
pake:false, |
|
|
|
|
cus:true, |
|
|
|
|
//查看pda |
|
|
|
|
padview:false, |
|
|
|
|
// 是否为查看模式。。 |
|
|
|
|
@ -213,6 +272,7 @@ export default {
|
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
{ |
|
|
|
|
label: "配送件数", |
|
|
|
|
prop: "packageNub", |
|
|
|
|
@ -220,7 +280,7 @@ export default {
|
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "装车件数", |
|
|
|
|
label: "扫描件数", |
|
|
|
|
prop: "loadedNub", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
@ -231,8 +291,22 @@ export default {
|
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "签收件数", |
|
|
|
|
prop: "receivedQuantity", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "签收状态", |
|
|
|
|
prop: "signingStatus", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 表单配置 |
|
|
|
|
wrapoption: { |
|
|
|
|
expand: false, |
|
|
|
|
@ -246,6 +320,12 @@ export default {
|
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "仓库", |
|
|
|
|
prop: "warehouse", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "一级品类", |
|
|
|
|
prop: "firsts", |
|
|
|
|
@ -264,6 +344,12 @@ export default {
|
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "物料编号", |
|
|
|
|
prop: "encoded", |
|
|
|
|
search: true, |
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: "物料名称", |
|
|
|
|
prop: "material", |
|
|
|
|
@ -271,13 +357,28 @@ export default {
|
|
|
|
|
width:"100px" |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
] |
|
|
|
|
}, |
|
|
|
|
//包肩分页信息 |
|
|
|
|
wpage:{ |
|
|
|
|
currentPage: 1, |
|
|
|
|
pageSize: 10, |
|
|
|
|
total: 40 |
|
|
|
|
}, |
|
|
|
|
//包肩分页信息 |
|
|
|
|
packpage:{ |
|
|
|
|
currentPage: 1, |
|
|
|
|
pageSize: 10, |
|
|
|
|
total: 40 |
|
|
|
|
}, |
|
|
|
|
// 表单列表 |
|
|
|
|
data: [], |
|
|
|
|
// |
|
|
|
|
//客户id |
|
|
|
|
wid:null, |
|
|
|
|
//客户详情 |
|
|
|
|
wrapdata:[], |
|
|
|
|
//包条列表 |
|
|
|
|
packdata:[], |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
|
@ -384,6 +485,29 @@ export default {
|
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
//客户列表 |
|
|
|
|
handleCustom(){ |
|
|
|
|
this.cus =true |
|
|
|
|
this.pake =false |
|
|
|
|
}, |
|
|
|
|
//包件列表 |
|
|
|
|
handlePackage(page){ |
|
|
|
|
let params={} |
|
|
|
|
params.deliveryId = this.$route.query.id |
|
|
|
|
getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { |
|
|
|
|
console.log("查看>>>>>sss>>",res.data.data); |
|
|
|
|
const data =res.data.data |
|
|
|
|
this.packdata = data.records |
|
|
|
|
this.packpage.total = data.total |
|
|
|
|
this.cus =false |
|
|
|
|
this.pake =true |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
//库存列表 |
|
|
|
|
handleInventory(){ |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
handleAdd() { |
|
|
|
|
this.title = '新增'; |
|
|
|
|
@ -402,10 +526,20 @@ export default {
|
|
|
|
|
this.title = '查看'; |
|
|
|
|
this.view = true; |
|
|
|
|
this.box = true; |
|
|
|
|
getWrapdetail(row.id).then(res => { |
|
|
|
|
this.wid= row.id |
|
|
|
|
this.getWrapdetails(this.wpage) |
|
|
|
|
}, |
|
|
|
|
getWrapdetails(page){ |
|
|
|
|
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 |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
handleDelete() { |
|
|
|
|
if (this.selectionList.length === 0) { |
|
|
|
|
this.$message.warning('请选择至少一条数据'); |
|
|
|
|
@ -465,6 +599,22 @@ export default {
|
|
|
|
|
this.page.pageSize = pageSize; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
}, |
|
|
|
|
wcurrentChange(currentPage) { |
|
|
|
|
this.wpage.currentPage = currentPage; |
|
|
|
|
this.getWrapdetails(this.wpage) |
|
|
|
|
}, |
|
|
|
|
wsizeChange(pageSize) { |
|
|
|
|
this.wpage.pageSize = pageSize; |
|
|
|
|
this.getWrapdetails(this.wpage) |
|
|
|
|
}, |
|
|
|
|
pcurrentChange(currentPage) { |
|
|
|
|
this.packpage.currentPage = currentPage; |
|
|
|
|
this.handlePackage(this.packpage) |
|
|
|
|
}, |
|
|
|
|
psizeChange(pageSize) { |
|
|
|
|
this.packpage.pageSize = pageSize; |
|
|
|
|
this.handlePackage(this.packpage) |
|
|
|
|
}, |
|
|
|
|
onLoad() { |
|
|
|
|
//查询详情 |
|
|
|
|
this.loading = true; |
|
|
|
|
|
0.0
2 years ago