Quellcode durchsuchen

项目计划安排页面修改

Enford vor 5 Jahren
Ursprung
Commit
5e98494dbd

+ 29 - 4
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageList.js

@@ -204,9 +204,24 @@ $(document).ready(function() {
             },
             btn2: function(index,layero){
                 var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象,执行窗口内iframe页的方法:iframeWin.method();
-                var flag = iframeWin.contentWindow.saveSure();
-                jp.success("项目计划流程发起");
-                // jp.go("${ctx}/act/task/todo");
+                var power = iframeWin.contentWindow.saveSure();
+                $("#idPower").val(power)
+                jp.loading();
+                jp.post("${ctx}/sg/managementCenter/projectPlanArrage/sureInspection",$('#inputFormIds').serialize(),function(data){
+                    if(data.success){
+                        jp.confirm('带电项目在停电开关集合,是否通过?', function () {
+                            addDatePlan();
+                            jp.success("项目计划流程发起");
+                            top.layer.close(index);
+                            jp.go("${ctx}/act/task/todo");
+                        })
+                    }else{
+                        addDatePlan();
+                        jp.success("项目计划流程发起");
+                        top.layer.close(index);
+                        jp.go("${ctx}/act/task/todo");
+                    }
+                })
                 return false;
             },
             btn3: function(index){
@@ -223,7 +238,7 @@ $(document).ready(function() {
             area: ['900px', '500px'],
             title: '项目计划安排',
             maxmin: true, //开启最大化最小化按钮
-            content: "${ctx}/sg/managementCenter/projectPlanArrage/isArranging?projectNumber="+projectNumber+"&projectMonthDate="+arrangeTime+"&projectName="+window.encodeURI(projectName),
+            content: "${ctx}/sg/managementCenter/projectPlanArrage/isArranging?projectNumber="+projectNumber+"&projectMonthDate="+arrangeTime+"&projectName="+encodeURI(encodeURI(projectName)),
             btn: ['确定', '关闭'],
             yes: function(index, layero){
                 top.layer.close(index);
@@ -265,4 +280,14 @@ function deleteAll(){
     })
 }
 
+function addDatePlan() {
+    jp.post("${ctx}/sg/managementCenter/projectPlanArrage/save",function(data){
+        if(data.success){
+            jp.success("项目计划流程发起");
+            jp.go("${ctx}/act/task/todo")
+        }else {
+            jp.error("流程发起失败,请重新发起!");
+        }
+    })
+}
 </script>

+ 3 - 0
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageList.jsp

@@ -10,6 +10,9 @@
 	<%@include file="projectPlanArrageList.js" %>
 </head>
 <body>
+<form id="inputFormIds">
+	<input value="" name="ids" id="idPower" type="hidden">
+</form>
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">

+ 28 - 28
src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanPowerList.js

@@ -243,35 +243,35 @@ function saveSure(){
         idPower += date[i].id + "," + $("#"+id).val() + ";";
     }
     idPower = idPower.substring(0,idPower.length-1);
-    $("#idPower").val(idPower);
-    jp.loading();
-    jp.post("${ctx}/sg/managementCenter/projectPlanArrage/sureInspection",$('#inputForm').serialize(),function(data){
-        if(data.success){
-            jp.confirm('带电项目在停电开关集合,是否通过?', function () {
-                var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                parent.layer.close(dialogIndex);
-                addDatePlan();
-                jp.success("项目计划流程发起");
-                // jp.go("${ctx}/act/task/todo");
-            })
-        }else{
-            var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-            parent.layer.close(dialogIndex);
-            addDatePlan();
-        }
-    })
-    return false;
+    return idPower;
+    // $("#idPower").val(idPower);
+    // jp.loading();
+    // jp.post("${ctx}/sg/managementCenter/projectPlanArrage/sureInspection",$('#inputForm').serialize(),function(data){
+    //     if(data.success){
+    //         jp.confirm('带电项目在停电开关集合,是否通过?', function () {
+    //             var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+    //             // parent.layer.close(dialogIndex);
+    //             addDatePlan();
+    //             jp.success("项目计划流程发起");
+    //             jp.go("${ctx}/act/task/todo");
+    //         })
+    //     }else{
+    //         var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+    //         parent.layer.close(dialogIndex);
+    //         addDatePlan();
+    //     }
+    // })
 }
 
 
-function addDatePlan() {
-    jp.post("${ctx}/sg/managementCenter/projectPlanArrage/save",function(data){
-        if(data.success){
-            jp.success("项目计划流程发起");
-            jp.go("${ctx}/act/task/todo")
-        }else {
-            jp.error("流程发起失败,请重新发起!");
-        }
-    })
-}
+// function addDatePlan() {
+//     jp.post("${ctx}/sg/managementCenter/projectPlanArrage/save",function(data){
+//         if(data.success){
+//             jp.success("项目计划流程发起");
+//             jp.go("${ctx}/act/task/todo")
+//         }else {
+//             jp.error("流程发起失败,请重新发起!");
+//         }
+//     })
+// }
 </script>