收款

application/index/controller/Finance.php

@@ -2622,7 +2622,8 @@ class Finance extends Basic
                         $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
                     } else {
                         $source_id = $m_pay_adjustment->getFieldColumn('id', ['paylog_id'=> $v['id']]);
-                        $list[$k]['is_adjustment'] = empty($source_id) ? 0 : implode(',', $source_id);
+                        $list[$k]['source_id'] = empty($source_id) ? 0 : implode(',', $source_id);
+                        $list[$k]['is_adjustment'] = $source_id ? 1 : 0;
                     }
 
                     $num = $m_refund->getFind('id',['pay_log_id'=>$v['id'],'is_del'=>0]);

public/resource/js/getCollection.js

@@ -1371,7 +1371,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				$('#payNo').removeAttr("readonly");
 //				doc.find("#status").text("正常");
 			} else {
-				$("#comes").text('调整');
+				$("#comes").text('正常收款');
 				$('#intoPrice').attr("readonly" , "readonly");
 				$('#shoutiao').attr("readonly" , "readonly");
 //				$('#payType').attr("readonly" , "readonly");