aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '销账隐藏未收款' (#191) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/191
This commit is contained in:
wuteng 2026-01-13 13:31:38 +08:00
commit fbea7ade04
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue
View File

@ -102,11 +102,11 @@
{{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.otherMoney || 0), 0) }} {{ scope.row.detailList.reduce((total, item) => total + (item.emisSettleSubBill.otherMoney || 0), 0) }}
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" > <!-- <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ unrecedMoney(scope.row) }} {{ unrecedMoney(scope.row) }}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100"> <el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
</el-table-column> </el-table-column>
<el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80"> <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">

4
src/views/emis/emisSettleBill/panel/CancelAccountBillList.vue
View File

@ -22,11 +22,11 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('本次销账金额')" align="center" prop="applyMoney" min-width="140"> <el-table-column :label="$t('本次销账金额')" align="center" prop="applyMoney" min-width="140">
</el-table-column> </el-table-column>
<el-table-column :label="$t('未收金额 ')" align="center" prop="" min-width="100" > <!-- <el-table-column :label="$t('未收金额 ')" align="center" prop="" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.emisWaybill.freight - scope.row.emisSettleSubBill.recedMoney}} {{scope.row.emisWaybill.freight - scope.row.emisSettleSubBill.recedMoney}}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170" <el-table-column :label="$t('寄件日期')" align="center" prop="emisWaybill.sendDate" min-width="170"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column :label="$t('快件类型')" align="center" prop="expressType" min-width="200" /> <el-table-column :label="$t('快件类型')" align="center" prop="expressType" min-width="200" />

5
src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue
View File

@ -90,12 +90,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="140" /> <el-table-column :label="$t('本次销账金额')" align="center" prop="writeoffAmount" min-width="140" />
<el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" > <!-- <el-table-column :label="$t('未收金额')" align="center" prop="emisSettleSubBill.unrecedMoney" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 求和 -->
{{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney || 0), 0) }} {{ scope.row.detailList.reduce((total, item) => total + (item.emisWaybill.freight -item.emisSettleSubBill.recedMoney || 0), 0) }}
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100"> <el-table-column :label="$t('申请说明')" align="center" prop="applyMemo" min-width="100">
</el-table-column> </el-table-column>
<el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80"> <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="80">