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

jyy

2021-06-19 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7

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

@@ -765,7 +765,7 @@
                _this.dialogSettleVisible = true;
            },
            calOrderTotalFormatter(row, column) {
                return row.count * row.zkPrice;
                return (row.count * row.zkPrice).toFixed(2);
            },
            getVipMoneyCards() {
                let _this = this;