项目计划安排

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/constructionManageAct.js

@@ -118,7 +118,6 @@
             },
             columns: [{
                 checkbox: true
-
             }, {
                 field: 'projectNumber',
                 title: '项目定义号',
@@ -282,11 +281,10 @@ function deleteAll(ids){
         return false;
     }
     $("#ids").val(ids);
-    jp.prompt("填写备注", function (message) {
-        jp.post("${ctx}/sg/managementCenter/projectPlanArrage/deletePlanArrange",
+    // jp.prompt("填写备注", function (message) {
+        jp.post("${ctx}/sg/managementCenter/projectPlanArrage/deletePlanArrangeAll",
             {
-                "ids": $("#ids").val(),
-                "backToText": window.encodeURI(message)
+                "ids": $("#ids").val()
             },
             function (data) {
                 if(data.success){
@@ -296,7 +294,35 @@ function deleteAll(ids){
                 }else{
                     jp.error(data.message);
                 }
-            })
+            }
+        )
+    // });
+}
+function deleteAllExit(ids){
+    if(!ids){
+        ids =  getIdSelections();
+    }
+        if ("" == ids || ids==null){
+            jp.error("请选择项目");
+            return false;
+        }
+        $("#ids").val(ids);
+        jp.prompt("填写备注", function (message) {
+            jp.post("${ctx}/sg/managementCenter/projectPlanArrage/deletePlanArrange",
+            {
+                "ids": $("#ids").val(),
+                "backToText": window.encodeURI(message)
+            },
+            function (data) {
+                if(data.success){
+                jstree(data.mapListTree);
+                refresh();
+                jp.success(data.message);
+            }else{
+                jp.error(data.message);
+            }
+        }
+        )
     });
 }
 function getIdSelections() {

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/constructionManageAct.jsp

@@ -40,6 +40,9 @@
                         <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
                             <i class="glyphicon glyphicon-remove"></i> 删除
                         </button>
+                        <button id="remove1" class="btn btn-default"  onclick="deleteAllExit()">
+                            <i class="glyphicon glyphicon-edit"></i> 退回备注
+                        </button>
                     </div><!-- 工具栏结束 -->
                     <div style="height:370px;overflow:auto">
                         <table id="table" data-toolbar="#toolbar">

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/netWorkManageAct.js

@@ -139,11 +139,11 @@
                 }
                 , {
                     field: 'backToText',
-                    title: '备注'
+                    title: '配网项目经理备注'
                 }
                 , {
                     field: 'remarks',
-                    title: '发起人备注'
+                    title: '备注'
                 }
 
 

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/act/netWorkManageAct.jsp

@@ -41,14 +41,14 @@
                             <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
                                 <i class="glyphicon glyphicon-remove"></i> 删除
                             </button>
-                            <button id="selectPowerPack" class="btn btn-primary" onclick="planPowerPacker()">
+                            <button id="selectPowerPack" class="btn btn-success" onclick="planPowerPacker()">
                                 <i class="glyphicon glyphicon-plus"></i>安排停电包
                             </button>
-                            <button id="cancelPowerPack" class="btn btn-danger" onclick="cancelPowerPacker()">
+                            <button id="cancelPowerPack" class="btn btn-warning" onclick="cancelPowerPacker()">
                                 <i class="glyphicon glyphicon-remove"></i>取消停电包
                             </button>
-                            <button id="" class="btn btn-warning" onclick="getNetRemarksBack()">
-                                <i class="fa fa-file-excel-o"></i> 备注
+                            <button id="" class="btn btn-default" onclick="getNetRemarksBack()">
+                                <i class="glyphicon glyphicon-edit"></i> 备注
                             </button>
                         </div><!-- 工具栏结束 -->
                         <div style="height:370px;overflow:auto">

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageForm.js

@@ -135,7 +135,7 @@
                     }
                     ,{
                         field: 'remarks',
-                        title: '发起人备注',
+                        title: '备注',
                         width:120
                     }
                 ]

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/projectPlanArrageForm.jsp

@@ -43,14 +43,14 @@
                 <button id="remove" class="btn btn-danger"  onclick="deleteAll()">
                     <i class="glyphicon glyphicon-remove"></i> 退回
                 </button>
-                <button id="selectPowerPack" class="btn btn-primary" onclick="planPowerPacker()">
+                <button id="selectPowerPack" class="btn btn-success" onclick="planPowerPacker()">
                     <i class="glyphicon glyphicon-plus"></i>安排停电包
                 </button>
-                <button id="cancelPowerPack" class="btn btn-danger" onclick="cancelPowerPacker()">
+                <button id="cancelPowerPack" class="btn btn-warning" onclick="cancelPowerPacker()">
                     <i class="glyphicon glyphicon-remove"></i>取消停电包
                 </button>
-                <button id="export" class="btn btn-warning" onclick="getRemarksBack()">
-                    <i class="fa fa-file-excel-o"></i> 备注
+                <button id="export" class="btn btn-default" onclick="getRemarksBack()">
+                    <i class="glyphicon glyphicon-edit"></i> 备注
                 </button>
             </div><!-- 工具栏结束 -->
             <div style="height:500px;overflow:auto">