From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
index d3566c6..a3e3dce 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html
@@ -52,9 +52,13 @@
<body>
<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.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>
@@ -148,6 +152,7 @@
</el-form-item>
<el-button type="primary" @click="search" >搜索</el-button>
<el-button @click="resetForm('form')">重置</el-button>
+ <el-button @click="excelExport">导出</el-button>
</el-form>
</el-col>
</el-row>
@@ -681,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>
--
Gitblit v1.9.1