From bd6095e7af86faf7ed0a5ca188775aeac7b031f2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 09:40:55 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms

---
 src/main/webapp/views/item/item.html |  101 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 90 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index df15154..0b10f63 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>
     <!-- 寰呮坊鍔� -->
@@ -40,7 +46,9 @@
 </script>
 
 <script type="text/html" id="operate">
+<!--    <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="report">鐢熸垚鎬荤粨</a>-->
     <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="initPlan">鐢熸垚璁″垝鑺傜偣</a>-->
 <!--    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">绂佺敤</a>-->
 </script>
 
@@ -51,21 +59,89 @@
 <script type="text/javascript" src="../../static/js/item/item.js" charset="utf-8"></script>
 </body>
 <!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="initReport">
+    <form id="reportDetail" lay-filter="reportDetail" class="layui-form admin-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">浜や粯闂: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="deliverIssue" placeholder="璇疯緭鍏ユ槸鍚︽湁浜や粯闂">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">浜や粯鎻忚堪: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="deliverReason" placeholder="璇疯緭鍏ヤ氦浠橀棶棰樺師鍥�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璐ㄩ噺闂: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="qualityIssue" placeholder="璇疯緭鍏ユ槸鍚︽湁璐ㄩ噺闂">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璐ㄩ噺鎻忚堪: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="qualityReson" placeholder="璇疯緭鍏ヨ川閲忛棶棰樺師鍥�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璁捐闂: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="designIssue" placeholder="璇疯緭鍏ユ槸鍚︽湁璁捐闂">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">璁捐鎻忚堪: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="designReason" placeholder="璇疯緭鍏ヨ璁¢棶棰樺師鍥�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">瀹夎闂: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="installIssue" placeholder="璇疯緭鍏ユ槸鍚︽湁瀹夎闂">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">瀹夎鎻忚堪: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="installReason" placeholder="璇疯緭鍏ュ畨瑁呴棶棰樺師鍥�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鎬荤粨: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="conclusion" placeholder="璇疯緭鍏ユ�荤粨">
+                    </div>
+                </div>
+            </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </form>
+</script>
 <script type="text/html" id="editDialog">
     <form id="detail" lay-filter="detail" class="layui-form admin-form">
         <input name="id" type="hidden">
         <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">
@@ -83,13 +159,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">璁″垝寮�濮嬫椂闂�: </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="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�" lay-vertype="tips" lay-verify="required">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <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="realStartTime" id="realStartTime" placeholder="璇疯緭鍏ュ疄闄呭紑濮嬫椂闂�">
                     </div>
                 </div>
 
@@ -111,9 +187,12 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">瀹炴柦鍛ㄦ湡(鏈�): </label>
+                    <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(澶�): </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number">
+                        <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">
                     </div>
                 </div>
             </div>
@@ -168,14 +247,14 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">璁″垝缁撴潫鏃堕棿: </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="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�" lay-vertype="tips" lay-verify="required">
                     </div>
                 </div>
 
                 <div class="layui-form-item">
                     <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="realEndTime" id="realEndTime" placeholder="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
                     </div>
                 </div>
 

--
Gitblit v1.9.1