From 82b8c1133e96d7e4b9af4ddbc6ef7c6fb583aa5e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 31 八月 2024 10:12:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pla/locDetlQuery.html | 156 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 133 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/pla/locDetlQuery.html b/src/main/webapp/views/pla/locDetlQuery.html
index 8c6be84..460df3f 100644
--- a/src/main/webapp/views/pla/locDetlQuery.html
+++ b/src/main/webapp/views/pla/locDetlQuery.html
@@ -17,14 +17,22 @@
border-right: 1px solid #9F9F9F;
border-left: 1px solid #9F9F9F;
}
+ .layui-form.layui-card-header {
+ height: 40px;
+ padding: 0px 0px 0px;
+ }
#search-box {
- padding: 30px 0 20px 0;
+ padding: 5px 0 5px 0;
+ }
+ #search-box .layui-input-inline {
+ width: 100px;
}
#search-box .layui-inline:first-child {
margin-left: 30px;
}
#search-box .layui-inline {
+ margin-bottom: 30px;
margin-right: 5px;
}
@@ -35,6 +43,9 @@
#data-search-btn.layui-btn-container .layui-btn {
margin-right: 20px;
}
+ .layui-card-header {
+ border-bottom: none;
+ }
</style>
</head>
<body>
@@ -42,14 +53,14 @@
<span style="font-size: large; font-weight: bold">鎻愬彇搴撳瓨鍟嗗搧</span>
</div>
<!-- 鎼滅储鏍� -->
-<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
- <legend>鎼滅储鏍�</legend>
+<fieldset class="layui-elem-field site-demo-button">
<!-- 鎼滅储鏍� -->
- <div id="search-box" class="layui-form layui-card-header">
+ <div id="search-box">
<div class="layui-form layui-card-header">
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 270px">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ <div id="mat" name="mat">
+ </div>
</div>
</div>
<div class="layui-inline">
@@ -87,12 +98,23 @@
</select>
</div>
</div>
- <div class="layui-inline" style="width: 300px">
- <!-- <div class="layui-input-inline">-->
- <!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
- <!-- </div>-->
- <div class="layui-input-inline" style="width: 300px">
- <input type="text" class="layui-input" name="create_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="stock_freeze">
+ <option value="">鏄惁鍐荤粨</option>
+ <option value="0">鏄�</option>
+ <option value="1">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="package_type" placeholder="鍖呰绫诲瀷" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet_type" placeholder="鎵樼洏绫诲瀷" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -100,15 +122,24 @@
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
-
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
- <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>
- <!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline" style="width: 290px">
+ <input type="text" class="layui-input" name="create_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
+ </div>
</div>
</div>
<div class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="package_noMin" placeholder="鏈�灏忓寘鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <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">
<input class="layui-input" type="text" name="finger_meltingMin" placeholder="鏈�灏忕啍鎸�" autocomplete="off">
@@ -119,6 +150,35 @@
<input class="layui-input" type="text" name="finger_meltingMax" placeholder="鏈�澶х啍鎸�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="opacityMin" placeholder="鏈�灏忎笉閫忔槑搴�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="opacityMax" placeholder="鏈�澶т笉閫忔槑搴�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="waterMin" placeholder="鏈�灏忔按鍒�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="waterMax" placeholder="鏈�澶ф按鍒�" autocomplete="off">
+ </div>
+ </div>
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <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>
+ <!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+
+ <div class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="fusing_pointMin" placeholder="鏈�灏忕啍鐐�" autocomplete="off">
@@ -141,12 +201,22 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="opacityMin" placeholder="鏈�灏忎笉閫忔槑搴�" autocomplete="off">
+ <input class="layui-input" type="text" name="vadf1Min" placeholder="鏈�灏忔尌鍙戞" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="opacityMax" placeholder="鏈�澶т笉閫忔槑搴�" autocomplete="off">
+ <input class="layui-input" type="text" name="vadf1Max" placeholder="鏈�澶ф尌鍙戞" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="vadf2Min" placeholder="鏈�灏忓垎瑙ｆ" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="vadf2Max" placeholder="鏈�澶у垎瑙ｆ" autocomplete="off">
</div>
</div>
</div>
@@ -178,11 +248,17 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
- }).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+ }).use(['table','laydate', 'form', 'admin', 'tableMerge', 'xmSelect'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
+ // 鏃ユ湡鏃堕棿鑼冨洿
+ layDate.render({
+ elem: '#ID-laydate-range-datetime',
+ type: 'datetime',
+ range: true
+ });
var form = layui.form;
var admin = layui.admin;
var tableMerge = layui.tableMerge;
@@ -200,8 +276,8 @@
return $(window).height() - otherHeight - 100; // 杩斿洖 number 绫诲瀷
},
//height: 'full',
- limit: 16,
- limits: [16, 30, 50, 100, 200, 500],
+ limit: 500,
+ limits: [500,1000],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
@@ -273,6 +349,36 @@
}
});
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#mat',
+ style: {
+ width: '270px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/pla/batch/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(stockOut)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -305,6 +411,10 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+ if(searchData.select){
+ searchData.batch = searchData.select;
+ searchData.select = null;
+ }
locDetlTableIns.reload({
where: searchData,
});
--
Gitblit v1.9.1