From fffbbc439d9bebf9ca916a5b0a585b7864b50803 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 07 四月 2022 16:43:23 +0800
Subject: [PATCH] .
---
src/main/webapp/static/js/itemBusiness/itemBusiness.js | 16 ++++----
src/main/webapp/static/js/itemManager/itemManager.js | 30 +++++++-------
src/main/webapp/views/item/item.html | 8 +++
src/main/webapp/views/itemManager/itemManager.html | 17 +++++++-
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 4 +
src/main/webapp/views/itemBusiness/itemBusiness.html | 10 ++++-
src/main/webapp/static/js/item/item.js | 16 ++++----
7 files changed, 63 insertions(+), 38 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index f694ae0..d75ccbf 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -45,11 +45,13 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
HashSet<String> excludeField = new HashSet<>();
- allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
+ allLike(Item.class, param.keySet(), wrapper, condition);
+// allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index b939daa..68b8d2f 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -24,8 +24,8 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId', align: 'center',title: ''}
- ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'}
- ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
+ ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�', width: 130}
+ ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
@@ -33,13 +33,13 @@
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
- ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
- ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
- ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
- ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
+ ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�', width: 115}
+ ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿', width: 115}
+ ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�', width: 115}
+ ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿', width: 115}
,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
- ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)', width: 115}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -49,7 +49,7 @@
// ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:165}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/itemBusiness/itemBusiness.js b/src/main/webapp/static/js/itemBusiness/itemBusiness.js
index 5869e00..a88bafc 100644
--- a/src/main/webapp/static/js/itemBusiness/itemBusiness.js
+++ b/src/main/webapp/static/js/itemBusiness/itemBusiness.js
@@ -24,26 +24,26 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId', align: 'center',title: ''}
- ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'}
- ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
+ ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�', width: 130}
+ ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
// ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
- ,{field: 'orderDesc', align: 'center', title: '璁㈠崟绫诲瀷鎻忚堪'}
+ ,{field: 'orderDesc', align: 'center', title: '璁㈠崟绫诲瀷鎻忚堪', width: 115}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
,{field: 'salesman', align: 'center',title: '涓氬姟鍛�'}
- ,{field: 'presaleAmt', align: 'center',title: '鍞墠鏍镐环閲戦'}
- ,{field: 'predeDate0$', align: 'center', title: '閿�鍞浜よ揣鏈�'}
- ,{field: 'preinDate0$', align: 'center', title: '閿�鍞瀹夎鏈�'}
+ ,{field: 'presaleAmt', align: 'center',title: '鍞墠鏍镐环閲戦', width: 115}
+ ,{field: 'predeDate0$', align: 'center', title: '閿�鍞浜よ揣鏈�', width: 115}
+ ,{field: 'preinDate0$', align: 'center', title: '閿�鍞瀹夎鏈�', width: 115}
,{field: 'weight', align: 'center', title: '浜у搧閲嶉噺'}
- ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)', width: 115}
,{field: 'installMk$', align: 'center', title: '鏄惁瀹夎'}
,{field: 'deliveryMk$', align: 'center', title: '鏄惁杩愯緭'}
,{field: 'custMan', align: 'center',title: '瀹㈡埛鑱旂郴浜�'}
- ,{field: 'custMobile', align: 'center',title: '瀹㈡埛鑱旂郴鏂瑰紡'}
+ ,{field: 'custMobile', align: 'center',title: '瀹㈡埛鑱旂郴鏂瑰紡', width: 120}
,{field: 'custAdress', align: 'center',title: '瀹㈡埛鍦板潃'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
index d9f48f2..903f289 100644
--- a/src/main/webapp/static/js/itemManager/itemManager.js
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -19,32 +19,32 @@
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
- cellMinWidth: 50,
+ cellMinWidth: 100,
cols: [[
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId', align: 'center',title: ''}
- ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'}
- ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
+ ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�', width: 130}
+ ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
,{field: 'progressRate', align: 'center',title: '杩涘害'}
- ,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬'}
- ,{field: 'planCarnumber', align: 'center', title: '棰勮杞﹁締鏁伴噺'}
+ ,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬', width: 115}
+ ,{field: 'planCarnumber', align: 'center', title: '棰勮杞﹁締鏁伴噺', width: 115}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
- ,{field: 'plandeDate0$', align: 'center',title: '棰勮鍙戣揣鏃ユ湡'}
- ,{field: 'realdeDate0$', align: 'center',title: '瀹為檯鍙戣揣鏃ユ湡'}
- ,{field: 'planinDate0$', align: 'center', title: '棰勮瀹夎鏃ユ湡'}
- ,{field: 'realinDate0$', align: 'center', title: '瀹為檯瀹夎鏃ユ湡'}
+ ,{field: 'plandeDate0$', align: 'center',title: '棰勮鍙戣揣鏃ユ湡', width: 115}
+ ,{field: 'realdeDate0$', align: 'center',title: '瀹為檯鍙戣揣鏃ユ湡', width: 115}
+ ,{field: 'planinDate0$', align: 'center', title: '棰勮瀹夎鏃ユ湡', width: 115}
+ ,{field: 'realinDate0$', align: 'center', title: '瀹為檯瀹夎鏃ユ湡', width: 115}
,{field: 'plandeAmt', align: 'center', title: '棰勮杩愯垂'}
,{field: 'realdeAmt', align: 'center', title: '瀹為檯杩愯垂'}
- ,{field: 'planinAmt', align: 'center', title: '棰勮瀹夎璐�'}
- ,{field: 'realinAmt', align: 'center', title: '瀹為檯瀹夎璐�'}
- ,{field: 'planFADate0$', align: 'center', title: '棰勮鍒濋獙鏃堕棿'}
- ,{field: 'realFADate0$', align: 'center',title: '瀹為檯鍒濋獙鏃堕棿'}
- ,{field: 'planLADate0$', align: 'center', title: '棰勮缁堥獙鏃堕棿'}
- ,{field: 'realLADate0$', align: 'center',title: '瀹為檯缁堥獙鏃堕棿'}
+ ,{field: 'planinAmt', align: 'center', title: '棰勮瀹夎璐�', width: 115}
+ ,{field: 'realinAmt', align: 'center', title: '瀹為檯瀹夎璐�', width: 115}
+ ,{field: 'planFADate0$', align: 'center', title: '棰勮鍒濋獙鏃堕棿', width: 115}
+ ,{field: 'realFADate0$', align: 'center',title: '瀹為檯鍒濋獙鏃堕棿', width: 115}
+ ,{field: 'planLADate0$', align: 'center', title: '棰勮缁堥獙鏃堕棿', width: 115}
+ ,{field: 'realLADate0$', align: 'center',title: '瀹為檯缁堥獙鏃堕棿', width: 115}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 94fcd5b..1e6aa03 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -17,7 +17,13 @@
<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="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="id" placeholder="璁㈠崟鍙�" autocomplete="off">
+ </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="name" placeholder="椤圭洰鍚嶇О" autocomplete="off">
+ </div>
+ <div class="layui-input-inline" style="width: 200px">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
diff --git a/src/main/webapp/views/itemBusiness/itemBusiness.html b/src/main/webapp/views/itemBusiness/itemBusiness.html
index 9bac618..f450e0e 100644
--- a/src/main/webapp/views/itemBusiness/itemBusiness.html
+++ b/src/main/webapp/views/itemBusiness/itemBusiness.html
@@ -17,7 +17,13 @@
<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="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="id" placeholder="璁㈠崟鍙�" autocomplete="off">
+ </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="name" placeholder="椤圭洰鍚嶇О" autocomplete="off">
+ </div>
+ <div class="layui-input-inline" style="width: 200px">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -35,7 +41,7 @@
<div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">绂佺敤</button>-->
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
</div>
</script>
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
index 8dfcfa5..918ae40 100644
--- a/src/main/webapp/views/itemManager/itemManager.html
+++ b/src/main/webapp/views/itemManager/itemManager.html
@@ -10,6 +10,11 @@
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ .layui-table-body.layui-table-main {
+ overflow: scroll;
+ }
+ </style>
</head>
<body>
@@ -17,7 +22,13 @@
<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="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="id" placeholder="璁㈠崟鍙�" autocomplete="off">
+ </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="name" placeholder="椤圭洰鍚嶇О" autocomplete="off">
+ </div>
+ <div class="layui-input-inline" style="width: 200px">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -28,14 +39,14 @@
</div>
<!-- 琛ㄦ牸 -->
-<div class="layui-form">
+<div class="layui-form" style="width: 100%">
<table class="layui-hide" id="item" lay-filter="item"></table>
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">绂佺敤</button>-->
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
</div>
</script>
--
Gitblit v1.9.1