Преглед изворни кода

项目计划安排流程测试

Enford пре 5 година
родитељ
комит
e860cbfc58

+ 46 - 35
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/constructionManageAct.jsp

@@ -12,45 +12,56 @@
 </head>
 <body style="background-color:white">
 <div class="wrapper wrapper-content">
-    <input type="text" value="${projectId}" id="projectId" hidden="hidden"/>
-    <input type="text" value="" id="ids" hidden="hidden">
-    <div class="row">
-        <%--未安排计划的树形--%>
-        <div class="col-sm-3 col-md-3">
-            <div>
-                <label>
-                    <input type="input" class="form-control" id="input-search" style="width: 150px;float: left">
-                    <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
-                </label>
-            </div>
-            <div id="jstree" style="height:400px;overflow:auto;"></div>
-        </div>
-        <div  class="col-sm-9 col-md-9 animated fadeInRight">
-            <!-- 工具栏 -->
-            <div id="toolbar">
-                <button id="selectId" class="btn btn-warning">
-                    安排选择计划
-                </button>
-                <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
-                    <i class="glyphicon glyphicon-remove"></i> 删除
-                </button>
-            </div><!-- 工具栏结束 -->
-            <table id="table" data-toolbar="#toolbar">
-            </table>
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">项目计划审核操作</h3>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-3"></div>
-        <div class="col-sm-6">
-            <div class="form-group text-center">
-                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="button" value="确认安排此计划" onclick="surePlan()" />&nbsp;
+        <div class="panel-body">
+            <div class="wrapper wrapper-content">
+            <input type="text" value="${projectId}" id="projectId" hidden="hidden"/>
+            <input type="text" value="" id="ids" hidden="hidden">
+            <div class="row">
+                <%--未安排计划的树形--%>
+                <div class="col-sm-3 col-md-3">
+                    <div style="margin-top: 11px">
+                        <label>
+                            <input type="input" class="form-control" id="input-search" style="width: 200px;float: left">
+                            <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
+                        </label>
+                    </div>
+                    <div id="jstree" style="height:370px;overflow:auto;"></div>
+                </div>
+                <div  class="col-sm-9 col-md-9 animated fadeInRight">
+                    <!-- 工具栏 -->
+                    <div id="toolbar">
+                        <button id="selectId" class="btn btn-primary">
+                            <i class="glyphicon glyphicon-plus"></i>安排选择计划
+                        </button>
+                        <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
+                            <i class="glyphicon glyphicon-remove"></i> 删除
+                        </button>
+                    </div><!-- 工具栏结束 -->
+                    <div style="height:370px;overflow:auto">
+                        <table id="table" data-toolbar="#toolbar">
+                        </table>
+                    </div>
+                </div>
             </div>
+            <div class="row">
+                <div class="col-sm-3"></div>
+                <div class="col-sm-6">
+                    <div class="form-group text-center">
+                        <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="button" value="确认安排此计划" onclick="surePlan()" />&nbsp;
+                    </div>
+                </div>
+            </div>
+            <c:if test="${not empty act.id}">
+                <act:flowChart procInsId="${act.procInsId}"/>
+                <act:histoicFlow procInsId="${act.procInsId}" />
+            </c:if>
+        </div>
         </div>
     </div>
-    <c:if test="${not empty act.id}">
-        <act:flowChart procInsId="${act.procInsId}"/>
-        <act:histoicFlow procInsId="${act.procInsId}" />
-    </c:if>
 </div>
 </body>
 </html>

+ 1 - 1
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/disList2ManageAct.jsp

@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">项目计划安排</h3>
+		<h3 class="panel-title">项目计划审核操作</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->

+ 40 - 29
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/netWorkManageAct.jsp

@@ -12,38 +12,49 @@
 </head>
 <body style="background-color:white">
 <div class="wrapper wrapper-content">
