fe / yoho-shop-manage · Commits

Go to a project

Authored by shuiling.wang@yoho.cn
Commit 535e749a246aa1e5a5febbadd9dbac1055621bc6 1 parent 6f70e053

财务管理

Inline Side-by-side
Showing 13 changed files with 149 additions and 58 deletions
... ... @@ -9,7 +9,7 @@
<select-brand v-model="filters.brandId.model"></select-brand>
</filter-item>
<filter-item :label="filters.status.label">
<Select v-model.trim="filters.status.model">
<Select v-model.trim="filters.status.model" clearable>
<Option v-for="option in filters.status.options"
:value="option.value"
:key="option.value">{{option.label}}</Option>
... ... @@ -106,14 +106,23 @@ export default {
},
onClickInfo(params) {
this.$router.push({
name: 'finance.clearing.detail'
name: 'finance.clearing.detail',
params: {},
query: {
balanceId: params.row.balanceId,
brandId: params.row.brandId,
status: {
'未结算': 1,
'已结算': 2
}[params.row.statusDesc]
}
});
},
onClickStock(params) {
let opt = _.pickBy({
brandId: params.row.brandId,
begin: this.startTime,
end: this.endTime
begin: params.row.startTime,
end: params.row.endTime
}, val => val);
this.$router.push({
... ...
... ... @@ -17,7 +17,7 @@
<select-brand v-model="filters.brandId.model"></select-brand>
</filter-item>
<filter-item :label="filters.status.label">
<Select v-model="filters.status.model">
<Select v-model="filters.status.model" clearable>
<Option v-for="option in filters.status.options"
:value="option.value"
:key="option.value">{{option.label}}</Option>
... ... @@ -40,29 +40,11 @@
<script>
import detail from './store/detail';
import filter from './store/filter';
import FinanceService from 'services/finance/finance-service';
export default {
data() {
filter.filters = _.assign({
orderCode: {
label: '订单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
sku: {
label: 'SKU',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
}
}, filter.filters);
return _.assign(detail.call(this), filter);
return detail.call(this);
},
created() {
this.FinanceService = new FinanceService();
... ...
... ... @@ -6,7 +6,7 @@
</filter-item>
<filter-item :label="filters.createTime.label">
<Date-picker v-model="filters.createTime.model"
type="datetimerange" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期和时间">
type="daterange" format="yyyy-MM-dd" placeholder="选择日期">
</Date-picker>
</filter-item>
<filter-item>
... ... @@ -26,13 +26,12 @@
<script>
import stock from './store/stock';
import filter from './store/filter';
import FinanceService from 'services/finance/finance-service';
import _ from 'lodash';
export default {
data() {
return _.assign(stock.call(this), filter);
return stock.call(this);
},
created() {
this.FinanceService = new FinanceService();
... ...
... ... @@ -87,6 +87,53 @@ export default function() {
total: 0,
pageNo: 1,
pageSize: 20
},
filters: {
orderCode: {
label: '订单号',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
sku: {
label: 'SKU',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
balanceId: {
label: '对账单号',
labelSpan: 6,
model: this.$route.query.balanceId,
holder: '',
fieldSpan: 18
},
brandId: {
label: '品牌',
labelSpan: 6,
model: this.$route.query.brandId,
holder: '',
fieldSpan: 18
},
status: {
label: '状态',
labelSpan: 6,
model: this.$route.query.status,
holder: '',
fieldSpan: 18,
options: [
{
value: 1,
label: '未结算'
},
{
value: 2,
label: '已结算'
}
]
}
}
};
}
... ...
let date = new Date();
let agoMonthFirstDay = new Date(date.getFullYear(),date.getMonth()-1,1);
let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth()-1,30);
let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth(),1);
export default {
filters: {
... ...
... ... @@ -19,14 +19,18 @@ export default function() {
key: 'createTimeString',
align: 'center',
render: function(h, params) {
let time = moment.unix(params.row.createTime);
if (params.row.createTime) {
let time = moment.unix(params.row.createTime);
return (
<div>
<div> {time.format('YYYY/MM/DD')} </div>
<div> {time.format('HH:mm:ss')} </div>
</div>
);
return (
<div>
<div> {time.format('YYYY/MM/DD')} </div>
<div> {time.format('HH:mm:ss')} </div>
</div>
);
} else {
return '';
}
}
},
{
... ...
... ... @@ -87,6 +87,24 @@ export default function() {
pageNo: 1,
pageSize: 20
},
curDay: Math.round(new Date().getTime()/1000)
filters: {
brandId: {
label: '品牌',
labelSpan: 6,
model: this.$route.query.brandId,
holder: '',
fieldSpan: 18
},
createTime: {
label: '创建时间',
labelSpan: 6,
model: [
new Date(+this.$route.query.begin * 1000),
new Date(+this.$route.query.end * 1000)
],
holder: '',
fieldSpan: 18
}
}
};
}
... ...
... ... @@ -30,23 +30,12 @@
<script>
import detail from './store/detail';
import filter from './store/filter';
import FinanceService from 'services/finance/finance-service';
import _ from 'lodash';
export default {
data() {
filter.filters = _.assign({
sku: {
label: 'SKU',
labelSpan: 6,
model: this.$route.query.sku || '',
holder: '',
fieldSpan: 18
}
}, filter.filters);
return _.assign(detail.call(this), filter);
return detail.call(this);
},
created() {
this.FinanceService = new FinanceService();
... ... @@ -74,8 +63,6 @@ export default {
reset() {
this.filters.balanceId.model = null;
this.filters.brandId.model = null;
this.filters.status.model = null;
this.filters.orderCode.model = null;
this.filters.sku.model = null;
this.pageData.pageNo = 1;
this.pageData.total = 0;
... ...
... ... @@ -105,11 +105,16 @@ export default {
});
},
onClickStock(params) {
let opt = _.pickBy({
brandId: params.row.brandId,
begin: params.row.startTime,
end: params.row.endTime
}, val => val);
this.$router.push({
name: 'finance.payment.stock',
params: {},
query: {
}
query: opt
});
},
exportData() {
... ...
... ... @@ -6,7 +6,7 @@
</filter-item>
<filter-item :label="filters.createTime.label">
<Date-picker v-model="filters.createTime.model"
type="datetimerange" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期和时间">
type="daterange" format="yyyy-MM-dd" placeholder="选择日期">
</Date-picker>
</filter-item>
<filter-item>
... ... @@ -26,13 +26,12 @@
<script>
import stock from './store/stock';
import filter from './store/filter';
import FinanceService from 'services/finance/finance-service';
import _ from 'lodash';
export default {
data() {
return _.assign(stock.call(this), filter);
return stock.call(this);
},
created() {
this.FinanceService = new FinanceService();
... ...
... ... @@ -48,7 +48,7 @@ export default function() {
},
{
title: '结算金额',
key: 'paymentAmount',
key: 'salesAmount',
align: 'center'
},
{
... ... @@ -67,6 +67,29 @@ export default function() {
total: 0,
pageNo: 1,
pageSize: 20
},
filters: {
sku: {
label: 'SKU',
labelSpan: 6,
model: '',
holder: '',
fieldSpan: 18
},
balanceId: {
label: '结算单号',
labelSpan: 6,
model: this.$route.query.balanceId,
holder: '',
fieldSpan: 18
},
brandId: {
label: '品牌',
labelSpan: 6,
model: this.$route.query.brandId,
holder: '',
fieldSpan: 18
},
}
};
}
... ...
let date = new Date();
let agoMonthFirstDay = new Date(date.getFullYear(),date.getMonth()-1,1);
let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth()-1,30);
let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth(),1);
export default {
filters: {
... ...
... ... @@ -85,6 +85,24 @@ export default function() {
pageNo: 1,
pageSize: 20
},
curDay: Math.round(new Date().getTime() / 1000)
filters: {
brandId: {
label: '品牌',
labelSpan: 6,
model: this.$route.query.brandId,
holder: '',
fieldSpan: 18
},
createTime: {
label: '创建时间',
labelSpan: 6,
model: [
new Date(+this.$route.query.begin * 1000),
new Date(+this.$route.query.end * 1000)
],
holder: '',
fieldSpan: 18
}
}
};
}
... ...