财务日报修改

application/index/view/finance/daily_list.html

@@ -73,7 +73,7 @@
 									<tr>
 										<td colspan="14">
 											<form id="maintable_form_search">
-												<select class="form-control btn2 margin-top-ld" id="my-review">
+												<select class="form-control btn2 margin-top-ld" id="financial_city_choose">
 													<option value="-1">选择城市</option>
 													<option value="1">上海市</option>
 													<option value="0">杭州市</option>

public/resource/js/financial_daily_list.js

@@ -130,6 +130,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
                 'id': $('#financial_id').val(),
                 'status': bargain.switchStatus(),
                 'is_self':$('#my-review').val(),
+                'site_id':$('#financial_city_choose').val(),
                 
 			};
 			$.ajax({

public/resource/js/redEnvelopeList.js

@@ -54,7 +54,7 @@ define (['doT', 'text!temp/red_envelope_list_template_tpl.html', 'css!style/home
                 success: function (data) {
                     var temp = document.getElementById ('red_envelope_template_tpl').innerHTML;
                     var doTtmpl = doT.template (temp);
-                    $ ("#picture_list").html (doTtmpl (data.data));
+                    $ ("#picture_list").html(doTtmpl (data.data.list));
 
                     /*分页代码*/
                     add_page(data.data.total,pageNo,redEnvelope.pageSize,redEnvelope.getList);

public/resource/template/financial_manager_daily_list_template_tpl.html

@@ -153,14 +153,14 @@
     [% for(var item in it){ %]
     <tr>
     	<td>[%= it[item]['id'] %]</td>
-    	<td>[%= it[item]['pay_log_id'] %]</td>
+    	<td>[%= it[item]['old_paylog_id'] %]</td>
         <td>[%= it[item]['house_id'] %]</td>
         <td>[%= it[item]['house_address'] %]</td>
         <td>[%= swtype(it[item]['type'])%]</td>
         <td>[%= it[item]['income_time'] %]</td>
 		<td>[% if(it[item]["receipt_number"] != null) { %] [%= it[item]["receipt_number"] %] [% } %]</td>
         <td>[%= it[item]['money'] %]</td>
-    	<td>[%= it[item]['new_paylog_id'] %]</td>
+    	<td>[%= it[item]['pay_log_id'] %]</td>
         <td>
         	<a class="btn1 btn-info add-pic-liu" href="#modal-addPicLiu" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
         	<a class="btn1 btn-info record-pic" href="#modal_financial" data-recordid="[%= it[item]['pay_log_id'] %]" data-toggle="modal">资料</a>