Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-19 0a67d6a24417507a27e03d53da82bbd802257148

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

@@ -104,7 +104,7 @@
                            <label style="font-size: 14px;">应收金额</label>
                            <label>欠款</label>
                            <label>已还</label>
                            <label>退款</label>
                            <label v-if="order.refund != 0">退款</label>
                        </el-col>
                        <el-col :span="14" style="text-align: right;">
                            <label>¥ {{order.total}}</label>
@@ -112,7 +112,7 @@
                            <label>¥ {{order.zkTotal}}</label>
                            <label>¥ {{order.arrears}}</label>
                            <label>¥ {{order.repay}}</label>
                            <label>¥ {{order.refund}}</label>
                            <label v-if="order.refund != 0">¥ {{order.refund}}</label>
                        </el-col>
                    </el-row>
                </el-col>
@@ -771,6 +771,13 @@
                            }
                        } else {
                            Vue.set(item,'isActive',true);
                            var hasAmount = 0;
                            for(var i = 0; i < payMoneys.length; i++) {
                                hasAmount += parseFloat(payMoneys[i].money);
                            }
                            if (_this.refundMoney - hasAmount > 0) {
                                Vue.set(item, 'money', _this.refundMoney - hasAmount);
                            }
                            _this.payMoneys.push(item);
                        }
                    });