项目计划安排日计划页面

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

@@ -124,38 +124,46 @@ $(document).ready(function() {
                columns: [
                    {
 		        field: 'projectNumber',
+                width:160,
 		        title: '项目定义号',
 
             }
                    ,{
                        field: 'projectName',
+                       width:160,
                        title: '项目名称',
 
                    }
                    ,{
                        field: 'projectPowerRange',
+                       width:200,
                        title: '停电范围',
 
                    }
                    ,{
                        field: 'projectMonthDate',
+                       width:160,
                        title: '计划月份',
                    }
                    ,{
-                       field: 'constructionUnit',
-                       title: '施工单位项目经理',
-                   }
-                   ,{
                        field: 'projectDate',
                        title: '安排计划时间',
+                       width:300,
                        formatter: getTime
                    }
                    ,{
+                       field: 'constructionUnit',
+                       width:200,
+                       title: '当前操作经理',
+                   }
+                   ,{
                        field: 'associatedBag',
+                       width:160,
                        title: '关联包',
                    }
                    ,{
                        field: 'powerPackage',
+                       width:160,
                        title: '停电包'
                    }
 		     ]

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

@@ -138,7 +138,7 @@
                 title: '停电月份'
             }, {
                 field: 'projectDate',
-                width:120,
+                width:200,
                 title: '停电日'
             }, {
                 field: 'projectPowerOut',
@@ -151,22 +151,22 @@
             }
                 ,{
                     field: 'associatedBag',
-                    width:120,
+                    width:300,
                     title: '关联包',
                 }
                 ,{
                     field: 'powerPackage',
-                    width:120,
+                    width:300,
                     title: '停电包'
                 }
             , {
                 field: 'backToText',
-                width:160,
+                width:300,
                 title: '备注'
             }
                 , {
                     field: 'remarks',
-                    width:160,
+                    width:300,
                     title: '发起人备注'
                 }
 
@@ -325,7 +325,7 @@ function surePlan() {
                     }else if (data.msg == "1"){
                         jp.error("您还要项目具体安排时间未填!");
                     }else{
-                        jp.confirm('您安排的同一开关的项目时间不相同,是否继续？', function(){
+                        jp.confirm('您安排的同一停电包的项目时间不相同,是否继续？', function(){
                             withTheProcess();
                             top.layer.close(index);
                         })

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

@@ -141,6 +141,10 @@
                     field: 'backToText',
                     title: '备注'
                 }
+                , {
+                    field: 'remarks',
+                    title: '发起人备注'
+                }
 
 
             ]

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

@@ -23,6 +23,7 @@
                 <div class="row">
                     <%--未安排计划的树形--%>
                     <div class="col-sm-3 col-md-3">
+                        <input type="text" hidden="hidden" value="" id="idsRemark">
                         <div style="margin-top: 11px">
                             <label>
                                 <input type="input" class="form-control" id="input-search" style="width: 200px;float: left">
@@ -46,7 +47,7 @@
                             <button id="cancelPowerPack" class="btn btn-danger" onclick="cancelPowerPacker()">
                                 <i class="glyphicon glyphicon-remove"></i>取消停电包
                             </button>
-                            <button id="export" class="btn btn-warning" onclick="getNetRemarksBack()">
+                            <button id="" class="btn btn-warning" onclick="getNetRemarksBack()">
                                 <i class="fa fa-file-excel-o"></i> 备注
                             </button>
                         </div><!-- 工具栏结束 -->

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/oaNotify/planOaNotityForm.jsp

@@ -11,7 +11,7 @@
 			jp.ajaxForm("#inputForm",function(data){
 				if(data.success){
 					jp.success(data.msg);
-                    window.location.reload();
+                    // window.location.reload();
 					<%--jp.go("${ctx}/oa/oaNotify");--%>
 				}else{
 					jp.error(data.msg);

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

@@ -32,7 +32,7 @@
                 <button type="button" class="btn btn-success select-node" id="btn-search" style="float: left" >搜索</button>
                 </label>
             </div>
-            <div id="jstree" style="height:370px;overflow:auto;margin-top: 10px;margin-top: 1px"></div>
+            <div id="jstree" style="height:500px;overflow:auto;margin-top: 10px;margin-top: 1px"></div>
         </div>
         <div  class="col-sm-9 col-md-10 animated fadeInRight">
             <!-- 工具栏 -->
@@ -53,7 +53,7 @@
                     <i class="fa fa-file-excel-o"></i> 备注
                 </button>
             </div><!-- 工具栏结束 -->
-            <div style="height:370px;overflow:auto">
+            <div style="height:500px;overflow:auto">
                 <table id="table" data-toolbar="#toolbar">
                 </table>
             </div>

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

@@ -94,39 +94,46 @@ $(document).ready(function() {
                columns: [
                    {
 		        field: 'projectNumber',
+                width:160,
 		        title: '项目定义号'
 
             }
                    ,{
                        field: 'projectName',
+                       width:160,
                        title: '项目名称'
 
                    }
                    ,{
                        field: 'projectMonthDate',
+                       width:160,
                        title: '停电月份'
 
                    }
                    ,{
                        field: 'projectPowerRange',
                        title: '停电范围',
-                       width:160
+                       width:200
                    }
                    ,{
                        field: 'projectPowerOut',
                        title: '是否带电',
+                       width:160,
                        formatter: getTime
                    },{
                        field: 'constructionUnit',
-                       title: '施工单位项目经理',
+                       width:160,
+                       title: '施工单位项目经理'
 
                    }
                    ,{
                        field: 'associatedBag',
-                       title: '关联包',
+                       width:160,
+                       title: '关联包'
                    }
                    ,{
                        field: 'powerPackage',
+                       width:160,
                        title: '停电包'
                    }
 		     ]
@@ -134,7 +141,7 @@ $(document).ready(function() {
     function getTime(value, row, index) {
         if(row.projectPowerOut == "带电") {
             return [
-                "<select class='form-control' id=" + row.id + "><option value='停电'>停电</option><option value='带电'  selected>带电</option><select>",
+                "<select class='form-control' id=" + row.id + "><option value='带电' selected>带电</option><option value='停电'>停电</option><select>",
             ].join('');
         }else {
             return [