git-svn-id: https://192.168.57.71/svn/jsgkj@746 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/scripts.jsp

@@ -12,7 +12,7 @@
 
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/layer/layer.js"></script>
 <script src="<%=request.getContextPath()%>/static/bootstrap-3.3.0/dist/js/bootstrap.min.js"></script>
-<script src="<%=request.getContextPath()%>/static/bootstrap-3.3.0/dist/js/modal.js"></script>
+<script src="<%=request.getContextPath()%>/static/bootstrap-3.3.0/js/modal.js"></script>
 
 <script src="<%=request.getContextPath()%>/static/js/common/jqgrid/jquery.jqGrid.src.js"></script>
 <script src="<%=request.getContextPath()%>/static/js/common/jqgrid/i18n/grid.locale-cn.js"></script>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/index.jsp

@@ -107,14 +107,14 @@
 							</div>
 						</div>
 						<div class="row">
-						   <div class="center-block" style="width:120px;">
+						   <div class="center-block" style="width:160px;">
 						      	<button id="btnSave" class="btn btn-success btn-round btn-sm"
 									onclick="save()">
-									<i class="fa fa-save"></i> ±£´æ
+									<i class="glyphicon glyphicon-ok"></i> ±£´æ
 								</button>
 								<button type="button" class="btn btn-grey btn-round btn-sm"
 									onclick="closeWin()">
-									<i class="fa fa-remove"></i> ¹Ø±Õ
+									<i class="glyphicon glyphicon-remove"></i> ¹Ø±Õ
 								</button>
 						   </div>
 						</div>

gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/main.css

@@ -51,6 +51,7 @@
 }
 
 .p_searchdiv {
+	display:none;
 	min-width:1280px;
 	width:1280px;
 	padding:0px 0px 0px 0px;

gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/common.js

@@ -265,4 +265,22 @@ function comClearFormData(formId) {
         else if (tag == 'select')
             this.selectedIndex = -1;
     });
+}
+
+/**
+ * 显示模态框
+ * @param modelId 模态框ID
+ * @param title 标题
+ */
+function showModelDialog(modelId, title) {
+	$('#'+modelId).find("h6[id$='myModalLabel']").html(title);
+	$('#'+modelId).modal({backdrop: 'static', keyboard: false});;
+}
+
+/**
+ * 关闭模态框
+ * @param modelId 模态框ID
+ */
+function hideModelDialog(modelId) {
+	$('#'+modelId).modal('hide');
 }

gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -140,9 +140,8 @@ function save() {
 function addInfo() {
 	// 清空表单信息
 	comClearFormData("form");
-	// 设置标题并弹出
-	$('#myModalLabel').html("新增");
-	$('#myModal').modal({backdrop: 'static', keyboard: false});;
+	// 弹出模态框
+	showModelDialog("myModal", "新增");
 };
 
 /**
@@ -187,9 +186,7 @@ function editInfo() {
 			$("#id").val(data.id);
 			$("#realName").val(data.realName);
 			$("#loginName").val(data.loginName);
-			console.info(data);
-			$('#myModalLabel').html("编辑");
-			$('#myModal').modal({backdrop: 'static', keyboard: false});;
+			showModelDialog("myModal", "编辑");
 		},
 		error: function (XMLHttpRequest, textStatus, errorThrown) {
         }
@@ -200,5 +197,5 @@ function editInfo() {
  * 关闭当前窗口
  */
 function closeWin() {
-	$('#myModal').modal('hide');
+	hideModelDialog("myModal");
 }