From f25907687dbba2ec816c2f9e8044959ca036ead4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 08 六月 2022 11:05:39 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/webapp/views/report/viewWorkCountOut.html |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html
index 65a7ff8..d42c553 100644
--- a/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/src/main/webapp/views/report/viewWorkCountOut.html
@@ -18,27 +18,30 @@
 <body>
 
 <!-- 鎼滅储鏍� -->
-<!--<div id="search-box" class="layui-form layui-card-header">-->
-<!--    <div class="layui-inline">-->
-<!--        <div class="layui-input-inline">-->
-<!--            <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="layui-inline">-->
-<!--        <div class="layui-input-inline">-->
-<!--            <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div class="layui-inline" style="width: 300px">-->
-<!--        <div class="layui-input-inline">-->
-<!--            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
-<!--        </div>-->
-<!--    </div>-->
-<!--    <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-<!--        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-<!--        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
-<!--    </div>-->
-<!--</div>-->
+<div id="search-box" class="layui-form layui-card-header">
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+        </div>
+    </div>
+    <div class="layui-inline" style="width: 300px">
+        <div class="layui-input-inline">
+            <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+        </div>
+    </div>
+    <div id="data-search-btn" class="layui-btn-container layui-form-item">
+        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+    </div>
+    <div class="layui-inline">
+        <fieldset class="layui-elem-field">
+            <legend>鎬昏鏁伴噺</legend>
+            <div class="layui-field-box" id="countNum">
+                璇风◢绛�
+            </div>
+        </fieldset>
+    </div>
+</div>
 
 <!-- 琛ㄦ牸 -->
 <table class="layui-hide" id="workOut" lay-filter="workOut"></table>

--
Gitblit v1.9.1