From b2a895946c2e261eec55e6e86daf44fb21825818 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 06 六月 2024 09:30:32 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/picking/picking.js | 2 src/main/webapp/views/pla/plaDetl.html | 46 +++++++------- src/main/webapp/views/pla3/plaDetl.html | 41 ++++++------- src/main/webapp/static/js/saasLog/saasLog.js | 4 src/main/webapp/views/pla2/plaDetl.html | 41 ++++++------- 5 files changed, 62 insertions(+), 72 deletions(-) diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js index fdd5aa8..ba55339 100644 --- a/src/main/webapp/static/js/picking/picking.js +++ b/src/main/webapp/static/js/picking/picking.js @@ -39,7 +39,7 @@ ,{field: 'status$', align: 'center',title: '鐘舵��'} ,{field: 'custName', align: 'center',title: '瀹㈡埛鍚嶇О', width: 160} ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'} - ,{field: 'updateTime$', align: 'center',title: '鎿嶄綔鏃堕棿'} + ,{field: 'updateTime$', align: 'center',title: '鍑哄簱鏃堕棿'} ,{align: 'center', title: '鎿嶄綔', toolbar: '#operate'} ]], diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js index d22e9cd..c47ceae 100644 --- a/src/main/webapp/static/js/saasLog/saasLog.js +++ b/src/main/webapp/static/js/saasLog/saasLog.js @@ -23,8 +23,8 @@ url: baseUrl+'/saasLog/list/auth', page: true, totalRow: true, // 寮�鍚悎璁¤ - limit: 15, - limits: [15, 30, 50, 100, 200, 500], + limit: 16, + limits: [16, 50, 100, 200, 500,2000,5000,10000], toolbar: '#toolbar', cellMinWidth: 50, height: 'full-120', diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html index 3e6e342..57f6c7d 100644 --- a/src/main/webapp/views/pla/plaDetl.html +++ b/src/main/webapp/views/pla/plaDetl.html @@ -140,27 +140,6 @@ <!-- 鎼滅储鏍� --> <div id="search-box" > <div class="layui-form layui-card-header"> - <div class="layui-inline" style="width: 70px"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 70px"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 270px"> - <div class="layui-input-inline"> - <div id="mat" name="mat"> - </div> - </div> - </div> -<!-- <div class="layui-inline">--> -<!-- <div class="layui-input-inline">--> -<!-- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">--> -<!-- </div>--> -<!-- </div>--> <div class="layui-inline" style="width: 80px"> <div class="layui-input-inline cool-auto-complete"> <input id="maktx" class="layui-input" type="text" style="display: none"> @@ -172,9 +151,10 @@ </div> </div> </div> - <div class="layui-inline" style="width: 80px"> + <div class="layui-inline" style="width: 270px"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="type" placeholder="鐗╄祫绫诲埆" autocomplete="off"> + <div id="mat" name="mat"> + </div> </div> </div> <div class="layui-inline" style="width: 80px"> @@ -190,6 +170,16 @@ </select> </div> </div> + <div class="layui-inline" style="width: 70px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width: 70px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off"> + </div> + </div> <div class="layui-inline"> <div class="layui-input-inline"> <select name="stock_freeze"> @@ -199,6 +189,16 @@ </select> </div> </div> +<!-- <div class="layui-inline">--> +<!-- <div class="layui-input-inline">--> +<!-- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">--> +<!-- </div>--> +<!-- </div>--> + <div class="layui-inline" style="width: 80px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="type" placeholder="鐗╄祫绫诲埆" autocomplete="off"> + </div> + </div> <div class="layui-inline" style="width: 80px"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="package_type" placeholder="鍖呰绫诲瀷" autocomplete="off"> diff --git a/src/main/webapp/views/pla2/plaDetl.html b/src/main/webapp/views/pla2/plaDetl.html index e764e11..ae3595c 100644 --- a/src/main/webapp/views/pla2/plaDetl.html +++ b/src/main/webapp/views/pla2/plaDetl.html @@ -140,27 +140,6 @@ <!-- 鎼滅储鏍� --> <div id="search-box" > <div class="layui-form layui-card-header"> - <div class="layui-inline" style="width: 70px"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 70px"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 270px"> - <div class="layui-input-inline"> - <div id="mat" name="mat"> - </div> - </div> - </div> - <!-- <div class="layui-inline">--> - <!-- <div class="layui-input-inline">--> - <!-- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">--> - <!-- </div>--> - <!-- </div>--> <div class="layui-inline" style="width: 80px"> <div class="layui-input-inline cool-auto-complete"> <input id="maktx" class="layui-input" type="text" style="display: none"> @@ -172,9 +151,10 @@ </div> </div> </div> - <div class="layui-inline" style="display: none;"> + <div class="layui-inline" style="width: 270px"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="type" value="鏀规�ф爲鑴�" placeholder="鐗╄祫绫诲埆" autocomplete="off"> + <div id="mat" name="mat"> + </div> </div> </div> <div class="layui-inline" style="width: 80px"> @@ -190,6 +170,16 @@ </select> </div> </div> + <div class="layui-inline" style="width: 70px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width: 70px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off"> + </div> + </div> <div class="layui-inline"> <div class="layui-input-inline"> <select name="stock_freeze"> @@ -199,6 +189,11 @@ </select> </div> </div> + <div class="layui-inline" style="display: none;"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="type" value="鏀规�ф爲鑴�" placeholder="鐗╄祫绫诲埆" autocomplete="off"> + </div> + </div> <div class="layui-inline" style="width: 80px"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="package_type" placeholder="鍖呰绫诲瀷" autocomplete="off"> diff --git a/src/main/webapp/views/pla3/plaDetl.html b/src/main/webapp/views/pla3/plaDetl.html index 6890cbc..0c66198 100644 --- a/src/main/webapp/views/pla3/plaDetl.html +++ b/src/main/webapp/views/pla3/plaDetl.html @@ -140,27 +140,6 @@ <!-- 鎼滅储鏍� --> <div id="search-box" > <div class="layui-form layui-card-header"> - <div class="layui-inline" style="width: 70px"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 70px"> - <div class="layui-input-inline"> - <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off"> - </div> - </div> - <div class="layui-inline" style="width: 270px"> - <div class="layui-input-inline"> - <div id="mat" name="mat"> - </div> - </div> - </div> - <!-- <div class="layui-inline">--> - <!-- <div class="layui-input-inline">--> - <!-- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">--> - <!-- </div>--> - <!-- </div>--> <div class="layui-inline" style="width: 80px"> <div class="layui-input-inline cool-auto-complete"> <input id="maktx" class="layui-input" type="text" style="display: none"> @@ -172,9 +151,10 @@ </div> </div> </div> - <div class="layui-inline" style="display: none;"> + <div class="layui-inline" style="width: 270px"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="type" value="绾爲鑴�" placeholder="鐗╄祫绫诲埆" autocomplete="off"> + <div id="mat" name="mat"> + </div> </div> </div> <div class="layui-inline" style="width: 80px"> @@ -190,6 +170,16 @@ </select> </div> </div> + <div class="layui-inline" style="width: 70px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off"> + </div> + </div> + <div class="layui-inline" style="width: 70px"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="package_noMax" placeholder="鏈�澶у寘鍙�" autocomplete="off"> + </div> + </div> <div class="layui-inline"> <div class="layui-input-inline"> <select name="stock_freeze"> @@ -199,6 +189,11 @@ </select> </div> </div> + <div class="layui-inline" style="display: none;"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="type" value="绾爲鑴�" placeholder="鐗╄祫绫诲埆" autocomplete="off"> + </div> + </div> <div class="layui-inline" style="width: 80px"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="package_type" placeholder="鍖呰绫诲瀷" autocomplete="off"> -- Gitblit v1.9.1