From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html |  140 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 140 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html
new file mode 100644
index 0000000..17a9a67
--- /dev/null
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8">
+    <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+    <meta http-equiv="Cache-Control" content="no-siteapp"/>
+    <LINK rel="Bookmark" href="../images/favicon.ico">
+    <!-- 本框架基本脚本和样式 -->
+    <script type="text/javascript"
+            th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
+    <script type="text/javascript"
+            th:src="@{/js/systools/MBase.js}"></script>
+    <title></title>
+</head>
+
+<div class="panel-body">
+    <div class="form-group">
+        <label class="col-sm-2 control-label">订单号</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" th:text="${order.orderNo}"></span>
+        </div>
+
+        <label class="col-sm-2 control-label">订单总价</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" id="total" th:text="${order.total}"></span>
+        </div>
+    </div>
+    <br>
+    <div class="form-group">
+        <label class="col-sm-2 control-label">客户编号</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" th:text="${order.vipNo}"></span>
+        </div>
+        <label class="col-sm-2 control-label">客户姓名</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" th:text="${order.vipName}"></span>
+        </div>
+    </div>
+    <br>
+    <div class="form-group">
+        <label class="col-sm-2 control-label">现金支付金额</label>
+        <div class="col-sm-4">
+            <span class="form-control-static">[[${order.cashPay}]]</span>
+        </div>
+        <label class="col-sm-2 control-label">卡支付金额</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" id="total">[[${order.cardPay}]]</span>
+        </div>
+    </div>
+    <br>
+    <div class="form-group">
+        <label class="col-sm-2 control-label">欠款</label>
+        <div class="col-sm-4">
+            <span class="form-control-static">[[${order.arrears}]]</span>
+        </div>
+        <label class="col-sm-2 control-label">折后价</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" id="zkTotal" th:text="${order.zkTotal}"></span>
+        </div>
+    </div>
+    <br>
+    <div class="form-group">
+        <label class="col-sm-2 control-label">顾问姓名</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" th:text="${order.staffName}"></span>
+        </div>
+        <label class="col-sm-2 control-label">备注</label>
+        <div class="col-sm-4">
+            <span class="form-control-static" th:text="${order.remark}"></span>
+        </div>
+    </div>
+
+</div>
+
+
+<div class="col-sm-12 form-group">
+    <div class="panel-body">
+        <table class="table table-striped table-condensed  table-hover">
+            <thead>
+            <tr>
+                <th>序号</th>
+                <th>商品名称</th>
+                <th>单价</th>
+                <th>购买数量</th>
+                <th>折扣单价</th>
+                <th>卡付款</th>
+                <th>现金付款</th>
+                <th>欠款</th>
+            </tr>
+            </thead>
+            <tbody id="tbody">
+            <tr th:each="item,count:${order.items }">
+                <td th:text="${count.index}+1"></td>
+                <td><span th:text=" ${item.shoppingGoods.name }"></span>
+
+                    <span th:if="${item.isFree eq '是' }" th:text="赠"></span>
+                </td>
+                <td th:text="${item.price }"></td>
+                <td th:text="${item.count}"></td>
+                <td th:text="${item.zkPrice}"></td>
+                <td>[[${item.cardPay}]]</td>
+                <td>[[${item.cashPay}]]</td>
+                <td>[[${item.arrears}]]</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="form-group ">
+        <div class="col-sm-12 text-center">
+            <a href="javascript:;" onclick="print()" class="btn btn-success radius">打印</a> &nbsp;&nbsp;&nbsp;&nbsp;
+            <button onclick="MTools.closeForm()" class="btn btn-danger radius" type="button">取消</button>
+        </div>
+    </div>
+    </div>
+</div>
+<input autocomplete="off"   type="hidden" id="orderId" th:value="${order.id}">
+</body>
+
+
+<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
+<script type="text/javascript">
+
+    function print() {
+        var id=$("#orderId").val();
+        layer.open({
+            type: 2,
+            title: "打印订单",
+            area: ['250px', '550px'],
+            maxmin: true,
+            content: [basePath + '/admin/order/printOrder?id=' + id]
+        });
+    };
+
+
+</script>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1