Home Explore Help
Register Sign In
chengqiang
/
sg_finalAcountAuto
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

工程管理1

xs 5 years ago
parent
12fd670b79
commit
ae9f2615c7
5 changed files with 229 additions and 79 deletions
Unified View Show Diff Stats
  1. 3 0
      .idea/misc.xml
  2. 109 0
      src/main/webapp/webpage/modules/sg/project/addItemForm.jsp
  3. 26 1
      src/main/webapp/webpage/modules/sg/project/management.jsp
  4. 44 44
      src/main/webapp/webpage/modules/test/one/dialog/leave1List.js
  5. 47 34
      src/main/webapp/webpage/modules/test/one/dialog/leave1List.jsp

+ 3 - 0
.idea/misc.xml
View File 

@@ -3,6 +3,9 @@
 
   <component name="FrameworkDetectionExcludesConfiguration">
 
   <component name="FrameworkDetectionExcludesConfiguration">
 
     <file type="web" url="file://$PROJECT_DIR$" />
 
     <file type="web" url="file://$PROJECT_DIR$" />
 
   </component>
 
   </component>
 
+  <component name="JavaScriptSettings">
 
+    <option name="languageLevel" value="JSX" />
 
+  </component>
 
   <component name="MavenProjectsManager">
 
   <component name="MavenProjectsManager">
 
     <option name="originalFiles">
 
     <option name="originalFiles">
 
       <list>
 
       <list>

+ 109 - 0
src/main/webapp/webpage/modules/sg/project/addItemForm.jsp
View File 

@@ -0,0 +1,109 @@
 
+<%--
 
+  Created by IntelliJ IDEA.
 
+  User: user
 
+  Date: 2019/8/19
 
+  Time: 13:06
 
+  To change this template use File | Settings | File Templates.
 
+--%>
 
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
 
+<%@ include file="/webpage/include/taglib.jsp"%>
 
+<link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
 
+<link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
 
+<script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
 
+<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
+<html>
 
+<head>
 
+    <title>添加工程</title>
 
+    <style>
 
+        .layui-input{
 
+            height: 28px;
 
+            margin-top: 6px;
 
+        }
 
+    </style>
 
+</head>
 
+<body style="text-align: center;">
 
+<form class="layui-form" action="#" method="post">
 
+    <input id="newText1" name="id" value=""/>
 
+    <div class="layui-form-item">
 
+        <div class="layui-inline" style="margin-left:30px;margin-top: 10px;">
 
+            <input type="button" class="layui-btn-primary layui-btn-sm layui-btn-radius" onclick="uploadwj()" value="选择结算文件" id="btnxz"/>
 
+            <span id="myspan">*结算书文件为博微导出xls/xlsx格式文件</span>
 
+            <input type="file" style="display: none;" accept=".xls,.xlsx" lay-verify="context" id="myfile"/>
 
+
 
+        </div>
 
+    </div>
 
+    <!---------列表---------->
 
+    <div class="layui-form-item">
 
+        <div class="layui-inline">
 
+            <label class="layui-form-label">*项目划分</label>
 
+            <div class="layui-input-inline">
 
+                <select name="xmhf" lay-verify="required" lay-search="">
 
+                    <option value="">请选择</option>
 
+                    <option value="1">架空线路工程</option>
 
+                    <option value="2">-空-</option>
 
+                </select>
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="layui-form-item">
 
+        <div class="layui-inline">
 
+            <label class="layui-form-label">*调整文件</label>
 
+            <div class="layui-input-inline">
 
+                <select name="tzwj" lay-verify="required" lay-search="">
 
+                    <option value="">请选择</option>
 
+                    <option value="1">2016年调差价系数文件（50号文件）</option>
 
+                    <option value="2">-空-</option>
 
+                </select>
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="layui-form-item">
 
+        <div class="layui-inline">
 
+            <label class="layui-form-label">项目名称</label>
 
+            <div class="layui-input-inline">
 
+                <input type="text"  class="layui-input" id="inputwrite">
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="layui-form-item">
 
+        <div class="layui-inline">
 
+            <label class="layui-form-label">项目编号</label>
 
+            <div class="layui-input-inline">
 
+                <input type="text" name="" class="layui-input">
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <div class="layui-form-item">
 
+        <div class="layui-input-block">
 
