Commit 2b13fb7f0b547fe526476a80d89169b4c41e44c0
1 parent
59405971
Exists in
master
update
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
backend/chkpower/src/main/resources/mapper/WDailyFundsMapper.xml
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | |
| 75 | 75 | <select id="selectWDailyFundsNews" resultType="com.hotent.chkpower.model.WDailyFunds"> |
| 76 | 76 | SELECT funds.F_date,funds.id_,funds.F_org_id,funds.F_org_name , |
| 77 | - jrye.F_today_account_balance,zrye.F_yesterday_account_balance,(IFNULL(zrye.F_yesterday_account_balance,0) - IFNULL(jrye.F_today_account_balance,0)) as F_account_balance_difference | |
| 77 | + jrye.F_today_account_balance,zrye.F_yesterday_account_balance,(IFNULL(jrye.F_today_account_balance,0) - IFNULL(zrye.F_yesterday_account_balance,0)) as F_account_balance_difference | |
| 78 | 78 | ,jxjl.F_today_net_cash_flow,jrye.F_today_freeze_amount,jrye.F_today_freezing |
| 79 | 79 | FROM w_daily_funds funds |
| 80 | 80 | LEFT JOIN ( | ... | ... |
frontend/front/src/components/tableSlot/finance/transactionDetailsDl.vue
| 1 | 1 | <template> |
| 2 | - <div> | |
| 3 | - <el-button @click="onClick">公司收支明细导出</el-button> | |
| 2 | + <div style="display: inline-block;"> | |
| 3 | + <el-button @click="onClick" size="mini">公司收支明细导出</el-button> | |
| 4 | 4 | <el-dialog title="公司收支明细导出" :visible.sync="dialogVisible" width="30%"> |
| 5 | 5 | <el-form> |
| 6 | 6 | <el-form-item label="日期"> | ... | ... |