|
|
@@ -111,7 +111,8 @@ class Entrust extends Backend
|
|
|
if (empty($company)){
|
|
|
$company = Db::name('company')->where('id',$company_id)->column('id,name');
|
|
|
}
|
|
|
- $judgeData = Db::name('item_judge')->whereNull('delete')->order('weigh asc')->column('id,name');
|
|
|
+// $judgeData = Db::name('item_judge')->whereNull('delete')->order('weigh asc')->column('id,name');
|
|
|
+ $judgeData = Db::name('item_judge')->whereNull('delete')->order('weigh asc')->select();
|
|
|
$receiveData = Db::name('receive_people')->where('company_id',$company_id)->column('id,name');
|
|
|
$nick_id = Db::name('receive_people')->where('name',$nickname)->value('id');
|
|
|
$this->assign('company',$company);
|
|
|
@@ -212,7 +213,8 @@ class Entrust extends Backend
|
|
|
$this->assign('sample_stand',$sample_stand);
|
|
|
$this->view->assign('row', $row);
|
|
|
//修改判定标准
|
|
|
- $judgeData = Db::name('item_judge')->whereNull('delete')->column('id,name');
|
|
|
+// $judgeData = Db::name('item_judge')->whereNull('delete')->column('id,name');
|
|
|
+ $judgeData = Db::name('item_judge')->whereNull('delete')->order('weigh asc')->select();
|
|
|
$this->view->assign('judgeData', $judgeData);
|
|
|
return $this->view->fetch();
|
|
|
}
|