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

935090232@qq.com

2022-02-18 e0437d0452badd411685ef7c6c846f5721fd2f7c

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

@@ -421,6 +421,10 @@
                                label="支付方式">
                        </el-table-column>
                        <el-table-column
                                prop="cardName"
                                label="储值卡名称">
                        </el-table-column>
                        <el-table-column
                                prop="flowNo"
                                label="流水号">
                        </el-table-column>
@@ -785,7 +789,7 @@
                _this.dialogSettleVisible = true;
            },
            calOrderTotalFormatter(row, column) {
                return row.count * row.zkPrice;
                return (row.count * row.zkPrice).toFixed(2);
            },
            getVipMoneyCards() {
                let _this = this;
@@ -996,7 +1000,7 @@
                    title: "打印订单",
                    area: ['250px', '550px'],
                    maxmin: true,
                    content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
                    content: [basePath + '/admin/order/printOrder?id=' + id]
                });
            },
            handleClick() {