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

@@ -22,7 +22,7 @@
        .ibox-content {
            background-color: rgba(240, 242, 245, 1);
        }
        label {
        .aside label {
            width: 100%;
            margin: 5px 0 !important;
        }
@@ -74,7 +74,7 @@
</head>
<div class="ibox-content" id="app">
    <el-container>
        <el-aside style="width: 300px; background-color: white; padding: 10px;">
        <el-aside class="aside" style="width: 300px; background-color: white; padding: 10px;">
            <el-row style="border-bottom: #E4E7ED 1px solid;">
                <el-col :span="20" style="padding: 10px;">
                    <el-row type="flex" align="middle">
@@ -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>
@@ -430,7 +430,7 @@
                                         @check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
                                         :props="defaultProps">
                                </el-tree>
                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style="line-height: 30px;"><img style="width: 25px; height: 25px;" :src="item.img"><span style="line-height: 30px; margin-left: 5px;">{{item.value}}</span></div></li>
                                <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style=" height:30px; line-height: 30px; display: flex; align-items: center"><img style="width: 25px; height: 25px; align-items: center;" :src="item.img"><span style="margin-left: 5px;">{{item.value}}</span></div></li>
                            </el-popover>
                        </span>
                    </ul>
@@ -525,7 +525,7 @@
                type: '储值卡'
            }, ],

            dialogSettleVisible : true,
            dialogSettleVisible : false,
            moneyCards: [],
            defaultProps: {
                children: 'children',
@@ -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);
                        }
                    });