From cc79183af9dda2e2e983ad9915d41f9c3fe2ed11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 15 七月 2023 15:29:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/order/order.html |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 94fa164..7644d67 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -87,6 +87,7 @@
 <div id="box" style="display: block"></div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="printExcel">瀵煎嚭Excel</a>
     {{# if (d.settle == 0 || d.settle == 1) { }}
         <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
         <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
@@ -95,9 +96,9 @@
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
     {{# } }}
 
-    {{# if ((d.settle == 0 || d.settle == 1) && (d.docType == 1 || d.docType == 11 || d.docType == 14 || d.docType == 17 || d.docType == 18)) { }}
-    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="manPrint">鐢熸垚鎷h揣鍗�</a>
-    {{# } }}
+<!--    {{# if ((d.settle == 0 || d.settle == 1) && (d.docType == 1 || d.docType == 11 || d.docType == 14 || d.docType == 17 || d.docType == 18)) { }}-->
+<!--    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="manPrint">鐢熸垚鎷h揣鍗�</a>-->
+<!--    {{# } }}-->
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint">鎵撳嵃</a>
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -248,6 +249,34 @@
     </div>
     {{/each}}
 </script>
+
+
+<script type="text/html" id="payment">
+    <select id="select-primary" style="width: 100%" class="layui-border select-primary" lay-ignore >
+        <option value="1"
+                {{# if( d.payment === 1){ }}
+                selected = "selected"
+                {{# } }}
+        >浠撳偍</option>
+        <option value="0"
+                {{# if( d.payment === 0){ }}
+                selected = "selected"
+                {{# } }}
+        >浠i噰</option>
+
+    </select>
+</script>
+
+
+<!--<script type="text/html" id="payment">-->
+<!--    {{#  var cityList = d.cityList || ["鍖椾含","涓婃捣","骞垮窞","鍩庡競-1"]; }}-->
+<!--    <select name="payment" class="layui-border select-demo-primary" lay-ignore>-->
+<!--        <option value="">鍘熺敓 select 妗�</option>-->
+<!--        {{#  layui.each(cityList, function(i, v){ }}-->
+<!--        <option value="{{= v }}" {{= v === d.city ? 'selected' : '' }}>{{= v }}</option>-->
+<!--        {{#  }); }}-->
+<!--    </select>-->
+<!--</script>-->
 </body>
 
 </html>

--
Gitblit v1.9.1