del

application/index/controller/Finance.php

@@ -2282,6 +2282,12 @@ class Finance extends Basic
             return $this->response(101, '参数错误');
         }
 
+        $m_pay = new OPayLogModel();
+        $num = $m_pay->getCount(['bargain_id'=>$this->params['bargain_id'],'is_del'=>0]);
+        if ($num > 0 ) {
+            return $this->response(101, '存在收款，不能删除！');
+        }
+
         $check = $this->updatePerformanceAll($this->params['bargain_id']);
         if ($check['status'] == 'fail') {
             return $this->response(101, '更新个人业绩失败，请重试！');

application/model/OPayLogModel.php

@@ -557,4 +557,8 @@ class OPayLogModel extends Model
     public function sumPayLog(string $field, array $where) {
         return $this->db_->where($where)->sum($field);
     }
+
+    public function getCount($where) {
+        return $this->db_->where($where)->count('id');
+    }
 }
\ No newline at end of file

public/resource/js/reportList.js

@@ -1045,7 +1045,7 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 							bargain.getList(bargain.pageNo);
 						}
 					} else {
-						alert('获取失败！');
+						alert(data.msg);
 					}
 				}
 			});