后台

public/resource/css/public.css

@@ -377,7 +377,7 @@ html::-webkit-scrollbar-thumb{
     text-align:  right;
 }
 
-#pagediv a,#pagediv span{
+#pagediv a,#pagediv>span{
     display: inline-block;
     width: 30px;
     line-height: 30px;

public/resource/js/RemarkFollowIndex.js

@@ -1695,6 +1695,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 						    
 							/*分页代码*/
                             add_page(data.data.data.total,pageNo,user.pageSize,user.getList);
+			                $('.hide-total-info-liu').hide();
+                            
 				
 			            }else {
 			                alert(data['msg']);

public/resource/lib/js/zw.pagination.js

@@ -29,7 +29,7 @@ function add_page (total_list, page_no, page_size, methodName) {
         }
     });
     var str = '<span style="float: left;min-width: 250px !important;text-align: left !important;" class ="move-block">' +
-        '每页显示' + page_size + '条 | 共' + total_list + '条</span>';
+        '每页显示' + page_size + '条<span class="hide-total-info-liu"> | 共' + total_list + '条</span></span>';
     $ ('#pagediv').append (str);
 
 };
\ No newline at end of file

public/resource/template/reportList_template_tpl.html

@@ -44,6 +44,8 @@
 				<a class="btn1 btn-success report-back-out" href="#modal-back-out" data-toggle="modal">撤销</a>&nbsp;
 			[% } %]
             <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a>
+            <a class="btn1 btn-success receipt-evidencing-list" href="#modal-receiptEvidencing" data-toggle="modal">收款入账</a>
+            
         </td>
     </tr>
     [% } %]
@@ -168,3 +170,44 @@
 		<span class="detail-modal-maid-span-time"></span>
 	</div>
 </script>
+
+<script id="receivables_template_tpl" type="text/template">
+    [% if(it&&it.length!=0) { %]
+    [% for(var item in it){ %]
+    <tr class="text-center">
+        <td>[%= it[item]['create_time'] %]</td>
+        <td>[%= it[item]['id'] %]</td>
+        <td>[%= it[item]['bargain_id'] %]</td>
+        <td>[%= it[item]['income_time'] %]</td>
+        <td>[%= it[item]['name'] %]</td>
+        <td>[%= it[item]['current_agent_name'] %]</td>
+        <td>[%= it[item]['store_name'] %]</td>
+        <td>[%= it[item]['type'] %]</td>
+        <td>[%= it[item]['money'] %]</td>
+        <td>[%= it[item]['real_money'] %]</td>
+        [% if(it[item]['source'] == 0) { %]
+        	<td>正常收款</td>
+        	<td>正常</td>
+        [% } else if ( it[item]['source'] == 1 ) { %]
+        	<td>正常收款</td>
+        	<td>正常</td>
+        [% } else if ( it[item]['source'] == 2) { %]
+         	<td>被调整收款(调整ID:[%= it[item]['source_id'] %])</td>
+         	<td>被调整</td>
+        [% } else {%]
+        	<td>--</td>
+        [% } %]
+        <!--<td>[%= it[item]['source_id'] %]</td>-->
+        <td>
+        	[% if(check_auth('index/getCollectionDetail')) { %]
+           		<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
+            [% } %]
+        </td>
+    </tr>
+    [% } %]
+    [% }else{ %]
+    <tr>
+        <td colspan="14" style="text-align:center;"> 暂无数据</td>
+    </tr>
+    [% } %]
+</script> 
\ No newline at end of file