From 8745b76acfd45eadd720d7ce6d87c77e6e0682b9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 12:46:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/views/itemManager/itemManager.html | 125 ++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 58 deletions(-)
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
index be3ea8c..a5fe793 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-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" style="margin-top: 10px">瀵煎嚭</button>
</div>
</script>
@@ -57,66 +68,65 @@
<div class="layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰缂栧彿: </label>
+ <label class="layui-form-label">璁㈠崟鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ヨ鍗曞彿">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍐呴儴缂栧彿: </label>
+ <label class="layui-form-label">椤圭洰缂栧彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ュ唴閮ㄧ紪鍙�">
+ <input class="layui-input" name="inUuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
- <div class="layui-input-block cool-auto-complete">
- <input id="cstmrUuid" class="layui-input" name="cstmrUuid" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">
- <input id="cstmrUuid$" name="cstmrUuid$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ鎴峰悕绉�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="cstmrUuidBycstmrUuid" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="cstmrUuidBycstmrUuidSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <label class="layui-form-label">棰勮鍙戣揣鏃ユ湡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="plandeDate" id="plandeDate" placeholder="璇疯緭鍏ラ璁″彂璐ф棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </label>
+ <label class="layui-form-label">棰勮瀹夎鏃ユ湡: </label>
<div class="layui-input-block">
- <input class="layui-input" name="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="planinDate" id="planinDate" placeholder="璇疯緭鍏ラ璁″畨瑁呮棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
+ <label class="layui-form-label">棰勮杩愯垂: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realStartTime" id="realStartTime" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
+ <input class="layui-input" name="plandeAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="璇疯緭鍏ラ璁¤繍璐�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐘舵��: </label>
+ <label class="layui-form-label">棰勮瀹夎璐�: </label>
<div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">姝ｅ父</option>
- <option value="2">绂佺敤</option>
- <option value="3">瀹岀粨</option>
- </select>
+ <input class="layui-input" name="planinAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="璇疯緭鍏ラ璁″畨瑁呰垂">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换浜�: </label>
+ <label class="layui-form-label">棰勮鍒濋獙鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
+ <input class="layui-input" name="planFADate" id="planFADate" placeholder="璇疯緭鍏ラ璁″垵楠屾椂闂�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(鏈�): </label>
+ <label class="layui-form-label">棰勮缁堥獙鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number" lay-verify="required"
- onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
- onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
- oninput="if(value>200)value=200;if(value<=0)value=1">
+ <input class="layui-input" name="planLADate" id="planLADate" placeholder="璇疯緭鍏ラ璁＄粓楠屾椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰勮杞﹁締澶у皬: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="planCarInfo" placeholder="璇疯緭鍏ラ璁¤溅杈嗗ぇ灏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰勮杞﹁締鏁伴噺: </label>
+ <div class="layui-input-block">
+<!-- <input class="layui-input" name="planCarnumber" onkeyup="value=value.replace(/[^\d]/g,'').replace(/^0{1,}/g,'')" placeholder="璇疯緭鍏ラ璁¤溅杈嗗ぇ灏�">-->
+ <input class="layui-input" name="planCarnumber" placeholder="璇疯緭鍏ラ璁¤溅杈嗗ぇ灏�">
</div>
</div>
</div>
@@ -136,13 +146,13 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰杩涘害: </label>
+ <label class="layui-form-label">杩涘害: </label>
<div class="layui-input-block cool-auto-complete">
- <input id="projectStatus" class="layui-input" name="projectStatus" placeholder="璇疯緭鍏ラ」鐩繘搴�" style="display: none" lay-vertype="tips" lay-verify="required">
- <input id="projectStatus$" name="projectStatus$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩繘搴�" onfocus=this.blur()>
+ <input id="progressRate" class="layui-input" name="progressRate" placeholder="璇疯緭鍏ヨ繘搴�" style="display: none" lay-vertype="tips" >
+ <input id="progressRate$" name="progressRate$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩繘搴�" onfocus=this.blur()>
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="projectStatusByprojectStatus" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="projectStatusByprojectStatusSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="progressRateByprogressRate" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="progressRateByprogressRateSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
@@ -156,29 +166,22 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <label class="layui-form-label">瀹為檯鍙戣揣鏃ユ湡: </label>
<div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="type" placeholder="璇疯緭鍏ラ」鐩被鍨�" style="display: none" lay-vertype="tips" lay-verify="required">
- <!-- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>-->
- <input id="type$" name="type$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩被鍨�" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="typeBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="typeBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <input class="layui-input" name="realdeDate" id="realdeDate" placeholder="璇疯緭鍏ュ疄闄呭彂璐ф棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </label>
+ <label class="layui-form-label">瀹為檯瀹夎鏃ユ湡: </label>
<div class="layui-input-block">
- <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="realinDate" id="realinDate" placeholder="璇疯緭鍏ュ疄闄呭畨瑁呮棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">瀹為檯缁撴潫鏃堕棿: </label>
+ <label class="layui-form-label">瀹為檯杩愯垂: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+ <input class="layui-input" name="realdeAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="璇疯緭鍏ュ疄闄呰繍璐�">
</div>
</div>
@@ -189,18 +192,24 @@
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢熶骇鍦�: </label>
+ <label class="layui-form-label">瀹為檯瀹夎璐�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="originArea" placeholder="璇疯緭鍏ョ敓浜у湴" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="realinAmt" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" placeholder="璇疯緭鍏ュ疄闄呭畨瑁呰垂" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ｄ换閮ㄩ棬: </label>
+ <label class="layui-form-label">瀹為檯鍒濋獙鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="dutyDepartment" id="dutyDepartment$" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+ <input class="layui-input" name="realFADate" id="realFADate" placeholder="璇疯緭鍏ュ疄闄呭垵楠屾椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹為檯缁堥獙鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="realLADate" id="realLADate" placeholder="璇疯緭鍏ュ疄闄呯粓楠屾椂闂�">
</div>
</div>
--
Gitblit v1.9.1