dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Lx 2025-09-05 16:07:37 +08:00
commit de6dc81dce
1 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/views/partner/workOrder.vue
View File

@ -270,8 +270,9 @@
type="text"
icon="el-icon-edit"
@click="settlementWork(scope.row)"
v-if="!scope.row.settlementAmount && !scope.row.realPayMoney"
>
<!-- v-if="!scope.row.settlementAmount && !scope.row.realPayMoney"-->
结算
</el-button>
<el-button
@ -335,6 +336,7 @@
class-name="small-padding fixed-width"
>
<template v-slot="scope">
{{scope.row.realPayMoney}}
<el-button
size="mini"
type="text"
@ -490,20 +492,29 @@
append-to-body
>
<el-form ref="form" :model="offline" :rules="rules" label-width="120px">
<el-form-item label="商品价格">
<el-form-item label="商品价格（元）">
<span>{{ goodsPrice / 100 }}</span>
<el-tag type="info" style="margin-left: 10px;">单位：元</el-tag>
</el-form-item>
<el-form-item label="优惠金额">
<el-form-item label="优惠金额（元）">
<el-input-number
:min="0"
@input="jisuan"
:max="goodsPrice / 100"
type="text"
v-model="reduceMoney"
></el-input-number>
:min="0"
:max="goodsPrice / 100"
@change="jisuan"
placeholder="请输入优惠金额">
</el-input-number>
<div style="color: #909399; font-size: 12px; margin-top: 5px;">
可输入范围：0 - {{ goodsPrice / 100 }} 元
</div>
</el-form-item>
<el-form-item label="实付金额">
<el-input-number type="text" disabled v-model="payMoney"></el-input-number>
<el-form-item label="实付金额（元）">
<el-input-number
v-model="payMoney"
disabled>
</el-input-number>
</el-form-item>
<el-form-item label="付款方式">
<!-- <el-input type="text" v-model="receivablesAccount"></el-input>-->
@ -630,7 +641,6 @@
</el-form-item>
<el-form-item label="请选择客户来源">
<el-select
disabled
v-model="form.customerSource"
placeholder="请选择客户来源"
>
@ -1009,14 +1019,21 @@
</el-select>
</el-form-item>
<el-form-item label="优惠金额" v-if="batchType == 'cn'">
<el-form-item label="优惠金额">
<el-input-number
:min="0"
@input="batchJisuan"
:max="settleForm.realPayMoney"
type="text"
:max="settleForm.goodsPrice"
:precision="2"
:controls="false"
v-model="settleForm.reduceMoney"
></el-input-number>
@change="batchJisuan"
style="width: 100%;"
>
<template slot="append">元</template>
</el-input-number>
<div style="color: #909399; font-size: 12px; margin-top: 5px;">
可输入范围：0 - {{ settleForm.goodsPrice }} 元
</div>
</el-form-item>
<el-form-item
@ -1551,10 +1568,16 @@ export default {
});
},
jisuan() {
if (this.reduceMoney > this.goodsPrice / 100) {
this.reduceMoney = this.goodsPrice / 100;
// 修复后的计算逻辑
const goodsPriceYuan = this.goodsPrice / 100;
// 确保优惠金额不超过商品价格
if (this.reduceMoney > goodsPriceYuan) {
this.reduceMoney = goodsPriceYuan;
}
this.payMoney = this.goodsPrice / 100 - this.reduceMoney;
// 计算实付金额，确保不低于0
this.payMoney = Math.max(0, goodsPriceYuan - this.reduceMoney);
},
jisuanSetlementMoney() {
console.log('执行了算')
@ -1564,11 +1587,18 @@ export default {
this.settlementForm.settlementAmount = this.settlementForm.goodsPrice / 100 - this.settlementForm.settlementReduceMoney;
},
batchJisuan() {
// 确保优惠金额不超过商品价格
if (this.settleForm.reduceMoney > this.settleForm.goodsPrice) {
this.settleForm.reduceMoney = this.settleForm.goodsPrice;
}
this.settleForm.realPayMoney =
this.settleForm.goodsPrice - this.settleForm.reduceMoney;
// 计算实付金额
this.settleForm.realPayMoney = this.settleForm.goodsPrice - this.settleForm.reduceMoney;
// 确保实付金额不为负数
if (this.settleForm.realPayMoney < 0) {
this.settleForm.realPayMoney = 0;
}
},
tijiao() {
console.log(this.fileUrls);