Compare commits

..

No commits in common. "73209fb1caf97edad33e0676deca0f967b8e9d71" and "d9b415d194d6bdd6acdd47b48e7739b14545cdf6" have entirely different histories.

View File

@ -491,29 +491,20 @@
append-to-body append-to-body
> >
<el-form ref="form" :model="offline" :rules="rules" label-width="120px"> <el-form ref="form" :model="offline" :rules="rules" label-width="120px">
<el-form-item label="商品价格(元)"> <el-form-item label="商品价格">
<span>{{ goodsPrice / 100 }}</span> <span>{{ goodsPrice / 100 }}</span>
<el-tag type="info" style="margin-left: 10px;">单位</el-tag>
</el-form-item> </el-form-item>
<el-form-item label="优惠金额">
<el-form-item label="优惠金额(元)">
<el-input-number <el-input-number
v-model="reduceMoney"
:min="0" :min="0"
@input="jisuan"
:max="goodsPrice / 100" :max="goodsPrice / 100"
@change="jisuan" type="text"
placeholder="请输入优惠金额"> v-model="reduceMoney"
</el-input-number> ></el-input-number>
<div style="color: #909399; font-size: 12px; margin-top: 5px;">
可输入范围0 - {{ goodsPrice / 100 }}
</div>
</el-form-item> </el-form-item>
<el-form-item label="实付金额">
<el-form-item label="实付金额(元)"> <el-input-number type="text" disabled v-model="payMoney"></el-input-number>
<el-input-number
v-model="payMoney"
disabled>
</el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="付款方式"> <el-form-item label="付款方式">
<!-- <el-input type="text" v-model="receivablesAccount"></el-input>--> <!-- <el-input type="text" v-model="receivablesAccount"></el-input>-->
@ -1019,21 +1010,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="优惠金额"> <el-form-item label="优惠金额" v-if="batchType == 'cn'">
<el-input-number <el-input-number
:min="0" :min="0"
:max="settleForm.goodsPrice" @input="batchJisuan"
:precision="2" :max="settleForm.realPayMoney"
:controls="false" type="text"
v-model="settleForm.reduceMoney" v-model="settleForm.reduceMoney"
@change="batchJisuan" ></el-input-number>
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>
<el-form-item <el-form-item
@ -1568,16 +1552,10 @@ export default {
}); });
}, },
jisuan() { jisuan() {
// if (this.reduceMoney > this.goodsPrice / 100) {
const goodsPriceYuan = this.goodsPrice / 100; this.reduceMoney = 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() { jisuanSetlementMoney() {
console.log('执行了算') console.log('执行了算')
@ -1587,18 +1565,11 @@ export default {
this.settlementForm.settlementAmount = this.settlementForm.goodsPrice / 100 - this.settlementForm.settlementReduceMoney; this.settlementForm.settlementAmount = this.settlementForm.goodsPrice / 100 - this.settlementForm.settlementReduceMoney;
}, },
batchJisuan() { batchJisuan() {
//
if (this.settleForm.reduceMoney > this.settleForm.goodsPrice) { if (this.settleForm.reduceMoney > this.settleForm.goodsPrice) {
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() { tijiao() {
console.log(this.fileUrls); console.log(this.fileUrls);