日计划页面

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/dailyDateList.js

@@ -76,6 +76,15 @@ $(document).ready(function() {
                },
         onLoadSuccess:function(data) {
             var split = data.rows;
+            var tb = document.getElementById('projectTable');    // table 的 id
+            var rows = tb.rows;                           // 获取表格所有行
+            for (var i =0;i<split.length;i++){
+                if (split[i].flagYesElectricity=="1"){
+                    // this.data.rows[i].setAttribute("style","color: red;");
+                    rows[i+1].style.color = "red"
+                }
+            }
+            var split = data.rows;
             for (var i = 0; i < split.length; i++) {
                 var arrangeTime = split[i].projectDate;
                 var date = new Date(arrangeTime);
@@ -157,6 +166,10 @@ $(document).ready(function() {
                        width:160,
                        formatter: getTime
                    }
+                   ,{
+                       field: 'remarks',
+                       title: '备注'
+                   }
 		     ]
 		
 		});

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyArrageForm.js

@@ -91,14 +91,14 @@
                 },
                 onLoadSuccess:function(data) {
                     var split = data.rows;
-                    // var tb = document.getElementById('table');    // table 的 id
-                    // var rows = tb.rows;                           // 获取表格所有行
-                    // for (var i =0;i<split.length;i++){
-                    //     if (split[i].htmlStatus=="2"){
-                    //         // this.data.rows[i].setAttribute("style","color: red;");
-                    //         rows[i+1].style.backgroundColor = "#e6e6e6"
-                    //     }
-                    // }
+                    var tb = document.getElementById('table');    // table 的 id
+                    var rows = tb.rows;                           // 获取表格所有行
+                    for (var i =0;i<split.length;i++){
+                        if (split[i].flagYesElectricity=="1"){
+                            // this.data.rows[i].setAttribute("style","color: red;");
+                            rows[i+1].style.color = "red"
+                        }
+                    }
                 },
                 onShowSearch: function () {
                     $("#search-collapse").slideToggle();
@@ -123,10 +123,10 @@
 
                     }
                     ,{
-                        field: 'remarks',
-                        title: '备注',
-                        width:120
-                    }
+    field: 'remarks',
+    title: '备注',
+    width:120
+}
                 ]
 
             });
@@ -312,7 +312,7 @@ function getRemarksBack(ids){
     $("#idsRemark").val(ids);
     if (null!=ids&&""!=ids){
         jp.prompt("填写备注", function (message) {
-            jp.post("${ctx}/sg/managementCenter/projectPlanArrage/remarksBack",
+            jp.post("${ctx}/sg/managementCenter/projectDailyPlan/remarksBack",
                 {
                     "ids": $("#idsRemark").val(),
                     "remarks": window.encodeURI(message)

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyPlanForm.jsp

@@ -56,7 +56,14 @@
 					</td>
 					<td class="width-15 active"><label class="">是否停电：</label></td>
 					<td class="width-35">
-						<form:input path="projectPowerOut" htmlEscape="false" readonly="true"   class="form-control"/>
+						<form:select path="projectPowerOut" class='form-control'>
+							<form:option value='带电'/>
+							<form:option value='停电'/>
+						</form:select>
+						<%--<select class='form-control' id=''>--%>
+							<%----%>
+						<%--<select>--%>
+							<%--<form:input path="projectPowerOut" htmlEscape="false" readonly="true"   class="form-control"/>--%>
 					</td>
 				</tr>
 				<tr>
@@ -69,6 +76,10 @@
 			                    </span>
 						</div>
 					</td>
+					<td class="width-15 active"><label class="pull-right">备注信息：</label></td>
+					<td class="width-35">
+						<form:textarea path="remarks" htmlEscape="false" rows="4"    class="form-control "/>
+					</td>
 				</tr>
 			</tbody>
 		</table>

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyPlanList.js

@@ -102,6 +102,10 @@ $(document).ready(function() {
                        sortName: 'endDate'
 
                    }
+                   ,{
+                       field: 'remarks',
+                       title: '备注'
+                   }
                    // ,{
                    //     field: 'distributionNetwork',
                    //     title: '配网项目经理',
@@ -168,6 +172,9 @@ $(document).ready(function() {
     $("#export").click(function(){//导出Excel文件
         jp.downloadFile('${ctx}/sg/managementCenter/projectDailyPlan/export');
     });
+    $("#exportTim").click(function(){//导出Excel文件
+        jp.downloadFile('${ctx}/sg/managementCenter/projectDailyPlan/exportTim');
+    });
 	 $("#reset").click("click", function() {// 绑定查询按扭
 		  $("#searchForm  input").val("");
 		  $("#searchForm  select").val("");
@@ -184,7 +191,7 @@ $(document).ready(function() {
 		$('#endDate').datetimepicker({
 			 format: "YYYY-MM-DD"
 		});
-		
+
 	});
 
   function getIdSelections() {
@@ -198,13 +205,13 @@ $(document).ready(function() {
    function add(){
 	  jp.openSaveDialog('新增日计划安排', "${ctx}/sg/managementCenter/projectDailyPlan/formProject",'800px', '500px');
   }
-    function addList(projectNumber,arrangeTime,projectName) {
+    function addList(projectNumber,projectName) {
     top.layer.open({
         type: 2,
         area: ['900px', '500px'],
         title: '项目计划安排',
         maxmin: true, //开启最大化最小化按钮
-        content: "${ctx}/sg/managementCenter/projectDailyPlan/initAddDailyPlan?projectNumber="+projectNumber+"&projectMonthDate="+arrangeTime+"&projectName="+encodeURI(encodeURI(projectName)),
+        content: "${ctx}/sg/managementCenter/projectDailyPlan/initAddDailyPlan?projectNumber="+projectNumber+"&projectName="+encodeURI(encodeURI(projectName)),
         btn: ['确定', '关闭'],
         yes: function(index, layero){
             top.layer.close(index);
@@ -283,7 +290,7 @@ function newWorkSubmit() {
 function deleteAll(){
     jp.confirm('确认要删除计划表单记录吗？', function(){
         jp.loading();
-        jp.get("${ctx}/sg/managementCenter/projectDailyPlan/deleteAll?ids=" + getIdSelections(), function(data){
+        jp.get("${ctx}/sg/managementCenter/projectDailyPlan/deleteAll?ids=" + getIdSelections()+"&projectNames="+encodeURI(encodeURI(getNameSelections())), function(data){
             if(data.success){
                 jp.success(data.msg);
                 refresh();
@@ -293,4 +300,9 @@ function deleteAll(){
         })
     })
 }
+function getNameSelections() {
+    return $.map($("#projectTable").bootstrapTable('getSelections'), function (row) {
+    return row.projectName
+    });
+}
 </script>

src/main/webapp/webpage/modules/sg/managementcenter/projectPlanArrage/dailyPlan/projectDailyPlanList.jsp

@@ -67,6 +67,9 @@
 				<button id="export" class="btn btn-warning">
 					<i class="fa fa-file-excel-o"></i> 导出
 				</button>
+				<%--<button id="exportTim" class="btn btn-primary">--%>
+					<%--<i class="glyphicon glyphicon-plus"></i> 下载导入模板--%>
+				<%--</button>--%>
 	 </div>
 		
 	<!-- 表格 -->