+            <button class="layui-btn" lay-submit="" lay-filter="mysubmit" type="submit" id="newProject" style="display: none;">创建</button>
 
+            <!--<button type="reset" class="layui-btn layui-btn-primary">取消</button>-->
 
+        </div>
 
+    </div>
 
+</form>
 
+</body>
 
+<script>
 
+    layui.use(['form', 'layedit', 'laydate'], function(){
 
+        var form = layui.form;
 
+        form.render();
 
+        //自定义验证规则
 
+        form.verify({
 
+            context: function(value){
 
+                if(value.length <=0){
 
+                    return '请选择导入的文件';
 
+                }
 
+            }
 
+        });
 
+        var newText1 = parent.$('#addtext').val();
 
+        $("#newText1").val(newText1);
 
+    })
 
+</script>
 
+<script>
 
+    $("#btnxz").click(function(){
 
+        $("#myfile").trigger("click");
 
+    })
 
+    $("#myfile").bind("change",function(){
 
+        var w= $("#myfile").val();
 
+        $("#myspan").html(w);
 
+    });
 
+</script>
 
+</html>

+ 26 - 1
src/main/webapp/webpage/modules/sg/project/management.jsp
View File 

@@ -46,6 +46,7 @@
 
     }
 
     }
 
 </style>
 
 </style>
 
 <body>
 
 <body>
 
+<input style="display: none;" id="addtext" />
 
 <div style="padding: 20px; background-color: #F2F2F2;">
 
 <div style="padding: 20px; background-color: #F2F2F2;">
 
     <div class="layui-row layui-col-space15">
 
     <div class="layui-row layui-col-space15">
 
         <div class="layui-col-md12">
 
         <div class="layui-col-md12">
 
@@ -194,7 +195,7 @@
 
                             if(d.status==1){
 
                             if(d.status==1){
 
                                 xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' lay-event='look'>查看</a>"
 
                                 xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' lay-event='look'>查看</a>"
 
                                     +"<a class='layui-btn layui-btn-xs' lay-event='update'>修改</a>"
 
                                     +"<a class='layui-btn layui-btn-xs' lay-event='update'>修改</a>"
 
-                                    +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>"
 
+                                    +"<a class='layui-btn layui-btn-normal layui-btn-xs' onclick='add(2)'>添加项目</a>"
 
                                     +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''>导出</a>";
 
                                     +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''>导出</a>";
 
                             }
 
                             }
 
                             if(d.status==2){
 
                             if(d.status==2){
 
@@ -360,5 +361,29 @@
 
         });
 
         });
 
     }
 
     }
 
 </script>
 
 </script>
 
+<script>
 
+    function add(result){
 
+        $("#addtext").val(result)
 
+        layui.use(['table','layer'],function(){
 
+            layer.open({
 
+                type: 2,
 
+                title: '添加工程',
 
+                area: ['60%', '80%'],
 
+                shade: 0.8,
 
+                shadeClose: true,
 
+                content: 'new_index.html'
 
+                , btn: ['确定','关闭']
 
+                ,yes: function(index, layero){
 
+                    var bodyparent = layer.getChildFrame('body', index);
 
+                    bodyparent.find('#newProject').click();
 
+
 
+                }
 
+                ,btn2: function(index, layero){
 
+                    layer.close(index);
 
+                }
 
+            })
 
+        })
 
+    }
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 44 - 44
src/main/webapp/webpage/modules/test/one/dialog/leave1List.js
View File 

