From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs

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

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 7458c87..d89f0c4 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -49,6 +49,23 @@
                         </div>
                     </div>
                     <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="doc_type" id="docType-query">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="settle">
+                                <option value="">閫夋嫨鐘舵��</option>
+                                <option value="1">寰呭鐞�</option>
+                                <option value="2">浣滀笟涓�</option>
+                                <option value="4">宸插畬鎴�</option>
+                                <option value="6">涓婃姤瀹屾垚</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
                         <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
                         </button>
@@ -152,14 +169,14 @@
 <script type="text/html" id="matEditDialog">
     <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
         <input name="experimentId" type="hidden"/>
-        <div class="layui-form-item">
+        <div class="layui-form-item" style="float: left">
             <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
             <div class="layui-input-block">
                 <div id="mat" name="mat">
                 </div>
             </div>
         </div>
-        <div class="layui-form-item text-right">
+        <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
             <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
             <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
         </div>
@@ -167,10 +184,19 @@
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.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" charset="utf-8"></script>
+
+<script type="text/template" id="docTypeTpl">
+    <option value="">閫夋嫨绫诲瀷</option>
+    {{#each records}}
+    <option value="{{docId}}">{{docName}}</option>
+    {{/each}}
+</script>
 </body>
+
 </html>
 

--
Gitblit v1.9.1