cf_cloud/myERP
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yyw提交 #12

Merged
vivanlina merged 1 commits from yyw into master 2025-09-01 05:38:36 +00:00
Conversation 0 Commits 1 Files Changed 2 +18 -10
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/approval/balancepayment.vue
View File

@ -37,7 +37,10 @@
<el-table :data="feesList" style="width: 100%;margin-top: 15px;" border>
<el-table-column label="费用名称" align="center">
<template #default="scope">
<div style="display: flex;align-items: center;white-space: nowrap;">
<el-input type="text" v-model="scope.row.fee_name" :disabled="scope.row.id" />
<span style="color: #f00;" v-if="scope.row.has_paid_amount * 1 == 0">&nbsp;&nbsp;已驳回</span>
</div>
</template>
</el-table-column>
<el-table-column label="订单金额">
@ -191,20 +194,21 @@ export default {
let num = 0, total = 0
for (let index = 0; index < data.goodsList.length; index++) {
let item = data.goodsList[index]
let real_amount = item.real_unit_price * item.real_quantity
total += real_amount * 100
if(item.apply_amount) {
num += item.apply_amount * 100
total += item.apply_amount * 100
} else if(item.real_unit_price && item.real_quantity) {
let real_amount = item.real_unit_price * item.real_quantity
num += real_amount * 100 - item.has_paid_amount * 100
total += real_amount * 100
}
}
for (let index = 0; index < data.feesList.length; index++) {
let item = data.feesList[index]
if(item.amount && item.has_paid_amount * 1 > 0) {
total += item.amount * 100
if(!item.id && item.amount) {
if(item.amount) {
if((item.has_paid_amount * 1 > 0 && item.id) || !item.id) {
total += item.amount * 100
}
if(!item.id) {
num += item.amount * 100
}
}
@ -229,13 +233,16 @@ export default {
for (let index = 0; index < data.goodsList.length; index++) {
let item = data.goodsList[index]
num += item.apply_amount * 100
total += item.apply_amount * 100
let real_amount = item.real_unit_price * item.real_quantity
total += real_amount * 100
}
for (let index = 0; index < data.feesList.length; index++) {
let item = data.feesList[index]
if(item.amount && item.has_paid_amount * 1 > 0) {
total += item.amount * 100
if(!item.id && item.amount) {
if(item.amount) {
if((item.has_paid_amount * 1 > 0 && item.id) || !item.id) {
total += item.amount * 100
}
if(!item.id) {
num += item.amount * 100
}
}

1
src/views/purchase/waitapproval.vue
View File

@ -41,6 +41,7 @@
</div>
<el-table :data="goodsList" style="width: 100%" border v-loading="loading">
<el-table-column prop="id" label="ID" width="80" align="center" />
<el-table-column prop="amount" label="审批金额" align="center" />
<el-table-column prop="type" label="采购类型" align="center">
<template #default="scope">
<span>{{ approvalType[scope.row.order.approval_type] }}</span>