-    <input type="text" value="${projectId}" id="projectId" hidden="hidden"/>
-    <div class="row">
-        <%--未安排计划的树形--%>
-        <%--<div class="col-sm-3 col-md-3">--%>
-            <%--<div id="jstree" style="height:400px;overflow:auto;"></div>--%>
-        <%--</div>--%>
-        <%--<div  class="col-sm-9 col-md-9 animated fadeInRight">--%>
-            <!-- 工具栏 -->
-            <div id="toolbar">
-                <%--<button id="selectId" class="btn btn-warning">--%>
-                    <%--安排选择计划--%>
-                <%--</button>--%>
-                <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
-                    <i class="glyphicon glyphicon-remove"></i> 删除
-                </button>
-            </div><!-- 工具栏结束 -->
-            <table id="table" data-toolbar="#toolbar">
-            </table>
-        <%--</div>--%>
-    </div>
-    <div class="row" style="margin-top: 20px">
-        <div class="col-sm-3"></div>
-        <div class="col-sm-6">
-            <div class="form-group text-center">
-                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="button" value="确认提交" onclick="newWorkSubmit()" />&nbsp;
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <h3 class="panel-title">项目计划审核操作</h3>
+        </div>
+        <div class="panel-body">
+            <div class="wrapper wrapper-content">
+                <input type="text" value="${projectId}" id="projectId" hidden="hidden"/>
+                <div class="row">
+                    <%--未安排计划的树形--%>
+                    <%--<div class="col-sm-3 col-md-3">--%>
+                        <%--<div id="jstree" style="height:400px;overflow:auto;"></div>--%>
+                    <%--</div>--%>
+                    <%--<div  class="col-sm-9 col-md-9 animated fadeInRight">--%>
+                        <!-- 工具栏 -->
+                        <div id="toolbar">
+                            <%--<button id="selectId" class="btn btn-warning">--%>
+                                <%--安排选择计划--%>
+                            <%--</button>--%>
+                            <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
+                                <i class="glyphicon glyphicon-remove"></i> 删除
+                            </button>
+                        </div><!-- 工具栏结束 -->
+                        <div style="height:400px;overflow:auto">
+                            <table id="table" data-toolbar="#toolbar">
+                            </table>
+                        </div>
+                    <%--</div>--%>
+                </div>
+                <div class="row" style="margin-top: 20px">
+                    <div class="col-sm-3"></div>
+                    <div class="col-sm-6">
+                        <div class="form-group text-center">
+                            <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="button" value="确认提交" onclick="newWorkSubmit()" />&nbsp;
+                        </div>
+                    </div>
+                </div>
+                <c:if test="${not empty act.id}">
+                    <act:flowChart procInsId="${act.procInsId}"/>
+                    <act:histoicFlow procInsId="${act.procInsId}" />
+                </c:if>
             </div>
         </div>
     </div>
-    <c:if test="${not empty act.id}">
-        <act:flowChart procInsId="${act.procInsId}"/>
-        <act:histoicFlow procInsId="${act.procInsId}" />
-    </c:if>
 </div>
 </body>
 </html>

+ 1 - 1
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/runListManageAct.jsp

@@ -13,7 +13,7 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">项目计划安排</h3>
+		<h3 class="panel-title">项目计划审核操作</h3>
 	</div>
 	<div class="panel-body">
 		<!-- 搜索 -->

+ 9 - 7
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageForm.jsp

@@ -25,26 +25,28 @@
         <%--未安排计划的树形--%>
         <div class="col-sm-3 col-md-2">
             <%--<input type="text" id="input-search" class="">--%>
-            <div>
+            <div style="margin-top: 11px">
                 <label>
-                <input type="input" class="form-control" id="input-search" style="width: 150px;float: left">
+                <input type="input" class="form-control" id="input-search" style="width: 70%;float: left">
                 <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
                 </label>
             </div>
-            <div id="jstree" style="height:400px;overflow:auto;margin-top: 10px;margin-top: 2px"></div>
+            <div id="jstree" style="height:370px;overflow:auto;margin-top: 10px;margin-top: 1px"></div>
         </div>
         <div  class="col-sm-9 col-md-10 animated fadeInRight">
             <!-- 工具栏 -->
             <div id="toolbar">
-                <button id="selectId" class="btn btn-warning">
-                     安排选择计划
+                <button id="selectId" class="btn btn-primary">
+                    <i class="glyphicon glyphicon-plus"></i>安排选择计划
                 </button>
                 <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
                     <i class="glyphicon glyphicon-remove"></i> 退回
                 </button>
             </div><!-- 工具栏结束 -->
-            <table id="table" data-toolbar="#toolbar">
-            </table>
+            <div style="height:370px;overflow:auto">
+                <table id="table" data-toolbar="#toolbar">
+                </table>
+            </div>
         </div>
     </div>
 </div>