confict

Helius

2021-02-03 fed1f885b03a5b4b7c62d44320c3ff2068ca02e6

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html

@@ -62,7 +62,7 @@
      <el-row type="flex" align="middle" style="padding: 0 0 10px 0;">
         <el-col :span="5" style="text-align: center;">充值金额</el-col>
         <el-col :span="10" style="text-align: center; line-height: 50px;">
            <el-input v-model="rechargeMoney" @change="changeRechargeMoney"  placeholder="0.1元起充"></el-input>
            <el-input type="number" v-model="rechargeMoney" @change="changeRechargeMoney"  placeholder="可充负数退款"></el-input>
         </el-col>
      </el-row>

@@ -168,7 +168,7 @@
      data : {
         cardInfo : "",
         loginUser : "",
         rechargeMoney : "",
         rechargeMoney : 0,
         payMethods: [{
            value: '现金支付',
            img: '/images/pay/cash.png',
@@ -251,11 +251,6 @@
               return;
            }

            if (_this.rechargeMoney < 0.1) {
               this.$message.warning("0.1元起充");
               return;
            }

            if (_this.payMoneys.length > 0) {
               let flows = []
               var total = 0;
@@ -266,10 +261,11 @@
                     this.$message.warning("请输入" + item.type + "的付款金额");
                     return false;
                  }
                  flow.amount = item.money;
                  total += item.money;
                  flow.amount = parseFloat(item.money);
                  total +=   parseFloat(item.money);
                  flows.push(flow);
               })
               debugger
               if (total != _this.rechargeMoney) {
                  this.$message.warning("付款金额应等于充值金额");
                  return false;
@@ -347,10 +343,7 @@
               return;
            }

            if (rechargeMoney < 0.1) {
               this.$message.warning("0.1元起充");
               return;
            }

            if (item.type != '储值卡') {
               this.$nextTick(function () {
                  if (item.isActive) {
@@ -373,9 +366,7 @@
                     for(var i = 0; i < payMoneys.length; i++) {
                        hasAmount += parseFloat(payMoneys[i].money);
                     }
                     if (_this.rechargeMoney - hasAmount > 0) {
                        Vue.set(item, 'money', _this.rechargeMoney - hasAmount);
                     }
                     Vue.set(item, 'money', _this.rechargeMoney - hasAmount);
                     _this.payMoneys.push(item);
                  }
               });