From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接

---
 src/main/webapp/views/order/order.html |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 42323ba..f6fb615 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -104,7 +104,11 @@
         <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
     {{# } }}
     {{# if (d.settle == 2) { }}
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+    {{# } }}
+    {{# if (d.settle == 4) { }}
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
     {{# } }}
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -160,10 +164,22 @@
             </div>
         </div>
         <div class="layui-form-item">
+            <label class="layui-form-label">鍑哄簱浠撳簱锛�</label>
+            <div class="layui-input-block cool-auto-complete">
+                <input class="layui-input" name="defNumber" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�" style="display: none">
+                <input id="cstmr" name="cstmr" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="storeTypeQuery2BystoreType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="storeTypeQuery2BystoreTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
             <label class="layui-form-label">鍏ュ簱浠撳簱锛�</label>
             <div class="layui-input-block cool-auto-complete">
                 <input class="layui-input" name="itemId" placeholder="璇疯緭鍏ュ叆搴撲粨搴�" style="display: none">
-                <input id="itemName" name="itemName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+                <input id="itemName" name="itemName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ叆搴撲粨搴�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                 <div class="cool-auto-complete-window">
                     <input class="cool-auto-complete-window-input" data-key="storeTypeQueryBystoreType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                     <select class="cool-auto-complete-window-select" data-key="storeTypeQueryBystoreTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -322,7 +338,7 @@
 <script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/order.js?v=6" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js?v=9" charset="utf-8"></script>
 
 <script type="text/template" id="docTypeTpl">
     <option value="">閫夋嫨绫诲瀷</option>

--
Gitblit v1.9.1