罚款

application/index/view/finance/fineMoney.html

@@ -104,12 +104,12 @@
 		height: 80px;
 		margin-top: 3px;
 	}
-	.result-positive{
+	.result-positive,.result-positive-edit{
 		width: 80px;
 		float: left;
 		text-align: center;
 		margin-right: 20px;
-		margin-top: 15px;
+		margin-top: 5px;
 	}
 	#container_body{
 		position: relative;
@@ -295,7 +295,7 @@
                     罚款详情
                 </h4>
 			</div>
-			<div class="modal-body" style="height: 560px;overflow-y: auto;overflow-x: hidden;">
+			<div class="modal-body" style="height: 620px;overflow-y: auto;overflow-x: hidden;">
 				<form class="form-horizontal form-horizontal-edit">
 					<div class="form-group">
 						<label class="col-sm-4 control-label">罚款ID：</label>
@@ -345,6 +345,12 @@
 							</div>
 					    </div>
 					</div>
+					<div class="form-group to-pay-hide">
+						<label class="col-sm-4 control-label">滞纳金：</label>
+						<span style="margin-top: 7px;display: inline-block;" id="forfeit_penalty"></span>
+						<label class="col-sm-4 control-label">付款金额：</label>
+						<span style="margin-top: 7px;display: inline-block;" id="money_sum"></span>
+					</div>
 					
 				</form>
 			</div>

public/resource/js/fineMoney.js

@@ -276,15 +276,27 @@ define(['doT', 'text!temp/fineMoney_list_template_tpl.html', 'text!temp/phoneBin
 							$("#submit_name_edit").html(data.data.submit_agent_name);
 							$("#tijiao").html(data.data.create_time);
 							$("#remark_edit").val(data.data.remarks);
+							$("#forfeit_penalty").html(data.data.forfeit_penalty);
+							$("#money_sum").html(data.data.money_sum);
+							
+							
 							if(data.data.status*1 == 0){
 							   $("#edit_status").html('待支付');
 							   $(".submit_edit").show();
+							   $(".to-pay-hide").hide();
+							   
+							   
 							}else if(data.data.status*1 == 1){
 							   $("#edit_status").html('已支付');
 							   $(".submit_edit").hide();
+							   $(".to-pay-hide").show();
+							   
+							   
 							}else{
 							   $("#edit_status").html('已取消');
 							   $(".submit_edit").hide();
+							   $(".to-pay-hide").hide();
+							   
 							}
 							
 							if(data.data.type) {

public/resource/template/fineMoney_list_template_tpl.html

@@ -12,8 +12,8 @@
         [% }else{ %]
           <td class="text-center"></td>
         [% } %]
-        <td class="text-center">[%= it[item]["money"] %]</td>
-        <td class="text-center">[%= it[item]["money"] %]</td>
+        <td class="text-center">[%= it[item]["forfeit_penalty"] %]</td>
+        <td class="text-center">[%= it[item]["money_sum	int"] %]</td>
         <td class="text-center">[%= it[item]["status_name"] %]</td>
         <td class="text-center">
         	[% if(it[item]["status"]*1 == 0 ){ %]