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

jyy

2021-03-17 301d10c88b03bc7993c64c3467b1bcb0b48104ea

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

@@ -549,7 +549,16 @@
        created : function() {
            let _this = this;
            this.orderParam = /*[[${orderParam}]]*/
                this.queryOrderDetailData(this.orderParam);
            var orderId = /*[[${orderId}]]*/
            var orderNo = /*[[${orderNo}]]*/

            var param = {};
            if(orderId) {
                param.id = orderId;
            } else {
                param.orderNo = orderNo;
            }
            this.queryOrderDetailData(param);
            // 业绩类型
            AjaxProxy.requst({
                app: _this,
@@ -575,7 +584,7 @@
                let _this = this;
                AjaxProxy.requst({
                    app: _this,
                    data: {id: param, orderNo:param},
                    data: param,
                    contentType: 'application/x-www-form-urlencoded',
                    url: basePath + '/admin/order/findOrderDetailByIdOrNo',
                    callback: function (data) {