Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

application/index/controller/Finance.php

@@ -313,7 +313,7 @@ class Finance extends Basic
         } else {
             $bargain      = new OBargainModel();
             $data['data'] = $bargain->addBargainCommission($this->params['id'], $this->userId, $this->params['agent_id'],
-                $this->params['role'], $this->params['scale_fee'], $this->params['scale']);
+                $this->params['role'], $this->params['scale_fee'], $this->params['scale'], 1);
 
             if ($data['data'] == 0) {
                 $data['code'] = 101;

application/model/OBargainModel.php

@@ -609,8 +609,11 @@ class OBargainModel extends Model
     public function addBargainCommission($id, $submit_agent_id, $agent_id, $role, $scale_fee, $scale, $source)
     {
         $this->startTrans();
+        $this->lock(true);
         $bargain_data = $this->where('id', $id)->find();
 
+        $m_agent = new AAgents();
+        $submit_agent_name = $m_agent->getAgentsById($submit_agent_id, 'name');
         if (empty($bargain_data['id'])) {
             $result = false;
         } else {
@@ -621,7 +624,7 @@ class OBargainModel extends Model
             $insert_data['order_no']          = $bargain_data['order_no'];
             $insert_data['trade_type']        = $bargain_data['trade_type'];
             $insert_data['submit_agent_id']   = $submit_agent_id;
-            $insert_data['submit_agent_name'] = $bargain_data['submit_agent_name'];
+            $insert_data['submit_agent_name'] = $submit_agent_name;
             $insert_data['price']             = $bargain_data['price'];
             $insert_data['commission']        = $bargain_data['commission'];
             $insert_data['status']            = $bargain_data['status'];

public/resource/js/reportList.js

@@ -454,7 +454,9 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 							var _inputAreaTempObj = $('.detail-modal-bargaininfo-commission-addarea');
 							if(data.data.practical_fee && data.data.practical_fee.length > 0){
 								_inputAreaTempObj.html('');
-							};
+							}else{
+								_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
+							}
 							$.each(data.data.practical_fee, function(i, v) {
 								_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
 									'0': v.money,