Authored by jiran.zhao

提交调整

... ... @@ -5,17 +5,15 @@
<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 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>
... ... @@ -31,63 +29,62 @@
</layout-body>
</template>
<script>
// import _ from 'lodash';
import {Detail} from './store';
// import _ from 'lodash';
import {Detail} from './store';
export default {
data() {
return Detail.call(this);
},
props: {
dataArray: {
type: Array,
require: true
}
},
methods: {
backList() {
this.$router.push({name: 'finance.withdraw.withdrawlist'});
},
handleTeacherData() {
// if (!teacher) {
export default {
// return
// }
let table = [] // 大表格
let tmpRow = [] // 临时数组,表示 row,一行数据
tmpRow.push({key: '业务单据号', value: "20200330200040011100100086516385"})
tmpRow.push({key: '类型', value: "提现"})
table.push(tmpRow)
tmpRow = []
tmpRow.push({key: '收款账户', value: "张三商贸有限公司(caomei@yoho.cn)"})
tmpRow.push({key: '付款账户', value: "有货商贸有限公司(yh@yoho.cn)"})
table.push(tmpRow)
tmpRow = []
tmpRow.push({key: '申请金额(元)', value: "10000.00"})
tmpRow.push({key: '服务费', value: '100.00'})
table.push(tmpRow)
tmpRow = []
tmpRow.push({key: '成功金额(元)', value: "9900.00"})
tmpRow.push({key: '操作人', value: "商家/平台"})
table.push(tmpRow)
tmpRow = []
tmpRow.push({key: '说明', value: "提现转账扣款(2020-03-23至2020-03-28)"})
tmpRow.push({key: '失败原因', value: "付款账户余额不足"})
table.push(tmpRow)
tmpRow = []
tmpRow.push({key: '备注', value: "++++++------++++++"})
table.push(tmpRow)
tmpRow = []
this.dataArray = table;
}
},
data() {
return Detail.call(this);
},
props: {
dataArray: {
type: Array,
require: true
}
},
methods: {
backList() {
this.$router.push({name: 'finance.withdraw.withdrawlist'});
},
handleTeacherData() {
// if (!teacher) {
// }
let table = [], // 大表格
let tmpRow = [], // 临时数组,表示 row,一行数据
tmpRow.push({key: '业务单据号', value: "20200330200040011100100086516385"}),
tmpRow.push({key: '类型', value: "提现"}),
table.push(tmpRow),
tmpRow = [],
tmpRow.push({key: '收款账户', value: "张三商贸有限公司(caomei@yoho.cn)"}),
tmpRow.push({key: '付款账户', value: "有货商贸有限公司(yh@yoho.cn)"}),
table.push(tmpRow),
tmpRow = [],
tmpRow.push({key: '申请金额(元)', value: "10000.00"}),
tmpRow.push({key: '服务费', value: '100.00'}),
table.push(tmpRow),
tmpRow = [],
tmpRow.push({key: '成功金额(元)', value: "9900.00"}),
tmpRow.push({key: '操作人', value: "商家/平台"}),
table.push(tmpRow),
tmpRow = [],
tmpRow.push({key: '说明', value: "提现转账扣款(2020-03-23至2020-03-28)"}),
tmpRow.push({key: '失败原因', value: "付款账户余额不足"}),
table.push(tmpRow),
tmpRow = [],
tmpRow.push({key: '备注', value: "++++++------++++++"}),
table.push(tmpRow),
tmpRow = [],
this.dataArray = table;
},
},
}
</script>
<style lang="scss" scoped>
... ...
... ... @@ -23,234 +23,230 @@
</template>
<script>
import moment from "moment";
import {ServiceList} from './store';
import FinanceService from 'services/finance/finance-service';
export default {
data() {
return ServiceList.call(this);
import moment from "moment";
import {ServiceList} from './store';
import FinanceService from 'services/finance/finance-service';
export default {
data() {
return ServiceList.call(this);
},
created() {
this.financeService = new FinanceService();
},
mounted() {
this.loadData();
},
watch: {
date() {
this.loadData();
},
created() {
this.financeService = new FinanceService();
day(newDay) {
let curDay = moment().format('YYYY-MM-DD');
if (newDay === this.beginTime || !newDay) {
return;
}
this.dateRange = newDay !== this.curDay ? [newDay, curDay] : [newDay, newDay];
},
mounted() {
this.loadData();
dateRange(newDate) {
this.beginTime = moment(Array.isArray(newDate) ? newDate[0] : newDate).format('YYYY-MM-DD');
this.endTime = moment(Array.isArray(newDate) ? newDate[1] : newDate).format('YYYY-MM-DD');
this.day = this.beginTime === this.endTime === this.today ? '' : this.beginTime;
this.pageData.current = 1;
this.list();
},
watch: {
date() {
this.loadData();
},
day(newDay) {
let curDay = moment().format('YYYY-MM-DD');
if (newDay === this.beginTime || !newDay) {
return;
}
this.dateRange = newDay !== this.curDay ? [newDay, curDay] : [newDay, newDay];
},
dateRange(newDate) {
this.beginTime = moment(Array.isArray(newDate) ? newDate[0] : newDate).format('YYYY-MM-DD');
this.endTime = moment(Array.isArray(newDate) ? newDate[1] : newDate).format('YYYY-MM-DD');
this.day = this.beginTime === this.endTime === this.today ? '' : this.beginTime;
this.pageData.current = 1;
this.list();
},
},
methods: {
loadData() {
this.list();
},
methods: {
loadData() {
this.list();
},
changeLimit(limit) {
if (limit > 1) {
this.dateRange = [this[`day${limit}`], this.today];
} else if (limit === 1) {
this.dateRange = [this.yesterday, this.today];
} else {
this.dateRange = [this.today, this.today];
changeLimit(limit) {
if (limit > 1) {
this.dateRange = [this[`day${limit}`], this.today];
} else if (limit === 1) {
this.dateRange = [this.yesterday, this.today];
} else {
this.dateRange = [this.today, this.today];
}
this.pageData.current = 1;
},
pageChange() {
this.pageData.current = page;
this.list();
},
filtersParams() {
let params = {};
let fts = this.filters;
let withdrawStatus = fts.withdrawStatus.model,
statementSn = fts.statementSn.model === '' || fts.brand.model === null ?
null : fts.statementSn.model;
let pageNo = this.pageData.current;
let pageSize = this.pageData.pageSize;
if (this.filters.withdrawStatus.model) {
if (this.isNumber(this.filters.withdrawStatus.mode)) {
params.withdrawStatus = this.filters.withdrawStatus.model;
}
this.pageData.current = 1;
},
pageChange() {
this.pageData.current = page;
this.list();
},
filtersParams() {
let params = {};
let fts = this.filters;
let withdrawStatus = fts.withdrawStatus.model,
statementSn = fts.statementSn.model === '' || fts.brand.model === null ?
null : fts.statementSn.model;
let pageNo = this.pageData.current;
let pageSize = this.pageData.pageSize;
if (this.filters.withdrawStatus.model) {
if (this.isNumber(this.filters.withdrawStatus.mode)) {
params.withdrawStatus = this.filters.withdrawStatus.model;
}
}
if (this.filters.statementSn.model) {
if (this.isString(this.filters.statementSn.mode)) {
params.statementSn = this.filters.statementSn.model;
}
if (this.filters.statementSn.model) {
if (this.isString(this.filters.statementSn.mode)) {
params.statementSn = this.filters.statementSn.model;
}
}
params.pageSize = this.pageData.pageSize;
params.pageNo = this.pageData.current;
return Promise.resolve({
params,
withdrawStatus,
statementSn,
pageNo,
pageSize
});
},
list() {
this.$Loading.start();
return this.filtersParams().then((params) => {
let filter = { beginTime: this.beginDate, endTime: this.endDate, pageNo: params.pageNo,};
if (this.withdrawStatus && this.withdrawStatus !== '-1') {
filter = Object.assign({}, filter, {withdrawStatus: this.withdrawStatus});
}
params.pageSize = this.pageData.pageSize;
params.pageNo = this.pageData.current;
return Promise.resolve({
params,
withdrawStatus,
statementSn,
pageNo,
pageSize
});
},
list() {
this.$Loading.start();
return this.filtersParams().then((params) => {
let filter = {
beginTime: this.beginDate,
endTime: this.endDate,
pageNo: params.pageNo,
};
if (this.withdrawStatus && this.withdrawStatus !== '-1') {
filter = Object.assign({}, filter, {withdrawStatus: this.withdrawStatus});
}
return this.FinanceService.shopWithdrawServiceList(filter);
}).then(result => {
if (!result.data) {
result.data = {
pageNo: 1,
pageSize: 1,
totalCount: 1,
totalPage: 1,
records: []
}
return this.FinanceService.shopWithdrawServiceList(filter);
}).then(result => {
if (!result.data) {
result.data = {
pageNo: 1,
pageSize: 1,
totalCount: 1,
totalPage: 1,
records: []
}
this.pageData.total = result.data.totalCount;
this.pageData.current = result.data.pageNo;
this.tableData = result.data.records;
this.$Loading.finish();
}).catch(() => {
this.$Loading.finish();
});
},
reset() {
this.filters.withdrawStatus.model = null;
this.filters.statementSn.model = null;
this.filters.timeFlag.model = null;
this.filters.beginTime.model = null;
this.filters.endTime.model = null;
this.pageData.pageNo = 1;
this.pageData.total = 0;
this.list();
}
}
};
}
this.pageData.total = result.data.totalCount;
this.pageData.current = result.data.pageNo;
this.tableData = result.data.records;
this.$Loading.finish();
}).catch(() => {
this.$Loading.finish();
});
},
reset() {
this.filters.withdrawStatus.model = null;
this.filters.statementSn.model = null;
this.filters.timeFlag.model = null;
this.filters.beginTime.model = null;
this.filters.endTime.model = null;
this.pageData.pageNo = 1;
this.pageData.total = 0;
this.list();
},
},
};
</script>
<style lang="scss">
.stat-shop {
.ivu-tabs-tabpane {
height: 400px;
position: relative;
}
.stat-shop {
.ivu-tabs-tabpane {
height: 400px;
position: relative;
}
.layout-container {
min-height: 200px;
margin: 15px;
overflow: hidden;
background: #fff;
border-radius: 4px;
.layout-filter .line {
border-top: none;
margin-bottom: 0;
}
}
.layout-container {
min-height: 200px;
margin: 15px;
overflow: hidden;
background: #fff;
border-radius: 4px;
.layout-filter .line {
border-top: none;
margin-bottom: 0;
}
.shop-card {
margin-top: 10px;
margin-bottom: 10px;
}
.shop-card {
margin-top: 10px;
margin-bottom: 10px;
}
.box-title {
font-weight: 700;
color: #495060;
font-size: 16px;
line-height: 22px;
margin: 5px;
&:before {
content: " ";
display: inline-block;
width: 5px;
margin-right: 2px;
height: 22px;
vertical-align: top;
background-color: #999;
}
.box-title {
font-weight: 700;
color: #495060;
font-size: 16px;
line-height: 22px;
margin: 5px;
&:before {
content: " ";
display: inline-block;
width: 5px;
margin-right: 2px;
height: 22px;
vertical-align: top;
background-color: #999;
}
}
.box-item {
width: 90%;
height: 50px;
padding: 0 0 0 15px;
line-height: 50px;
font-size: 14px;
overflow: hidden;
border-radius: 5px;
color: #fff;
margin-bottom: 10px;
.box-item-label {
display: inline-block;
min-width: 75px;
vertical-align: top;
font-weight: normal;
}
.box-item {
width: 90%;
height: 50px;
padding: 0 0 0 15px;
line-height: 50px;
font-size: 14px;
overflow: hidden;
border-radius: 5px;
color: #fff;
margin-bottom: 10px;
.box-item-label {
display: inline-block;
min-width: 75px;
vertical-align: top;
font-weight: normal;
}
.box-item-value {
font-size: 20px;
font-weight: 600;
}
i {
display: inline-block;
width: 20px;
height: 20px;
font-size: 22px;
text-align: center;
margin-top: -7px;
vertical-align: middle;
margin-right: 3px;
}
.box-item-value {
font-size: 20px;
font-weight: 600;
}
.box-filter {
.ivu-date-picker {
margin-left: 0;
width: 220px !important;
}
i {
display: inline-block;
width: 20px;
height: 20px;
font-size: 22px;
text-align: center;
margin-top: -7px;
vertical-align: middle;
margin-right: 3px;
}
}
.quick {
display: inline-block;
margin-left: 20px;
margin-right: 50px;
.box-filter {
.ivu-date-picker {
margin-left: 0;
width: 220px !important;
}
a {
margin-right: 5px;
}
}
.quick {
display: inline-block;
margin-left: 20px;
margin-right: 50px;
.select-container {
display: inline-block;
width: 220px;
a {
margin-right: 5px;
}
}
.ivu-table-cell {
padding-left: 6px;
padding-right: 6px;
.select-container {
display: inline-block;
width: 220px;
}
}
.ivu-table-cell {
padding-left: 6px;
padding-right: 6px;
}
</style>
\ 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 };
... ...
... ... @@ -8,7 +8,7 @@ const withdrawStatus = {
};
export default function () {
return {
let newVar = {
day: curDay,
date: curDay,
dateRange: [curDay, curDay],
... ... @@ -66,17 +66,20 @@ export default function () {
key: 'clearingType',
width: 90,
align: 'center',
}, {
},
{
title: '子账务类型',
key: 'applyAmount',
width: 90,
align: 'center',
}, {
},
{
title: '服务费金额(元)',
key: 'serviceAmount',
width: 90,
align: 'center',
}, {
},
{
title: '提现状态',
key: 'status',
align: 'center',
... ... @@ -85,10 +88,11 @@ 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',
}, {
},
{
title: '入账时间',
key: 'createTime',
width: 90,
... ... @@ -116,13 +120,16 @@ export default function () {
{
value: 1,
label: '今天',
}, {
},
{
value: 2,
label: '昨天',
}, {
},
{
value: 3,
label: '近7天',
}, {
},
{
value: 4,
label: '近30天',
},
... ... @@ -145,14 +152,14 @@ export default function () {
{
value: 2,
label: '提现失败',
}
]
},
],
},
statementSn: {
label: '业务单据号',
model: '',
labelSpan: 6,
fieldSpan: 18
fieldSpan: 18,
},
targetAccount: {
label: '提现账户',
... ... @@ -165,9 +172,9 @@ export default function () {
{
value: 1,
label: 'hjkxxx@ihi.com',
}
]
}
}
}
},
],
},
},
};
};
... ...
... ... @@ -63,23 +63,7 @@ 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'
}, {
... ... @@ -102,38 +86,14 @@ 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
class
= "cell-action-row" >
< i - button
type = "primary"
size = "small"
onClick = {()
=>
this.getInfoById(row.id)
}>
结算明细 < /i-button>
< /div>
< /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>
);
},
className: 'action-column'
}
className: 'action-column',
},
],
tableData: [],
pageData: {
... ... @@ -145,7 +105,7 @@ export default function () {
dateRange: {
label: '起止日期',
model: '',
labelSpan: 8
labelSpan: 8,
},
beginTime: '',
endTime: '',
... ... @@ -156,17 +116,20 @@ export default function () {
{
value: 1,
label: '今天',
}, {
},
{
value: 2,
label: '昨天',
}, {
},
{
value: 3,
label: '近7天',
}, {
},
{
value: 4,
label: '近30天',
}
]
},
],
},
withdrawStatus: {
label: '提现状态',
... ... @@ -185,14 +148,14 @@ export default function () {
{
value: 2,
label: '提现失败',
}
]
},
],
},
statementSn: {
label: '业务单据号',
model: '',
labelSpan: 6,
fieldSpan: 18
fieldSpan: 18,
},
targetAccount: {
label: '提现账户',
... ... @@ -205,9 +168,9 @@ export default function () {
{
value: 1,
label: 'hjkxxx@ihi.com',
}
]
}
}
},
],
},
},
}
};
... ...
... ... @@ -97,6 +97,7 @@ const domainApis = {
shopWithdrawApply: '/erp-gateway-web/withdraw/apply', //资金操作明细-提现明细ß
shopWithdrawAccountList: '/erp-gateway-web/shop/account/list', //账户资金-账务明细
shopWithdrawServiceList: '/erp-gateway-web/shop/withdraw/service/list', //服务费账单
shopAccountList: '/erp-gateway-web/shop/account/list', //账务明细
},
platform: {
queryShopsByAdminPid: '/SellerShopController/queryShopsByAdminPid',
... ...