@@ -2,7 +2,7 @@
 
 <script>
 
 <script>
 
 $(document).ready(function() {
 
 $(document).ready(function() {
 
 	$('#leave1Table').bootstrapTable({
 
 	$('#leave1Table').bootstrapTable({
 
-		 
+
 
 		  //请求方法
 
 		  //请求方法
 
                method: 'post',
 
                method: 'post',
 
                //类型json
 
                //类型json
 
@@ -24,23 +24,23 @@ $(document).ready(function() {
 
     	       minimumCountColumns: 2,
 
     	       minimumCountColumns: 2,
 
                //是否显示行间隔色
 
                //是否显示行间隔色
 
                striped: true,
 
                striped: true,
 
-               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
-               cache: false,    
-               //是否显示分页（*）  
-               pagination: true,   
-                //排序方式 
-               sortOrder: "asc",  
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
 
+               cache: false,
 
+               //是否显示分页（*）
 
+               pagination: true,
 
+                //排序方式
 
+               sortOrder: "asc",
 
                //初始化加载第一页，默认第一页
 
                //初始化加载第一页，默认第一页
 
-               pageNumber:1,   
-               //每页的记录行数（*）   
-               pageSize: 10,  
-               //可供选择的每页的行数（*）    
+               pageNumber:1,
 
+               //每页的记录行数（*）
 
+               pageSize: 10,
 
+               //可供选择的每页的行数（*）
 
                pageList: [10, 25, 50, 100],
 
                pageList: [10, 25, 50, 100],
 
-               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
 
                url: "${ctx}/test/one/dialog/leave1/data",
 
                url: "${ctx}/test/one/dialog/leave1/data",
 
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
 
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
 
-               //queryParamsType:'',   
-               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               //queryParamsType:'',
 
+               ////查询参数,每次调用是会带上这个参数，可自定义
 
                queryParams : function(params) {
 
                queryParams : function(params) {
 
                	var searchParam = $("#searchForm").serializeJSON();
 
                	var searchParam = $("#searchForm").serializeJSON();
 
                	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
 
                	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
 
@@ -69,12 +69,12 @@ $(document).ready(function() {
 
                    	  			jp.error(data.msg);
 
                    	  			jp.error(data.msg);
 
                    	  		}
 
                    	  		}
 
                    	  	})
 
                    	  	})
 
-                   	   
+
 
                    	});
 
                    	});
 
-                      
-                   } 
+
 
+                   }
 
                },
 
                },
 
-              
+
 
                onClickRow: function(row, $el){
 
                onClickRow: function(row, $el){
 
                },
 
                },
 
                	onShowSearch: function () {
 
                	onShowSearch: function () {
 
@@ -82,7 +82,7 @@ $(document).ready(function() {
 
 		},
 
 		},
 
                columns: [{
 
                columns: [{
 
 		        checkbox: true
 
 		        checkbox: true
 
-		       
+
 
 		    }
 
 		    }
 
 			,{
 
 			,{
 
 		        field: 'office.name',
 
 		        field: 'office.name',
 
@@ -107,60 +107,60 @@ $(document).ready(function() {
 
 			   </c:choose>
 
 			   </c:choose>
 
 
 
 		        }
 
 		        }
 
-		       
+
 
 		    }
 
 		    }
 
 			,{
 
 			,{
 
 		        field: 'tuser.name',
 
 		        field: 'tuser.name',
 
 		        title: '员工',
 
 		        title: '员工',
 
 		        sortable: true,
 
 		        sortable: true,
 
 		        sortName: 'tuser.name'
 
 		        sortName: 'tuser.name'
 
-		       
+
 
 		    }
 
 		    }
 
 			,{
 
 			,{
 
 		        field: 'area',
 
 		        field: 'area',
 
 		        title: '归属区域',
 
 		        title: '归属区域',
 
 		        sortable: true,
 
 		        sortable: true,
 
 		        sortName: 'area'
 
 		        sortName: 'area'
 
-		       
+
 
 		    }
 
 		    }
 
 			,{
 
 			,{
 
 		        field: 'beginDate',
 
 		        field: 'beginDate',
 
 		        title: '请假开始日期',
 
 		        title: '请假开始日期',
 
 		        sortable: true,
 
 		        sortable: true,
 
 		        sortName: 'beginDate'
 
 		        sortName: 'beginDate'
 
-		       
+
 
 		    }
 
 		    }
 
 			,{
 
 			,{
 
 		        field: 'endDate',
 
 		        field: 'endDate',
 
-		        title: '请假结束日期',
 
+		        title: '请假结束日期1',
 
 		        sortable: true,
 
 		        sortable: true,
 
 		        sortName: 'endDate'
 
 		        sortName: 'endDate'
 
-		       
+
 
 		    }
 
 		    }
 
 			,{
 
 			,{
 
 		        field: 'remarks',
 
 		        field: 'remarks',
 
-		        title: '备注信息',
 
+		        title: '备注信息11',
 
 		        sortable: true,
 
 		        sortable: true,
 
 		        sortName: 'remarks'
 
 		        sortName: 'remarks'
 
-		       
+
 
 		    }
 
 		    }
 
 		     ]
 
 		     ]
 
-		
+
 
 		});
 
 		});
 
