fe / yoho-shop-manage · Commits

Go to a project

Authored by htoooth
Commit c32af9a606b97d598958bd7aa2f281bc8ae25c68 1 parent 58622b70

fix

Inline Side-by-side
Showing 7 changed files with 112 additions and 106 deletions
... ... @@ -20,7 +20,7 @@
<script>
import InvoiceService from 'services/repository/invoice-service';
import table from '../store/product-table';
import table from '../store/product-list';
export default {
name: 'product-list',
... ...
... ... @@ -22,7 +22,7 @@
</template>
<script>
import {tableCols} from './store/deliver-table';
import {tableCols} from './store/deliver';
import SendModal from './components/send-modal';
import OrderInfo from './components/order-info';
import InvoiceService from 'services/repository/invoice-service';
... ...
... ... @@ -68,7 +68,7 @@
<script>
import _ from 'lodash';
import {tableCols, tableData} from './store/list-table';
import list from './store/list';
import CreateModal from './components/create-modal';
import InvoiceService from 'services/repository/invoice-service';
... ... @@ -77,94 +77,7 @@
this.invoiceService = new InvoiceService();
},
data() {
return {
tableCols: tableCols.call(this),
tableData,
pageData: {
total: 0,
current: 1,
pageSize: 20
},
filters: {
id: {
label: '入库单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
expressNumber: {
label: '物流单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
productSkn: {
label: 'SKN编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
sknFactoryCode: {
label: '商家编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
skuFactoryCode: {
label: '商品条码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
createTime: {
label: '创建时间',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
auditStatus: {
label: '审核状态',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18,
options: [
{
value: -1,
label: '全部'
},
{
value: 10,
label: '未提交'
},
{
value: 20,
label: '待审核'
},
{
value: 41,
label: '驳回'
},
{
value: 40,
label: '通过'
}
]
}
},
modal: {
show: false,
title: '',
content: '',
onSuccess: null
}
};
return list.call(this);
},
mounted() {
this.getOrders();
... ...
/**
* Created by TaoHuang on 2017/6/20.
*/
import list from './list';
export {
list
};
... ...
... ... @@ -6,8 +6,9 @@
import moment from 'moment';
let tableCols = function() {
return [
export default function() {
return {
tableCols: [
{
title: '入库单号',
key: 'id',
... ... @@ -66,7 +67,9 @@ let tableCols = function() {
return (
<div>
<div><i-progress percent={ percent} hide-info={true} ></i-progress></div>
<div>
<i-progress percent={ percent} hide-info={true}></i-progress>
</div>
<div>{params.row.sendNum || 0} / {params.row.totalNum || 0}</div>
</div>
);
... ... @@ -75,7 +78,6 @@ let tableCols = function() {
return '发货进度<br/> 已发数/需发总数 ';
}
},
{
title: '入库进度',
align: 'center',
... ... @@ -94,8 +96,10 @@ let tableCols = function() {
return (
<div>
<div><i-progress percent={ percent }
hide-info={true}></i-progress></div>
<div>
<i-progress percent={ percent }
hide-info={true}></i-progress>
</div>
<div>{ params.row.inStoreNum || 0} / {params.row.totalNum || 0}</div>
</div>
);
... ... @@ -132,7 +136,8 @@ let tableCols = function() {
if (total) {
commit = (
<i-button type="warning" size="small" onClick={() => this.onClickCommit(params)}>提交</i-button>
<i-button type="warning" size="small" onClick={() => this.onClickCommit(params)}>
提交</i-button>
);
}
... ... @@ -193,12 +198,91 @@ let tableCols = function() {
}
}
}
];
};
let tableData = [];
export {
tableCols,
tableData,
],
tableData: [],
pageData: {
total: 0,
current: 1,
pageSize: 20
},
filters: {
id: {
label: '入库单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
expressNumber: {
label: '物流单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
productSkn: {
label: 'SKN编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
sknFactoryCode: {
label: '商家编码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
skuFactoryCode: {
label: '商品条码',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
createTime: {
label: '创建时间',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
auditStatus: {
label: '审核状态',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18,
options: [
{
value: -1,
label: '全部'
},
{
value: 10,
label: '未提交'
},
{
value: 20,
label: '待审核'
},
{
value: 41,
label: '驳回'
},
{
value: 40,
label: '通过'
}
]
}
},
modal: {
show: false,
title: '',
content: '',
onSuccess: null
}
};
};
... ...