From fb222b35891c6e2b5a4273082809a6d362e81be0 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 5 Jun 2017 17:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=9C=80=E5=A4=A7=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/articles/articles_list.html      |  4 ++--
 .../WEB-INF/views/categories/categonies_list.html  |  4 ++--
 .../webapp/WEB-INF/views/content/org_operate.html  | 24 +++++++++++++---------
 .../WEB-INF/views/content/template_list.html       |  4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html
index c82ee61..b61be35 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html
@@ -163,7 +163,7 @@ function edit(){
 }
 
 function add(){
-    popWindow("添加图文内容", APP.PATH + controllerRequestMappint + "0/toEdit",850,800);
+    fullWindow("添加图文内容", APP.PATH + controllerRequestMappint + "0/toEdit",850,800);
 }
 
 function del(){
@@ -200,7 +200,7 @@ function initData(){
         showToggle: true,
         detailView: false,
         onDblClickRow:function(row,ev){
-            popWindow("修改图文信息", APP.PATH + controllerRequestMappint + row.id+"/toEdit?id="+row.id,850,800);
+            fullWindow("修改图文信息", APP.PATH + controllerRequestMappint + row.id+"/toEdit?id="+row.id,850,800);
         },
         columns:[{
             field: 'perent',
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html
index d7355d4..f36cfdb 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html
@@ -43,11 +43,11 @@ function search(){
 var controllerRequestMappint = "/contentCategories/";
 
 function add(id,level,cgName) {
-    popWindow("新增栏目", APP.PATH + controllerRequestMappint + "0/toEdit?perId="+id+"&perCgName="+cgName+"&level="+level,800,800);
+    fullWindow("新增栏目", APP.PATH + controllerRequestMappint + "0/toEdit?perId="+id+"&perCgName="+cgName+"&level="+level,800,800);
 }
 
 function edit(id){
-    popWindow("修改栏目", APP.PATH + controllerRequestMappint + id + "/toEdit",800,800);
+    fullWindow("修改栏目", APP.PATH + controllerRequestMappint + id + "/toEdit",800,800);
 }
 
 function del(id){
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html
index f2bd951..9a24786 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/org_operate.html
@@ -1,7 +1,7 @@
 #override("body")
 <div class="wrapper wrapper-content">
     <div class="row">
-        <div class="col-sm-3">
+        <!--<div class="col-sm-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-content mailbox-content">
                     <div class="container-fluid">
@@ -20,8 +20,8 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="col-sm-9 animated fadeInRight">
+        </div>-->
+        <div class="col-sm-12 animated fadeInRight">
             <div class="panel panel-default">
                 <div class="panel-heading">
                     <label><h3 class="panel-title">短信内容设置</h3></label>
@@ -42,7 +42,7 @@
                                 </div>
                             </div>
                             <div class="col-sm-8">
-                                <div class="form-group" onclick="confirmVer();">
+                                <div class="form-group">
                                     <a class="btn btn-primary" href="javascript:configVer()">确定</a>
                                 </div>
                             </div>
@@ -102,7 +102,7 @@
             var controllerRequestMappint = "/contentDoctorMessage/";
 
             function add(){
-                popWindow("新增信息", APP.PATH + controllerRequestMappint + "0/toEdit?hId=$hospId", 850, 800);
+                fullWindow("新增信息", APP.PATH + controllerRequestMappint + "0/toEdit?hId=$hospId", 850, 800);
             }
             function showMessageList() {
                 layer.closeAll();//关闭弹窗
@@ -116,10 +116,14 @@
             }
 
             function del(msgId){
-                $.post(APP.PATH + controllerRequestMappint + msgId+"/delete", "", function (data) {
-                    msg(r.message);
-                    showMessageList();
-                }, "json");
+                layer.confirm('确定删除选中的数据', {
+                    btn: ['确定','取消'] //按钮
+                }, function(){
+                    $.post(APP.PATH + controllerRequestMappint + msgId+"/delete", "", function (data) {
+                        msg(data.message);
+                        showMessageList();
+                    }, "json");
+                });
             }
 
             function changeVer() {
@@ -199,7 +203,7 @@
                     pageList: [200],    //可供选择的每页的行数（*）
                     strictSearch: true,
                     onDblClickRow: function (row, ev) {
-                        popWindow("修改信息", APP.PATH + controllerRequestMappint + row.id + "/toEdit?hId=$hospId", 850, 800);
+                        fullWindow("修改信息", APP.PATH + controllerRequestMappint + row.id + "/toEdit?hId=$hospId", 850, 800);
                     },
                     queryParams: function (params) {
                         return {
diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html
index e0a27eb..e1d9ec4 100644
--- a/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html
+++ b/parent/center.manager/src/main/webapp/WEB-INF/views/content/template_list.html
@@ -135,7 +135,7 @@
 			return;
 		}
 		var vName = version.versionName;
-        popWindow("新增信息模板", APP.PATH + controllerRequestMappint + verId+"/toEdit?vName="+vName,850,800);
+        fullWindow("新增信息模板", APP.PATH + controllerRequestMappint + verId+"/toEdit?vName="+vName,850,800);
 	}
 
 	var templateVer = [];
@@ -172,7 +172,7 @@
             pageList: [200],    //可供选择的每页的行数（*）
             strictSearch: true,
             onDblClickRow:function(row,ev){
-                popWindow("修改信息模板", APP.PATH + controllerRequestMappint + version.id+"/toEdit?id="+row.id+"&vName="+version.versionName,850,800);
+                fullWindow("修改信息模板", APP.PATH + controllerRequestMappint + version.id+"/toEdit?id="+row.id+"&vName="+version.versionName,850,800);
             },
             queryParams:function (params) {
                 return {
-- 
1.8.3.1