Forráskód Böngészése

优化委托送样人自动选择

liuhairui 2 éve
szülő
commit
a23eee9b39

+ 2 - 3
application/admin/controller/Entrust.php

@@ -93,6 +93,7 @@ class Entrust extends Backend
     {
         if (false === $this->request->isPost()) {
             $user_id = Session::get('admin')['id'];
+            $nickname = Session::get('admin')['nickname'];
             $company_id = Db::name('admin')->where('id',$user_id)->value('company');
             $company = Db::name('company')->where('pid',$company_id)->column('id,name');
             if (empty($company)){
@@ -101,6 +102,7 @@ class Entrust extends Backend
             $this->assign('company',$company);
             $judgeData = Db::name('item_judge')->whereNull('delete')->column('id,name');
             $this->view->assign('judgeData', $judgeData);
+            $this->view->assign('nickname', $nickname);
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');
@@ -193,9 +195,6 @@ class Entrust extends Backend
             $this->assign('sample_stand',$sample_stand);
             $this->view->assign('row', $row);
             //修改判定标准
-//            $entrust = Db::name('entrust')->where('id',$ids)->find();
-//            $item_judge = $entrust['standard_id'];
-//            $this->assign('item_judge',$item_judge);
             $judgeData = Db::name('item_judge')->whereNull('delete')->column('id,name');
             $this->view->assign('judgeData', $judgeData);
             return $this->view->fetch();

+ 1 - 1
application/admin/view/entrust/add.html

@@ -91,7 +91,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">收样人:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_select('row[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], null,['class'=>'form-control'])}
+            {:build_select('row[receive_sample]', ['王枫'=>'王枫', '邹细建'=>'邹细建','高小满'=>'高小满','顾诚康'=>'顾诚康',], $nickname,['class'=>'form-control'])}
         </div>
     </div>
     <div class="form-group">

+ 1 - 2
application/admin/view/entrust/edit.html

@@ -85,8 +85,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Standard_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_select('row[standard_id]', $judgeData, $row['standard_id'],['class'=>'form-control selectpicker','data-rule'=>'required'])}
-            <!--<input id="c-standard_name" class="form-control" name="row[standard_name]" type="text" value="{$row.standard_name|htmlentities}" readonly>-->
+            {:build_select('row[standard_id]', $judgeData, $row['standard_id'],['class'=>'form-control selectpicker','data-rule'=>'required'])}<!--<input id="c-standard_name" class="form-control" name="row[standard_name]" type="text" value="{$row.standard_name|htmlentities}" readonly>-->
         </div>
     </div>
     <div class="form-group">