From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期六, 02 十一月 2024 11:18:38 +0800 Subject: [PATCH] 合并代码，解决冲突 --- src/main/webapp/views/report/viewWorkCountIn.html | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html index 0c6c7d8..205be16 100644 --- a/src/main/webapp/views/report/viewWorkCountIn.html +++ b/src/main/webapp/views/report/viewWorkCountIn.html @@ -17,28 +17,30 @@ </head> <body> -<!-- 鎼滅储鏍� --> -<!--<div id="search-box" class="layui-form layui-card-header">--> +<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">--> -<!-- <div class="layui-input-inline">--> -<!-- <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">--> -<!-- </div>--> +<!-- <fieldset class="layui-elem-field">--> +<!-- <legend>鎬昏鏁伴噺</legend>--> +<!-- <div class="layui-field-box" id="countNum">--> +<!-- 璇风◢绛�--> +<!-- </div>--> +<!-- </fieldset>--> <!-- </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> <!-- 琛ㄦ牸 --> <table class="layui-hide" id="workIn" lay-filter="workIn"></table> -- Gitblit v1.9.1