Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

 zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html

@@ -53,12 +53,12 @@
<div class="panel-body" id="app" v-cloak>
        <el-row>
                <el-card class="box-card" style="background-color: #0a628f;">
                    <div style="padding:10px;font-size: 20px;">￥{{basicdetail.balance}}</div>
                    <div style="padding:10px;font-size: 20px;">￥{{basicdetail.orderBalance}}</div>
                    <div>订单总金额</div>
                </el-card >
                <el-card class="box-card" style="background-color: #0f9aef;">
                    <div style="padding:10px;font-size: 20px;">￥{{basicdetail.balance}}</div>
                    <div>待计算金额</div>
                    <div>待结算金额</div>
                </el-card >
                <el-card class="box-card" style="background: #67C23A;">
                    <div style="padding:10px;font-size: 20px;">{{basicdetail.waitNum}}人</div>
@@ -152,7 +152,7 @@
                            </el-form-item>
                            <el-button type="primary" @click="search" >搜索</el-button>
                            <el-button @click="resetForm('form')">重置</el-button>
                            <el-button>导出</el-button>
                            <el-button @click="excelExport">导出</el-button>
                        </el-form>
                    </el-col>
                </el-row>
@@ -686,6 +686,16 @@
                    }
                });
            },
            excelExport() {
                var jsonParam = this.getRequestParam();
                var param = "";
                Object.keys(jsonParam).forEach(function(key){
                    if (jsonParam[key]) {
                        param += key + "=" + jsonParam[key] + "&";
                    }
                });
                window.location.href=basePath+"/fenXiao/fenXiaoOrder/exportExcel?"+param;
            }
        }
    })
</script>