优化部分功能

application/admin/controller/Formula.php

@@ -27,7 +27,7 @@ class Formula extends Backend
         $this->model = new \app\admin\model\Formula;
         $this->view->assign("examineStatusList", $this->model->getExamineStatusList());
         $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("gyNameList", \app\admin\model\GyName::select());
+//        $this->view->assign("gyNameList", \app\admin\model\GyName::select());
     }
 
 
@@ -393,7 +393,7 @@ class Formula extends Backend
         $params['examine_name'] = $base[4];
         $params['number'] = $base[5];
         $params['remark'] = $base[6];
-        $params['mid'] = $base[7];
+        $params['machine'] = $base[7];
         $params['create'] = date('Y-m-d H:i:s');
         $result = false;
         Db::startTrans();

application/admin/controller/Product.php

@@ -198,9 +198,9 @@ class Product extends Backend
     public function show($ids){
         $row = $this->model->get($ids);
         $row['data'] =Db::query("select *,sum(weight) as sum from mn_product_detail where pid= {$ids} group by material");
-//        halt($this->detail->buildSql());
-//        halt($row['data']);
+        $status = Db::name('product')->where('id',$ids)->value('status');
         $this->view->assign("row", $row);
+        $this->view->assign("status", $status);
         return $this->view->fetch();
     }
 }

application/admin/view/formula/task.html

@@ -49,7 +49,7 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">机台选择:</label>
-            <select id="c-mid" data-rule="required" class="selectpicker" name="row[mid]">
+            <select id="c-mid" data-rule="required" class="control-label col-xs-12 col-sm-2 selectpicker" name="row[mid]">
                 {foreach name="machineList" item="vo"}
                 <option value="{$vo.id}" {in name="key" value=""}selected{/in}>{$vo.name}</option>
                 {/foreach}

application/admin/view/product/show.html

@@ -100,7 +100,7 @@
                     <tr>
                         <td class="tg-s5vw"></td>
                         <td class="tg-svyg"></td>
-                        <td class="tg-ub5w" colspan="2" rowspan="2">领料单</td>
+                        <td class="tg-ub5w" colspan="2" rowspan="2">{if condition="$status eq 1"}领料单{else/}退料单{/if}</td>
                         <td class="tg-4qqe"></td>
                         <td class="tg-s5vw"></td>
                     </tr>