fe / yoho-shop-manage · Commits

Go to a project

Authored by 李奇
Commit afcdf744ff1703ad3dd630b0989476c503a077e4 1 parent 229eff6d

物流页修改

Inline Side-by-side
Showing 2 changed files with 54 additions and 104 deletions
... ... @@ -5,29 +5,25 @@
<Input v-model.trim="filters.orderNo.model"
:placeholder="filters.orderNo.holder" number></Input>
</FilterItem>
<FilterItem :label="filters.expressNo.label">
<Input v-model.trim="filters.expressNo.model"
:placeholder="filters.expressNo.holder" number></Input>
</FilterItem>
<FilterItem :label="filters.prodCode.label">
<Input v-model.trim="filters.prodCode.model"
:placeholder="filters.prodCode.holder" number></Input>
</FilterItem>
<FilterItem :label="filters.merChantCode.label">
<Input v-model.trim="filters.merChantCode.model"
:placeholder="filters.merChantCode.holder"></Input>
<FilterItem :label="filters.expressStatus.label">
<Select v-model.trim="filters.expressStatus.model">
<Option v-for="option in filters.expressStatus.options"
:value="option.value"
:key="option.value">{{option.label}}</Option>
</Select>
</FilterItem>
<FilterItem :label="filters.prodBarCode.label">
<Input v-model.trim="filters.prodBarCode.model"
:placeholder="filters.prodBarCode.holder"></Input>
</FilterItem>
<FilterItem :label="filters.orderTime.label">
<Date-picker type="date" placeholder="选择日期"
@on-change="dateChange" :value="filters.orderTime.model"></Date-picker>
</FilterItem>
<FilterItem :label="filters.prodStatus.label">
<Select v-model.trim="filters.prodStatus.model">
<Option v-for="option in filters.prodStatus.options"
:value="option.value"
:key="option.value">{{option.label}}</Option>
</Select>
</FilterItem>
<FilterItem>
<Button type="primary" @click="filterSearch">筛选</Button>
<Button type="primary" @click="filterSearch">导出</Button>
... ... @@ -48,7 +44,7 @@
import _ from 'lodash';
import moment from 'moment';
import service from 'trade-service';
import Store from '../store/undone';
import Store from '../store/express';
import { OutStock } from 'trade/out-stock'
import { CellInfo, CellDispatch, CellDeliver, CellStockOut } from 'trade/table-cell';
... ... @@ -69,16 +65,15 @@
},
created() {
const store = Store();
this.filters = store.filters;
this.page = store.page;
this.table = store.table;
const params = {
pageNo: 1
pageNo: 1,
statusList: [1,2,3] // TODO
};
this.productList(params);
this.page = store.page;
this.table = store.table;
this.filters = store.filters;
this.expressList(params);
},
methods: {
params(){
... ... @@ -111,10 +106,9 @@
return data;
},
productList(params){
service.allotPurchaseList(
expressList(params){
service.allotExpressList(
_.merge(params || {}, {
statusList: [1],
pageSize: 20
}))
.then(res => {
... ... @@ -133,12 +127,12 @@
const params = this.params();
this.useFilterSign = true;
this.productList(params);
this.expressList(params);
this.page.current = 1;
},
clearFilter(){
this.filters = Store().filters;
this.productList();
this.expressList();
this.useFilterSign = false;
this.page.current = 1;
},
... ... @@ -154,7 +148,7 @@
page
});
this.productList(params);
this.expressList(params);
},
selectChange(){
... ...
... ... @@ -12,35 +12,21 @@ export default () => {
model: '',
holder: '入库单号',
},
prodCode: {
label: '商品编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
merChantCode: {
label: '商家编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
prodBarCode: {
label: '商品条码',
expressNo: {
label: '物流单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
orderTime: {
label: '下单时间',
prodCode: {
label: '商品编码',
labelSpan: 6,
model: '',
holder: '',
holder: 'SKN/SKU',
fieldSpan: 18
},
prodStatus: {
expressStatus: {
label: '商品状态',
labelSpan: 6,
fieldSpan: 18,
... ... @@ -59,6 +45,13 @@ export default () => {
label: '待处理超时'
}
]
},
prodBarCode: {
label: '商品条码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
}
},
page: {
... ... @@ -68,73 +61,36 @@ export default () => {
table: {
cols: [
{
type: 'selection',
width: 60,
align: 'center'
},
{
title: '下单时间',
key: 'createTime',
align: 'center'
},
{
title: '商品信息',
title: '物流单号',
key: '',
align: 'center',
render(row){
return `<cell-info
:sku="row.productSku"
color="mock"
:size="row.sizeName"
></cell-info>`
}
},
{
title: '订单收发货',
align: 'center',
render(row){
return `<cell-dispatch
:store-num="row.inStoreNum"
:buy-num="row.buyingNums"
:lack-num="row.lackNum">
</cell-dispatch>`;
render(row) {
return `${row.expressNumber}(${row.expressName})`
}
},
{
title: '发货',
align: 'center',
render(){
return `<cell-deliver
:ship-num="row.shipmentsNums">
</cell-deliver>`
}
title: '发货时间',
key: 'sendTime',
align: 'center'
},
{
title: '缺货',
title: '查看明细',
key: 'detail',
align: 'center',
render(){
return `<cell-stock-out
:lack-num="row.lackNum"
></cell-stock-out>`
render(row){
return `<i-button type="primary">查看明细</i-button>`
}
},
}
],
list: [
{
title: '状态',
align: 'center',
render(row) {
let ot = row.isOvertime;
ot = ot === 'N' ? true : false;
expressNumber: 12323233232,
expressName: '顺丰速递',
sendTime: '2016-03-31 16:28:48'
return `<span v-if="${ot}">待处理</span>
<span v-else>待处理（超时）</span>`;
}
},
{
title: '入库单号',
key: 'proRequisitionFormId',
align: 'center',
}
],
list: []
]
}
}
};
\ No newline at end of file
... ...