修改界面显示内容

WebContent/WEB-INF/view/bus/invoice-edit.jsp

@@ -61,7 +61,7 @@
 
             <tr>
                 <td>开票时间：</td>
-                <td><input type="text" class="date" dateFmt="yyyy-MM-dd" id="billingTimeStr" autocomplete="off" name="billingTimeStr" value='${bwp.billingTime!""?string("yyyy-MM-dd")}' /></td>
+                <td><input type="text" class="date" dateFmt="yyyy-MM-dd" id="billingTimeStr" autocomplete="off" name="billingTimeStr" value='${bwp.billingTime?string("yyyy-MM-dd")}' /></td>
                 <td>开票人：</td>
                 <td><input type="text" name="billingUser" value='${bwp.billingUser!""}' autocomplete="off"/></td>
             </tr>

WebContent/WEB-INF/view/bus/invoice-list.jsp

@@ -85,7 +85,7 @@
         function showInfoList(row, detailPanel,callback) {
             console.log(row)
             if (row.infoList) {
-               
+
                 var childGrid = document.createElement('div');
                 $(detailPanel).append(childGrid);
 

WebContent/WEB-INF/view/bus/month-assessment-list.jsp

@@ -102,7 +102,7 @@
                             return Number(value).toFixed(1);
                         }
                     },
-                    { display: '实收金额', name: 'paidInAmount',     align: 'center', width: "5%",
+                    { display: '超标金额', name: 'paidInAmount',     align: 'center', width: "5%",
                         render: function (rowdata, rowindex, value, column){
                         if (value > 0 ){
                             return "<span  class='textSlice' style='width:100%;cursor: pointer;color: red;' >"+Number(value).toFixed(1)+"</span >";
@@ -140,19 +140,20 @@
                         render:function(rowdata, rowindex, value, column){
                             return "<span  class='textSlice' style='width:100%;cursor: pointer;' title='"+value.code+"'>"+value.code+"</span >";
                         }
-                    },
-                    { display: '操作', isAllowHide: false, align: 'center', width:"15%",
-                        render: function (rowdata, rowindex, value, column){
-                            return '<div class="padding_top4 padding_left20">'
-                                <@pop_perm url="/monthAssessment/update.do">
-                                + '<a href="#"  onclick="onEdit('+ rowdata[0]+')"><span class="icon_edit">修改</span></a>'
-                                </@pop_perm>
-                                <@pop_perm url="/monthAssessment/delete.do">
-                                + '<a href="#"  onclick="onDelete('+ rowdata[0]+')"><span class="icon_delete">删除</span></a>'
-                                </@pop_perm>
-                                + '</div>';
-                        }
-                    }],
+                    }
+                    // { display: '操作', isAllowHide: false, align: 'center', width:"15%",
+                    //     render: function (rowdata, rowindex, value, column){
+                    //         return '<div class="padding_top4 padding_left20">'
+                    //             <@pop_perm url="/monthAssessment/update.do">
+                    //             + '<a href="#"  onclick="onEdit('+ rowdata[0]+')"><span class="icon_edit">修改</span></a>'
+                    //             </@pop_perm>
+                    //             <@pop_perm url="/monthAssessment/delete.do">
+                    //             + '<a href="#"  onclick="onDelete('+ rowdata[0]+')"><span class="icon_delete">删除</span></a>'
+                    //             </@pop_perm>
+                    //             + '</div>';
+                    //     }
+                    // }
+                    ],
                 toolbar:{
                     items:[
         //             <@pop_perm url="/monthAssessment/create.do">
@@ -176,15 +177,15 @@
                 {line:true},
                 {text:'导出',click:exportExcel, iconClass:'icon_export'},
         </@pop_perm>
-            <@pop_perm url="/monthAssessment/print.do">
-                {line:true},
-                {text:'开发票',click:invoice, iconClass:'icon_export'},
-        </@pop_perm>
-            <@pop_perm url="/monthAssessment/wx.do">
-                {line:true},
-                {text:'wx',click:wx, iconClass:'icon_export'},
-        </@pop_perm>
-            {line:true}
+        //     <@pop_perm url="/monthAssessment/print.do">
+        //         {line:true},
+        //         {text:'开发票',click:invoice, iconClass:'icon_export'},
+        // </@pop_perm>
+        //     <@pop_perm url="/monthAssessment/wx.do">
+        //         {line:true},
+        //         {text:'wx',click:wx, iconClass:'icon_export'},
+        // </@pop_perm>
+        //     {line:true}
         ]
         },
             data:[],

WebContent/WEB-INF/view/bus/org-init-imp.jsp

@@ -67,7 +67,7 @@
 				</tr>
 				<tr>
 					<td colspan="4" align="center">
-						<input id="submit" type="submit" value="保存"/>&nbsp;
+						<input id="submit" type="button" onclick="save()" value="保存"/>&nbsp;
 						<input type="reset" value="重置" />
 					</td>
 				</tr>
@@ -84,7 +84,16 @@
 			//关闭窗口
 			top.Dialog.close();
 		}
-		
+
+		function save() {
+
+			$("#myFormId").submit();
+			//进度条
+			$(".Validform_title").html("提示信息");
+			$(".Validform_info").html("<font color=green>正在导入计划数据，请耐心等待...<img src='${ctx}/image/hyyloading.gif' style='width:100px;height:11px;'/></font>");
+		}
+
+
 		function chekcForm(){
 			var oFileValue = $("#fileupload").val();
 			var reg = /(\.(?:xls|xlsx))$/i;

src/java/com/bus/service/impl/BusOrgServiceImpl.java

@@ -296,8 +296,8 @@ public class BusOrgServiceImpl extends GenericServiceImpl<BusOrg, Long> implemen
 			for (int j = 1;j<=12;j++){
 				BusMonthAssessment busMonthAssessment = new BusMonthAssessment();
 				busMonthAssessment.setAssessmentMonth(j);
-				busMonthAssessment.setWaterPlanningIndex(quarterlyPlan);
-				busMonthAssessment.setReplyOfWater(quarterlyPlan);
+				busMonthAssessment.setWaterPlanningIndex(monthPlan);
+				busMonthAssessment.setReplyOfWater(monthPlan);
 				busMonthAssessment.setOrg(busOrg);
 				busMonthAssessment.setIsWriteOff("no");
 				busMonthAssessmentService.save(busMonthAssessment);