-		
-		  
+
 
+
 
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 
 
 
-		 
+
 
 		  $('#leave1Table').bootstrapTable("toggleView");
 
 		  $('#leave1Table').bootstrapTable("toggleView");
 
 		}
 
 		}
 
-	  
+
 
 	  $('#leave1Table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
 
 	  $('#leave1Table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
 
                 'check-all.bs.table uncheck-all.bs.table', function () {
 
                 'check-all.bs.table uncheck-all.bs.table', function () {
 
             $('#remove').prop('disabled', ! $('#leave1Table').bootstrapTable('getSelections').length);
 
             $('#remove').prop('disabled', ! $('#leave1Table').bootstrapTable('getSelections').length);
 
             $('#view,#edit').prop('disabled', $('#leave1Table').bootstrapTable('getSelections').length!=1);
 
             $('#view,#edit').prop('disabled', $('#leave1Table').bootstrapTable('getSelections').length!=1);
 
         });
 
         });
 
-		  
+
 
 		$("#btnImport").click(function(){
 
 		$("#btnImport").click(function(){
 
 			jp.open({
 
 			jp.open({
 
 			    type: 2,
 
 			    type: 2,
 
@@ -189,26 +189,26 @@ $(document).ready(function() {
 
 				  btn3: function(index){
 
 				  btn3: function(index){
 
 					//  jp.close(index);
 
 					//  jp.close(index);
 
 	    	       }
 
 	    	       }
 
-			}); 
+			});
 
 		});
 
 		});
 
-		
-		
+
 
+
 
 	 $("#export").click(function(){//导出Excel文件
 
 	 $("#export").click(function(){//导出Excel文件
 
 			jp.downloadFile('${ctx}/test/one/dialog/leave1/export');
 
 			jp.downloadFile('${ctx}/test/one/dialog/leave1/export');
 
 	  });
 
 	  });
 
 
 
-		    
+
 
 	  $("#search").click("click", function() {// 绑定查询按扭
 
 	  $("#search").click("click", function() {// 绑定查询按扭
 
 		  $('#leave1Table').bootstrapTable('refresh');
 
 		  $('#leave1Table').bootstrapTable('refresh');
 
 		});
 
 		});
 
-	 
+
 
 	 $("#reset").click("click", function() {// 绑定查询按扭
 
 	 $("#reset").click("click", function() {// 绑定查询按扭
 
 		  $("#searchForm  input").val("");
 
 		  $("#searchForm  input").val("");
 
 		  $("#searchForm  select").val("");
 
 		  $("#searchForm  select").val("");
 
 		  $("#searchForm  .select-item").html("");
 
 		  $("#searchForm  .select-item").html("");
 
 		  $('#leave1Table').bootstrapTable('refresh');
 
 		  $('#leave1Table').bootstrapTable('refresh');
 
 		});
 
 		});
 
-		
+
 
 		$('#beginBeginDate').datetimepicker({
 
 		$('#beginBeginDate').datetimepicker({
 
 			 format: "YYYY-MM-DD HH:mm:ss"
 
 			 format: "YYYY-MM-DD HH:mm:ss"
 
 		});
 
 		});
 
@@ -218,19 +218,19 @@ $(document).ready(function() {
 
 		$('#endDate').datetimepicker({
 
 		$('#endDate').datetimepicker({
 
 			 format: "YYYY-MM-DD HH:mm:ss"
 
 			 format: "YYYY-MM-DD HH:mm:ss"
 
 		});
 
 		});
 
-		
+
 
 	});
 
 	});
 
-		
+
 
   function getIdSelections() {
 
   function getIdSelections() {
 
         return $.map($("#leave1Table").bootstrapTable('getSelections'), function (row) {
 
         return $.map($("#leave1Table").bootstrapTable('getSelections'), function (row) {
 
             return row.id
 
             return row.id
 
         });
 
         });
 
     }
 
     }
 
