fe / yoho-shop-manage · Commits

Go to a project

Authored by shuiling.wang@yoho.cn
Commit af071908a59450008f0ac7fca38efb9f98874ef7 1 parent 535e749a

库存字段修改

Inline Side-by-side
Showing 3 changed files with 8 additions and 17 deletions
... ... @@ -53,7 +53,7 @@ export default {
if (_.isEmpty(createTime)) {
return 0;
} else {
return createTime[1] ? createTime[1].getTime() / 1000 : 0;
return createTime[1] ? parseInt(createTime[1].getTime() / 1000, 10) : 0;
}
}
},
... ...
... ... @@ -10,7 +10,7 @@ export default function() {
tableCols: [
{
title: '商品编号',
key: 'productSkn',
key: 'productSku',
align: 'center'
},
{
... ... @@ -20,7 +20,7 @@ export default function() {
},
{
title: '厂家编号',
key: 'supplierSku',
key: 'factoryCode',
align: 'center',
},
{
... ... @@ -74,11 +74,6 @@ export default function() {
title: '期末库存数量',
key: 'supplier100Sell',
align: 'center'
},
{
title: '库房',
key: 'supplierName',
align: 'center'
}
],
tableData: [],
... ... @@ -100,7 +95,7 @@ export default function() {
labelSpan: 6,
model: [
new Date(+this.$route.query.begin * 1000),
new Date(+this.$route.query.end * 1000)
new Date(moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD") + " 00:00:00")
],
holder: '',
fieldSpan: 18
... ...
... ... @@ -3,12 +3,13 @@
* @author: wsl <shuiling.wang@yoho.cn>
* @date: 2017/07/13
*/
import moment from 'moment';
export default function() {
return {
tableCols: [
{
title: '商品编号',
key: 'productSkn',
key: 'productSku',
align: 'center'
},
{
... ... @@ -18,7 +19,7 @@ export default function() {
},
{
title: '厂家编号',
key: 'supplierSku',
key: 'factoryCode',
align: 'center',
},
{
... ... @@ -72,11 +73,6 @@ export default function() {
title: '期末库存数量',
key: 'supplier100Sell',
align: 'center'
},
{
title: '库房',
key: 'supplierName',
align: 'center'
}
],
tableData: [],
... ... @@ -98,7 +94,7 @@ export default function() {
labelSpan: 6,
model: [
new Date(+this.$route.query.begin * 1000),
new Date(+this.$route.query.end * 1000)
new Date(moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD") + " 00:00:00")
],
holder: '',
fieldSpan: 18
... ...