From bcf1e1d9bb4d269e0d2a6ad0765d218adfe1fb6c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 12:45:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/webapp/views/projectPlan/projectPlan.html |  106 ++++++++++++++++-------------------------------------
 1 files changed, 32 insertions(+), 74 deletions(-)

diff --git a/src/main/webapp/views/projectPlan/projectPlan.html b/src/main/webapp/views/projectPlan/projectPlan.html
index 37849bf..6533d91 100644
--- a/src/main/webapp/views/projectPlan/projectPlan.html
+++ b/src/main/webapp/views/projectPlan/projectPlan.html
@@ -139,7 +139,7 @@
     <form id="detail" lay-filter="detail" class="layui-form admin-form">
         <input name="id" type="hidden">
         <div class="layui-row">
-            <div class="layui-col-md12">
+            <div class="layui-col-md6">
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О: </label>
                     <div class="layui-input-block">
@@ -147,25 +147,7 @@
                     </div>
                 </div>
 
-                <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鑺傜偣鍚嶇О: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" id="flowId$" name="flowId$" readonly="readonly">
-                    </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="flowId" class="layui-input" name="flowId" placeholder="璇疯緭鍏ュ鎴峰悕绉�" style="display: none" lay-vertype="tips" lay-verify="required">-->
-<!--                        <input id="flowId$" 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="flowIdByflowId" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
-<!--                            <select class="cool-auto-complete-window-select" data-key="flowIdByflowIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
-<!--                            </select>-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                </div>-->
 
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">鏉冮噸鍊�: </label>
@@ -174,13 +156,6 @@
                                lay-verify="required">
                     </div>
                 </div>
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="layui-form-label layui-form-required">鑺傜偣ID: </label>-->
-<!--                    <div class="layui-input-block">-->
-<!--                        <input class="layui-input" name="flowId" placeholder="璇疯緭鍏ヨ妭鐐笽D" lay-vertype="tips"-->
-<!--                               lay-verify="required">-->
-<!--                    </div>-->
-<!--                </div>-->
 
 
                 <div class="layui-form-item">
@@ -189,12 +164,7 @@
                         <input class="layui-input" name="startTime" id="startTime" placeholder="璇疯緭鍏ヨ鍒掑紑濮嬫椂闂�">
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">璁″垝缁撴潫鏃堕棿: </label>
-                    <div class="layui-input-block">
-                        <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�">
-                    </div>
-                </div>
+
                 <div class="layui-form-item">
                     <label class="layui-form-label">瀹為檯寮�濮嬫椂闂�: </label>
                     <div class="layui-input-block">
@@ -202,22 +172,28 @@
                     </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="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
-                    </div>
-                </div>
+
                 <div class="layui-form-item">
                     <label class="layui-form-label">寤舵湡澶╂暟: </label>
                     <div class="layui-input-block">
                         <input class="layui-input" name="delay" placeholder="璇疯緭鍏ュ欢鏈熷ぉ鏁�" type="number" oninput="if(value>100)value=0;if(value<0)value=0">
                     </div>
                 </div>
+
+
                 <div class="layui-form-item">
-                    <label class="layui-form-label">寤舵湡鍘熷洜: </label>
+                    <label class="layui-form-label">璐d换閮ㄩ棬: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="delayReason" placeholder="璇疯緭鍏ュ欢鏈熷師鍥�">
+                        <input class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+                    </div>
+                </div>
+
+            </div>
+            <div class="layui-col-md6">
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">鑺傜偣鍚嶇О: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" id="flowId$" name="flowId$" readonly="readonly">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -227,9 +203,21 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">璐d换閮ㄩ棬: </label>
+                    <label class="layui-form-label">璁″垝缁撴潫鏃堕棿: </label>
                     <div class="layui-input-block">
-                        <input class="layui-input" name="dutyDepartment" placeholder="璇疯緭鍏ヨ矗浠婚儴闂�">
+                        <input class="layui-input" name="endTime" id="endTime" placeholder="璇疯緭鍏ヨ鍒掔粨鏉熸椂闂�">
+                    </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="璇疯緭鍏ュ疄闄呯粨鏉熸椂闂�">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">寤舵湡鍘熷洜: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="delayReason" placeholder="璇疯緭鍏ュ欢鏈熷師鍥�">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -238,44 +226,14 @@
                         <input class="layui-input" name="dutyMan" placeholder="璇疯緭鍏ヨ矗浠讳汉">
                     </div>
                 </div>
-                <!--                <div class="layui-form-item">-->
-                <!--                    <label class="layui-form-label">鍒涘缓鏃堕棿: </label>-->
-                <!--                    <div class="layui-input-block">-->
-                <!--                        <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ュ垱寤烘椂闂�">-->
-                <!--                    </div>-->
-                <!--                </div>-->
-                <!--                <div class="layui-form-item">-->
-                <!--                    <label class="layui-form-label">鍒涘缓浜篿d: </label>-->
-                <!--                    <div class="layui-input-block">-->
-                <!--                        <input class="layui-input" name="createId" placeholder="璇疯緭鍏ュ垱寤轰汉id">-->
-                <!--                    </div>-->
-                <!--                </div>-->
-                <!--                <div class="layui-form-item">-->
-                <!--                    <label class="layui-form-label">淇敼鏃堕棿: </label>-->
-                <!--                    <div class="layui-input-block">-->
-                <!--                        <input class="layui-input" name="modifyTime" id="modifyTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">-->
-                <!--                    </div>-->
-                <!--                </div>-->
-                <!--                <div class="layui-form-item">-->
-                <!--                    <label class="layui-form-label">淇敼浜篿d: </label>-->
-                <!--                    <div class="layui-input-block">-->
-                <!--                        <input class="layui-input" name="modifyId" placeholder="璇疯緭鍏ヤ慨鏀逛汉id">-->
-                <!--                    </div>-->
-                <!--                </div>-->
-                <!--                <div class="layui-form-item">-->
-                <!--                    <label class="layui-form-label">鑺傜偣鍚嶇О: </label>-->
-                <!--                    <div class="layui-input-block">-->
-                <!--                        <input class="layui-input" name="flowName" 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>
+
+
         </div>
     </form>
 </script>

--
Gitblit v1.9.1