-  
+
 
   function deleteAll(){
 
   function deleteAll(){
 
 
 
 		jp.confirm('确认要删除该请假表单记录吗？', function(){
 
 		jp.confirm('确认要删除该请假表单记录吗？', function(){
 
-			jp.loading();  	
+			jp.loading();
 
 			jp.get("${ctx}/test/one/dialog/leave1/deleteAll?ids=" + getIdSelections(), function(data){
 
 			jp.get("${ctx}/test/one/dialog/leave1/deleteAll?ids=" + getIdSelections(), function(data){
 
          	  		if(data.success){
 
          	  		if(data.success){
 
          	  			$('#leave1Table').bootstrapTable('refresh');
 
          	  			$('#leave1Table').bootstrapTable('refresh');
 
@@ -239,7 +239,7 @@ $(document).ready(function() {
 
          	  			jp.error(data.msg);
 
          	  			jp.error(data.msg);
 
          	  		}
 
          	  		}
 
          	  	})
 
          	  	})
 
-          	   
+
 
 		})
 
 		})
 
   }
 
   }

+ 47 - 34
src/main/webapp/webpage/modules/test/one/dialog/leave1List.jsp
View File 

@@ -13,7 +13,7 @@
 
 	<div class="wrapper wrapper-content">
 
 	<div class="wrapper wrapper-content">
 
 	<div class="panel panel-primary">
 
 	<div class="panel panel-primary">
 
 	<div class="panel-heading">
 
 	<div class="panel-heading">
 
-		<h3 class="panel-title">请假表单列表</h3>
 
+		<h3 class="panel-title">工程管理</h3>
 
 	</div>
 
 	</div>
 
 	<div class="panel-body">
 
 	<div class="panel-body">
 
 	
 	
@@ -21,25 +21,17 @@
 
 	<div id="search-collapse" class="collapse">
 
 	<div id="search-collapse" class="collapse">
 
 		<div class="accordion-inner">
 
 		<div class="accordion-inner">
 
 			<form:form id="searchForm" modelAttribute="leave1" class="form form-horizontal well clearfix">
 
 			<form:form id="searchForm" modelAttribute="leave1" class="form form-horizontal well clearfix">
 
-			 <div class="col-xs-12 col-sm-6 col-md-4">
 
-				<label class="label-item single-overflow pull-left" title="归属部门：">归属部门：</label>
 
-				<sys:treeselect id="office" name="office.id" value="${leave1.office.id}" labelName="office.name" labelValue="${leave1.office.name}"
 
-					title="部门" url="/sys/office/treeData?type=2" cssClass="form-control" allowClear="true" notAllowSelectParent="true"/>
 
-			</div>
 
-			 <div class="col-xs-12 col-sm-6 col-md-4">
 
-				<label class="label-item single-overflow pull-left" title="员工：">员工：</label>
 
-				<sys:userselect id="tuser" name="tuser.id" value="${leave1.tuser.id}" labelName="tuser.name" labelValue="${leave1.tuser.name}"
 
-							    cssClass="form-control required"/>
 
-			</div>
 
-			 <div class="col-xs-12 col-sm-6 col-md-4">
 
-				<label class="label-item single-overflow pull-left" title="归属区域：">归属区域：</label>
 
-				<div class=" input-group" style=" width: 100%;">
 
-				  	<form:input path="area" htmlEscape="false" data-toggle="city-picker" style="height: 34px;font-size: 14px;"/>
 
-				 </div>
 
-			</div>
 
+				<div class="col-xs-12 col-sm-6 col-md-4">
 
+					<label class="label-item single-overflow pull-left" title="工程名称：">工程名称：</label>
 
+					<form:input path="remarks" htmlEscape="false" maxlength="257"  class=" form-control"/>
 
+				</div>
 
+				<div class="col-xs-12 col-sm-6 col-md-4">
 
+					<label class="label-item single-overflow pull-left" title="登记人：">登记人：</label>
 
+					<form:input path="remarks" htmlEscape="false" maxlength="257"  class=" form-control"/>
 
+				</div>
 
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 
 			 <div class="col-xs-12 col-sm-6 col-md-4">
 
 				 <div class="form-group">
 
 				 <div class="form-group">
 
-					<label class="label-item single-overflow pull-left" title="请假开始日期：">&nbsp;请假开始日期：</label>
 
+					<label class="label-item single-overflow pull-left" title="请假开始日期：">&nbsp;工程登记时间：</label>
 
 					<div class="col-xs-12">
 
 					<div class="col-xs-12">
 
 						   <div class="col-xs-12 col-sm-5">
 
 						   <div class="col-xs-12 col-sm-5">
 
 					        	  <div class='input-group date' id='beginBeginDate' style="left: -10px;" >
 
 					        	  <div class='input-group date' id='beginBeginDate' style="left: -10px;" >
 
@@ -63,23 +55,44 @@
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
-			 <div class="col-xs-12 col-sm-6 col-md-4">
 
-				<div class="form-group">
 
-					<label class="label-item single-overflow pull-left" title="请假结束日期：">&nbsp;请假结束日期：</label>
 
-					<div class="col-xs-12">
 
-						<div class='input-group date' id='endDate' >
 
-			                   <input type='text'  name="endDate" class="form-control"  />
 
-			                   <span class="input-group-addon">
 
-			                       <span class="glyphicon glyphicon-calendar"></span>
 
-			                   </span>
 
-			            </div>	
+				<div class="col-xs-12 col-sm-6 col-md-4">
 
+					<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
 
+					<form:input path="remarks" htmlEscape="false" maxlength="257"  class=" form-control"/>
 
+				</div>
 
+				<div class="col-xs-12 col-sm-6 col-md-4">
 
+					<label class="label-item single-overflow pull-left" title="项目划分：">项目划分：</label>
 
+					<form:input path="remarks" htmlEscape="false" maxlength="257"  class=" form-control"/>
 
+				</div>
 
+				<div class="col-xs-12 col-sm-6 col-md-4">
 
+					<label class="label-item single-overflow pull-left" title="施工单位：">施工单位：</label>
 
+					<form:input path="remarks" htmlEscape="false" maxlength="257"  class=" form-control"/>
 
+				</div>
 
+				<div class="col-xs-12 col-sm-6 col-md-4">
 
+					<div class="form-group">
 
+						<label class="label-item single-overflow pull-left" title="请假开始日期：">&nbsp;项目登记时间：</label>
 
+						<div class="col-xs-12">
 
+							<div class="col-xs-12 col-sm-5">
 
+								<div class='input-group date' id='beginBeginDate1' style="left: -10px;" >
 
+									<input type='text'  name="beginBeginDate" class="form-control"  />
 
+									<span class="input-group-addon">
 
+					                       <span class="glyphicon glyphicon-calendar"></span>
 
+					                   </span>
 
+								</div>
 
+							</div>
 
+							<div class="col-xs-12 col-sm-1">
 
+								~
 
+							</div>
 
+							<div class="col-xs-12 col-sm-5">
 
+								<div class='input-group date' id='endBeginDate1' style="left: -10px;" >
 
+									<input type='text'  name="endBeginDate" class="form-control" />
 
+									<span class="input-group-addon">
 
+					                       <span class="glyphicon glyphicon-calendar"></span>
 
+					                   </span>
 
+								</div>
 
+							</div>
 
+						</div>
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>
 
-			</div>
 
-			 <div class="col-xs-12 col-sm-6 col-md-4">
 
-				<label class="label-item single-overflow pull-left" title="备注信息：">备注信息：</label>
 
-				<form:input path="remarks" htmlEscape="false" maxlength="257"  class=" form-control"/>
 
-			</div>
 
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 
 			<div style="margin-top:26px">
 
 			<div style="margin-top:26px">
 
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
 
@@ -99,7 +112,7 @@
 
 			</shiro:hasPermission>
 
 			</shiro:hasPermission>
 
 			<shiro:hasPermission name="test:one:dialog:leave1:edit">
 
 			<shiro:hasPermission name="test:one:dialog:leave1:edit">
 
 			    <button id="edit" class="btn btn-success" disabled onclick="edit()">
 
 			    <button id="edit" class="btn btn-success" disabled onclick="edit()">
 
-	            	<i class="glyphicon glyphicon-edit"></i> 修改
 
+	            	<i class="glyphicon glyphicon-edit"></i> 修改11
 
 	        	</button>
 
 	        	</button>
 
 			</shiro:hasPermission>
 
 			</shiro:hasPermission>
 
 			<shiro:hasPermission name="test:one:dialog:leave1:del">
 
 			<shiro:hasPermission name="test:one:dialog:leave1:del">