Authored by jiran.zhao

Merge branch 'feature/shop/zjr-demo' of http://git.yoho.cn/fe/yoho-shop-manage into release/6.9.24

# Conflicts:
#	package.json
export default function() {
return {
showLoading: true,
isAble: true,
data: {
applyType: 0,
},
params: {},
beginStr: '',
endStr: '',
beginTimeStr: '',
... ...
... ... @@ -32,7 +32,7 @@
/>
</Form-item>
<Form-item label="提现金额" prop="withdrawAmount">
<input v-model="data.withdrawAmount" disabled placeholder="请选择日期获取提现金额" />
<input v-model="data.withdrawAmount" :disabled="isAble" placeholder="请选择日期获取提现金额" />
</Form-item>
<Form-item label="提现到帐号">
<span>{{ data.withdrawAccount }}</span>
... ... @@ -176,9 +176,6 @@ export default {
}
},
getAvailableAmount() {
const params = {};
params.beginTime = this.beginStr;
params.endTime = this.endStr;
if (this.beginStr > this.endStr) {
this.$Notice.error({
title: '时间范围异常',
... ... @@ -186,7 +183,7 @@ export default {
});
return;
}
this.financeService.shopGetAvailableAmount(params).then(result => {
this.financeService.shopGetAvailableAmount(this.params).then(result => {
if (result.code === 200) {
this.data.withdrawAmount = result.data.availableAmount;
} else {
... ... @@ -198,10 +195,10 @@ export default {
});
},
changeBeginStr(value) {
this.beginStr = value;
this.params.beginTime = value;
},
changeEndStr(value) {
this.endStr = value;
this.params.endTime = value;
this.getAvailableAmount();
},
},
... ...
... ... @@ -151,9 +151,4 @@ FinanceService.exportBalanceList = '/Api/erp/exportBalanceList'; // 导出对账
FinanceService.exportBalanceDetail = '/Api/erp/exportBalanceDetail'; // 导出对账单详情
FinanceService.exportSettlementDetail = '/Api/erp/exportSettlementDetail'; // 导出结算单详情
FinanceService.exportInventory = '/Api/erp/exportInventoryLedgerList'; // 导出结算单库存
FinanceService.exportShopWithdrawList = '/Api/erp/shopWithdrawList'; // 导出资金操作明细
FinanceService.exportShopWithdrawAccountList = '/Api/erp/shopWithdrawAccountList'; // 导出交易账务明细
FinanceService.exportShopWithdrawServiceList = '/Api/erp/shopWithdrawServiceList'; // 导出服务费账单
FinanceService.exportshopWithdrawFreightList = '/Api/erp/shopWithdrawFreightList'; // 导出运费账务明细
export default FinanceService;
... ...
{
"name": "yoho-shop-manage",
"version": "6.9.24-beta22",
"version": "6.9.24-beta23",
"description": "",
"main": "app.js",
"scripts": {
... ...