Authored by 刘志远

Merge branch 'feature/shop/zjr-demo' into 'master'

From feature/shop/zjr-demo into master

提现明细类型账号待定,去除导出

See merge request !108
@@ -16,13 +16,13 @@ @@ -16,13 +16,13 @@
16 <td>业务单据号</td> 16 <td>业务单据号</td>
17 <td>{{ data.statementSn }}</td> 17 <td>{{ data.statementSn }}</td>
18 <td>类型</td> 18 <td>类型</td>
19 - <td>{{ data.type }}</td> 19 + <td>提现</td>
20 </tr> 20 </tr>
21 <tr> 21 <tr>
22 <td>收款账户</td> 22 <td>收款账户</td>
23 <td>{{ data.targetAccount }}</td> 23 <td>{{ data.targetAccount }}</td>
24 <td>付款账户</td> 24 <td>付款账户</td>
25 - <td>{{ data.payAccount }}</td> 25 + <td>有货商贸有限公司(yh@yoho.cn)</td>
26 </tr> 26 </tr>
27 <tr> 27 <tr>
28 <td>申请金额(元)</td> 28 <td>申请金额(元)</td>
@@ -151,9 +151,4 @@ FinanceService.exportBalanceList = '/Api/erp/exportBalanceList'; // 导出对账 @@ -151,9 +151,4 @@ FinanceService.exportBalanceList = '/Api/erp/exportBalanceList'; // 导出对账
151 FinanceService.exportBalanceDetail = '/Api/erp/exportBalanceDetail'; // 导出对账单详情 151 FinanceService.exportBalanceDetail = '/Api/erp/exportBalanceDetail'; // 导出对账单详情
152 FinanceService.exportSettlementDetail = '/Api/erp/exportSettlementDetail'; // 导出结算单详情 152 FinanceService.exportSettlementDetail = '/Api/erp/exportSettlementDetail'; // 导出结算单详情
153 FinanceService.exportInventory = '/Api/erp/exportInventoryLedgerList'; // 导出结算单库存 153 FinanceService.exportInventory = '/Api/erp/exportInventoryLedgerList'; // 导出结算单库存
154 -  
155 -FinanceService.exportShopWithdrawList = '/Api/erp/shopWithdrawList'; // 导出资金操作明细  
156 -FinanceService.exportShopWithdrawAccountList = '/Api/erp/shopWithdrawAccountList'; // 导出交易账务明细  
157 -FinanceService.exportShopWithdrawServiceList = '/Api/erp/shopWithdrawServiceList'; // 导出服务费账单  
158 -FinanceService.exportshopWithdrawFreightList = '/Api/erp/shopWithdrawFreightList'; // 导出运费账务明细  
159 export default FinanceService; 154 export default FinanceService;
1 { 1 {
2 "name": "yoho-shop-manage", 2 "name": "yoho-shop-manage",
3 - "version": "1.2.1", 3 + "version": "1.2.2",
4 "description": "", 4 "description": "",
5 "main": "app.js", 5 "main": "app.js",
6 "scripts": { 6 "scripts": {