fe / yoho-shop-manage · Commits

Go to a project

Authored by 李奇
Commit 1005df5a01af0fc3e3601cbbb60a1227556e6099 1 parent 098b36d1

发货完成修改

Inline Side-by-side
Showing 5 changed files with 28 additions and 71 deletions
... ... @@ -89,6 +89,10 @@ export default () => {
align: 'center'
},
{
title: '商品图片',
align: 'center'
},
{
title: '商品信息',
align: 'center',
render(row){
... ... @@ -118,7 +122,8 @@ export default () => {
title: '收货进度（收货数/已发数）',
align: 'center',
render(row){
return `<i-progress :percent="${row.inStoreNum}/${row.shipmentsNums}" hide-info></i-progress>`
return `<i-progress :percent="${(row.inStoreNum/row.shipmentsNums)*100}" hide-info></i-progress>
<p>${row.inStoreNum}/${row.shipmentsNums}</p>`
}
},
{
... ...
... ... @@ -26,26 +26,6 @@ export default () => {
holder: 'SKN/SKU',
fieldSpan: 18
},
expressStatus: {
label: '物流状态',
labelSpan: 6,
fieldSpan: 18,
model: 0,
options: [
{
value: 0,
label: '全部'
},
{
value: 2,
label: '已发出'
},
{
value: 3,
label: '入库完成'
}
]
},
prodBarCode: {
label: '商品条码',
labelSpan: 6,
... ...
... ... @@ -40,7 +40,7 @@
</LayoutFilter>
<LayoutList>
<Table border :context="self" :columns="table.cols" :data="table.list"
:row-class-name="rowClassName" @on-selection-change="selectChange"></Table>
:row-class-name="rowClassName"></Table>
<Page :total="page.total" :current="page.current"
@on-change="pageChange" :page-size="20" show-total></Page>
</LayoutList>
... ... @@ -75,6 +75,7 @@
const params = {
pageNo: 1,
pageSize: 20,
statusList: [2,3]
};
... ... @@ -82,7 +83,16 @@
},
methods: {
params(){
const data = {};
let data = {
pageNo: 1,
pageSize: 20,
statusList: [2,3]
};
if(!this.useFilterSign) {
return data;
}
const mapKeys = {
proRequisitionFormId: 'orderNo',
expressNumber: 'expressNo',
... ... @@ -119,16 +129,14 @@
}
data.isOvertime = ot === -2 ? 'Y' : '';
console.log(data)
data = _.pickBy(data, (v) => {
return (v+'').length;
});
return data;
},
productList(params){
service.allotPurchaseList(
_.merge(params || {}, {
pageSize: 20
}))
service.allotPurchaseList(params)
.then(res => {
const fmt = 'YYYY-MM-DD HH:mm:ss';
const list = res.data.records;
... ... @@ -142,38 +150,22 @@
});
},
filterSearch(){
const params = this.params();
this.useFilterSign = true;
this.productList(params);
this.productList(this.params());
this.page.current = 1;
},
clearFilter(){
this.filters = Store().filters;
this.productList();
this.useFilterSign = false;
this.productList(this.params());
this.page.current = 1;
},
pageChange(page) {
let params = {};
const params = this.params();
this.page.current = page;
if(this.useFilterSign) {
params = this.params();
}
_.merge(params, {
page
});
params.pageNo = page;
this.productList(params);
},
selectChange(){
},
sendOut(){
},
setModel(k, v) {
this.filters[k].model = v;
},
... ...
... ... @@ -13,13 +13,6 @@
<Input v-model.trim="filters.prodCode.model"
:placeholder="filters.prodCode.holder" number></Input>
</FilterItem>
<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>
... ... @@ -103,8 +96,7 @@
expressNumber: 'expressNo',
sknFactoryCode: 'prodCode',
skuFactoryCode: 'prodBarCode',
proRequisitionFormId: 'orderNo',
statusList: 'expressStatus'
proRequisitionFormId: 'orderNo'
};
if(this.useFilter) {
... ... @@ -114,19 +106,9 @@
if(val.length) {
data[k] = this.filters[v].model;
}
// 物流状态
if(k === 'statusList') {
if (val === '0') {
data[k] = [2, 3];
} else {
data[k] = [this.filters[v].model];
}
}
});
}
return data;
},
goExpDetail(expressNo) {
... ...
... ... @@ -126,12 +126,10 @@
}
data.isOvertime = ot === -1 ? '' : ( ot === 1 ? 'N' : 'Y');
data = _.pickBy(data, (v, k) => {
data = _.pickBy(data, (v) => {
return (v+'').length;
});
console.log('参数体=', data)
return data;
},
productList(params){
... ...