fe / yoho-shop-manage · Commits

Go to a project

Authored by jiran.zhao
Commit 38d7abb82c43907e04dd585de18c1eb167f5bef3 1 parent 234009d0

一件代发财务

Inline Side-by-side
Showing 7 changed files with 73 additions and 39 deletions
... ... @@ -2,18 +2,20 @@
<layout-body>
<layout-filter>
<filter-item>
<p><span class="bold-title">状态：提现成功</span><br /><span class="no">交易成功时间：2020-03-31 23:43:21</span></p>
<p><span class="bold-title">状态：提现成功</span><br/><span class="no">交易成功时间：2020-03-31 23:43:21</span></p>
</filter-item>
<filter-item>
<p><span class="no">创建时间：2020-3-30 21:34:23</span><span class="no">店铺：一件代发店铺</span><span class="no">供应商:一件代发供应商</span></p>
<p><span class="no">创建时间：2020-3-30 21:34:23</span><span class="no">店铺：一件代发店铺</span><span
class="no">供应商:一件代发供应商</span></p>
</filter-item>
</layout-filter>
<layout-list>
<!-- <Table border :columns="columns" :row-class-name="rowClassName" :data="dataList"></Table>-->
<!-- <Table border :columns="columns" :row-class-name="rowClassName" :data="dataList"></Table>-->
<table border class="table-body">
<tr class="tr-body" v-for="(row, outerIndex) in dataArray" :key="outerIndex">
<!-- flex: 0 0 x% 自适应布局，每一大列的宽度按百分比显示 -->
<div class="td-box" :style="{flex: '0 0 ' + 100 / row.length + '%'}" v-for="(col, innerIndex) in row" :key="innerIndex">
<div class="td-box" :style="{flex: '0 0 ' + 100 / row.length + '%'}" v-for="(col, innerIndex) in row"
:key="innerIndex">
<td class="td-key">{{ col.key }}</td>
<td class="td-value">{{ col.value }}</td>
</div>
... ... @@ -29,7 +31,7 @@
</layout-body>
</template>
<script>
// import _ from 'lodash';
// import _ from 'lodash';
import {Detail} from './store';
export default {
... ... @@ -44,9 +46,9 @@
},
methods: {
backList() {
this.$router.push({ name: 'finance.withdraw.withdrawlist' });
this.$router.push({name: 'finance.withdraw.withdrawlist'});
},
handleTeacherData () {
handleTeacherData() {
// if (!teacher) {
// return
// }
... ... @@ -89,7 +91,7 @@
</script>
<style lang="scss" scoped>
.bold-title{
.bold-title {
font-size: 20px;
font-weight: bold;
}
... ...
... ... @@ -5,14 +5,14 @@ export default [{
meta: {
pageName: '资金操作明细'
}
},{
}, {
path: '/detail/:id.html',
name: 'detail',
component: () => import(/* webpackChunkName: "finance.withdraw" */'./detail'),
meta: {
pageName: '提现明细'
}
},{
}, {
path: '/servicelist.html',
name: 'servicelist',
component: () => import(/* webpackChunkName: "finance.withdraw" */'./service-list'),
... ...
... ... @@ -3,7 +3,7 @@
<layout-body>
<p slot="title">服务费账单</p>
<layout-filter class="box-filter" :inline="true" :col="1">
<filter-item :label="filters.dateRange.label" >
<filter-item :label="filters.dateRange.label">
<Date-picker type="datetimerange"
:placeholder="filters.dateRange.label"
@on-change="dateRange"
... ... @@ -27,8 +27,8 @@
import {ServiceList} from './store';
import FinanceService from 'services/finance/finance-service';
export default {
data(){
export default {
data() {
return ServiceList.call(this);
},
created() {
... ... @@ -145,7 +145,7 @@ export default {
this.list();
}
}
};
};
</script>
<style lang="scss">
... ...
export default function() {
let table = []; // 大表格
return table;
};
\ No newline at end of file
}
... ...
... ... @@ -2,4 +2,4 @@ import Withdraw from './withdraw';
import Detail from './detail';
import ServiceList from './service-list';
export { Withdraw, Detail, ServiceList };
\ No newline at end of file
export {Withdraw, Detail, ServiceList};
\ No newline at end of file
... ...
... ... @@ -7,7 +7,7 @@ const withdrawStatus = {
2: '提现失败',
};
export default function() {
export default function () {
return {
day: curDay,
date: curDay,
... ... @@ -85,9 +85,9 @@ export default function() {
const as = row.status;
const asText = as === 2 ? `${withdrawStatus[row.status]}(${row.rejectReason})` : withdrawStatus[as];
ow.lineIndex = params.index;
return (<p class={{'high-light': as === 2}}>{asText}</p>);
return ( <p class= {{'high-light':as === 2}}>{asText}</p>);
},
className: 'status-column'
className: 'status-column',
}, {
title: '入账时间',
key: 'createTime',
... ... @@ -116,13 +116,13 @@ export default function() {
{
value: 1,
label: '今天',
},{
}, {
value: 2,
label: '昨天',
},{
}, {
value: 3,
label: '近7天',
},{
}, {
value: 4,
label: '近30天',
},
... ...
import moment from 'moment';
let curDay = moment().format('YYYY-MM-DD');
const withdrawStatus = {
... ... @@ -7,7 +8,7 @@ const withdrawStatus = {
2: '提现失败'
};
export default function() {
export default function () {
return {
day: curDay,
date: curDay,
... ... @@ -63,8 +64,22 @@ export default function() {
const asText = as === 2 ? `${withdrawStatus[row.status]}(${row.rejectReason})` : withdrawStatus[as];
ow.lineIndex = params.index;
return (
<p class={{'high-light': as === 2}}>{asText}</p>
);
< p
class
= {
{
'high-light'
:
as === 2
}
}>
{
asText
}
<
/p>
)
;
},
className: 'status-column'
}, {
... ... @@ -87,18 +102,35 @@ export default function() {
render: (h, params) => {
const row = params.row;
return (
<div>
<div class="cell-action-row">
<i-button type="primary" size="small"
onClick={() => this.getDetailById(row.id)}>提现明细</i-button>
</div>
< div >
< div
class
= "cell-action-row" >
< i - button
type = "primary"
size = "small"
onClick = {()
=>
this.getDetailById(row.id)
}>
提现明细 < /i-button>
< /div>
<div class="cell-action-row">
<i-button type="primary" size="small"
onClick={() => this.getInfoById(row.id)}>结算明细</i-button>
</div>
</div>
);
< div
class
= "cell-action-row" >
< i - button
type = "primary"
size = "small"
onClick = {()
=>
this.getInfoById(row.id)
}>
结算明细 < /i-button>
< /div>
< /div>
)
;
},
className: 'action-column'
}
... ... @@ -124,13 +156,13 @@ export default function() {
{
value: 1,
label: '今天',
},{
}, {
value: 2,
label: '昨天',
},{
}, {
value: 3,
label: '近7天',
},{
}, {
value: 4,
label: '近30天',
}
... ...