@@ -274,7 +274,8 @@ class Exams extends Backend
}
$exam_ids = $this->model->where('exam_collection_id',$ids)->column('exam_id');
[$where, $sort, $order, $offset, $limit] = $this->buildparams();
- $list = Db::name('real_exam_comp_request')->where('exam_collection_type',3)
+ $list = Db::name('real_exam_comp_request')
+// ->where('exam_collection_type',3)
->where($where)->where('exam_id','in',$exam_ids)
->order($sort, $order)
->paginate($limit);
@@ -182,7 +182,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
buttons: [
{
name: 'dispatch',
- text: '',
+ text: '已送',
icon: 'fa fa-check',
title: '已送',
classname: 'btn btn-success btn-xs btn-magic btn-ajax',
@@ -198,7 +198,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable'], function
},
},{
+ text: '驳回',
icon: 'fa fa-reply-all',
title: '驳回',
classname: 'btn btn-danger btn-xs btn-magic btn-ajax',