Showing
3 changed files
with
8 additions
and
17 deletions
| @@ -53,7 +53,7 @@ export default { | @@ -53,7 +53,7 @@ export default { | ||
| 53 | if (_.isEmpty(createTime)) { | 53 | if (_.isEmpty(createTime)) { |
| 54 | return 0; | 54 | return 0; |
| 55 | } else { | 55 | } else { |
| 56 | - return createTime[1] ? createTime[1].getTime() / 1000 : 0; | 56 | + return createTime[1] ? parseInt(createTime[1].getTime() / 1000, 10) : 0; |
| 57 | } | 57 | } |
| 58 | } | 58 | } |
| 59 | }, | 59 | }, |
| @@ -10,7 +10,7 @@ export default function() { | @@ -10,7 +10,7 @@ export default function() { | ||
| 10 | tableCols: [ | 10 | tableCols: [ |
| 11 | { | 11 | { |
| 12 | title: '商品编号', | 12 | title: '商品编号', |
| 13 | - key: 'productSkn', | 13 | + key: 'productSku', |
| 14 | align: 'center' | 14 | align: 'center' |
| 15 | }, | 15 | }, |
| 16 | { | 16 | { |
| @@ -20,7 +20,7 @@ export default function() { | @@ -20,7 +20,7 @@ export default function() { | ||
| 20 | }, | 20 | }, |
| 21 | { | 21 | { |
| 22 | title: '厂家编号', | 22 | title: '厂家编号', |
| 23 | - key: 'supplierSku', | 23 | + key: 'factoryCode', |
| 24 | align: 'center', | 24 | align: 'center', |
| 25 | }, | 25 | }, |
| 26 | { | 26 | { |
| @@ -74,11 +74,6 @@ export default function() { | @@ -74,11 +74,6 @@ export default function() { | ||
| 74 | title: '期末库存数量', | 74 | title: '期末库存数量', |
| 75 | key: 'supplier100Sell', | 75 | key: 'supplier100Sell', |
| 76 | align: 'center' | 76 | align: 'center' |
| 77 | - }, | ||
| 78 | - { | ||
| 79 | - title: '库房', | ||
| 80 | - key: 'supplierName', | ||
| 81 | - align: 'center' | ||
| 82 | } | 77 | } |
| 83 | ], | 78 | ], |
| 84 | tableData: [], | 79 | tableData: [], |
| @@ -100,7 +95,7 @@ export default function() { | @@ -100,7 +95,7 @@ export default function() { | ||
| 100 | labelSpan: 6, | 95 | labelSpan: 6, |
| 101 | model: [ | 96 | model: [ |
| 102 | new Date(+this.$route.query.begin * 1000), | 97 | new Date(+this.$route.query.begin * 1000), |
| 103 | - new Date(+this.$route.query.end * 1000) | 98 | + new Date(moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD") + " 00:00:00") |
| 104 | ], | 99 | ], |
| 105 | holder: '', | 100 | holder: '', |
| 106 | fieldSpan: 18 | 101 | fieldSpan: 18 |
| @@ -3,12 +3,13 @@ | @@ -3,12 +3,13 @@ | ||
| 3 | * @author: wsl <shuiling.wang@yoho.cn> | 3 | * @author: wsl <shuiling.wang@yoho.cn> |
| 4 | * @date: 2017/07/13 | 4 | * @date: 2017/07/13 |
| 5 | */ | 5 | */ |
| 6 | +import moment from 'moment'; | ||
| 6 | export default function() { | 7 | export default function() { |
| 7 | return { | 8 | return { |
| 8 | tableCols: [ | 9 | tableCols: [ |
| 9 | { | 10 | { |
| 10 | title: '商品编号', | 11 | title: '商品编号', |
| 11 | - key: 'productSkn', | 12 | + key: 'productSku', |
| 12 | align: 'center' | 13 | align: 'center' |
| 13 | }, | 14 | }, |
| 14 | { | 15 | { |
| @@ -18,7 +19,7 @@ export default function() { | @@ -18,7 +19,7 @@ export default function() { | ||
| 18 | }, | 19 | }, |
| 19 | { | 20 | { |
| 20 | title: '厂家编号', | 21 | title: '厂家编号', |
| 21 | - key: 'supplierSku', | 22 | + key: 'factoryCode', |
| 22 | align: 'center', | 23 | align: 'center', |
| 23 | }, | 24 | }, |
| 24 | { | 25 | { |
| @@ -72,11 +73,6 @@ export default function() { | @@ -72,11 +73,6 @@ export default function() { | ||
| 72 | title: '期末库存数量', | 73 | title: '期末库存数量', |
| 73 | key: 'supplier100Sell', | 74 | key: 'supplier100Sell', |
| 74 | align: 'center' | 75 | align: 'center' |
| 75 | - }, | ||
| 76 | - { | ||
| 77 | - title: '库房', | ||
| 78 | - key: 'supplierName', | ||
| 79 | - align: 'center' | ||
| 80 | } | 76 | } |
| 81 | ], | 77 | ], |
| 82 | tableData: [], | 78 | tableData: [], |
| @@ -98,7 +94,7 @@ export default function() { | @@ -98,7 +94,7 @@ export default function() { | ||
| 98 | labelSpan: 6, | 94 | labelSpan: 6, |
| 99 | model: [ | 95 | model: [ |
| 100 | new Date(+this.$route.query.begin * 1000), | 96 | new Date(+this.$route.query.begin * 1000), |
| 101 | - new Date(+this.$route.query.end * 1000) | 97 | + new Date(moment(this.$route.query.begin * 1000).endOf('month').format("YYYY-MM-DD") + " 00:00:00") |
| 102 | ], | 98 | ], |
| 103 | holder: '', | 99 | holder: '', |
| 104 | fieldSpan: 18 | 100 | fieldSpan: 18 |
-
Please register or login to post a comment