Commit 9e74afb4 by hcy001
parents e704b3db 96095050
Showing with 4 additions and 3 deletions
......@@ -136,10 +136,11 @@ class QuoteModel extends Model
} else if(!empty($map['end_time'])) {
$query->where('q.create_time', '<=', $map['end_time']);
}
});
})
->where('q.status', '<>', 0); // 过滤报价草稿
if ($type == 1) {
$list = $list->where('q.create_uid', $input['user_id']);
$list = $list->where('q.create_uid', $input['user_id']);
} else if ($type == 2) {
$perm = new PermController;
$role = $perm->getUserRole($input['user_id'], $input['email']); // 用户角色
......@@ -203,7 +204,7 @@ class QuoteModel extends Model
$quote_info = $this->find($id);
if ($quote_info['status'] == -1) return [1, '该报价已撤销,请刷新页面查看'];
if ($quote_info['status'] > 1) return [1, '当前报价状态不能撤销,请刷新页面查看'];
// if ($quote_info['status'] > 1) return [1, '当前报价状态不能撤销,请刷新页面查看'];
$res = $this->where('id', $id)->update(['status' => -1, 'cancel_reason'=>$cancel_reason]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment