From 1bf7a7cb5be7c82a3d0c615429e272fd6860ecbe Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期六, 28 八月 2021 08:28:32 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into HEAD

---
 src/main/webapp/views/waitMatin/waitMatin.html |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/waitMatin/waitMatin.html b/src/main/webapp/views/waitMatin/waitMatin.html
index 1c4b9c7..31467cd 100644
--- a/src/main/webapp/views/waitMatin/waitMatin.html
+++ b/src/main/webapp/views/waitMatin/waitMatin.html
@@ -31,15 +31,21 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <button class="layui-btn icon-btn" lay-filter="eCourseTbSearch" lay-submit>
+                        <button class="layui-btn icon-btn" lay-filter="waitMatinSearch" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
                         </button>
-                        <button id="eCourseAddBtn" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>娣诲姞
+                        <button id="waitMatinAddBtn" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>娣诲姞
                         </button>
                     </div>
                 </div>
             </div>
             <table id="waitMatin" lay-filter="waitMatin"></table>
+        </div>
+    </div>
+    <div class="layui-card">
+        <div class="layui-card-body">
+            鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+            <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
         </div>
     </div>
 </div>
@@ -76,7 +82,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
             <div class="layui-input-block">
-                <input name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+                <input id="billNo" name="billNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
             </div>
         </div>
         <div class="layui-form-item" style="position: relative;">

--
Gitblit v1.9.1