فهرست منبع

刘功能优化

liuhairui 3 سال پیش
والد
کامیت
7057db3b1f
2فایلهای تغییر یافته به همراه4 افزوده شده و 5 حذف شده
  1. 2 3
      application/admin/controller/Task.php
  2. 2 2
      application/admin/view/task/show.html

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

@@ -27,7 +27,6 @@ class Task extends Backend
 
 
 
-
     /**
      * 生产管理 作业票列表查看
      */
@@ -35,8 +34,8 @@ class Task extends Backend
     {
         $row = $this->model->get($ids);
         $this->view->assign("row", $row);
-        $task = Db::name('task')->where('id',$ids)->find();
-        $formula_detail['detail']  = Db::name('formula_detail')->where('pid',$task['fid'])->select();
+        $formula_detail['data'] = Db::name('task')->where('id',$ids)->find();
+        $formula_detail['detail']  = Db::name('formula_detail')->where('pid',$formula_detail['data']['fid'])->select();
         foreach ($formula_detail['detail'] as $key=>$value){
             $formula_detail['detail'][$key]['percentage'] = decode($value['percentage']);
         }

+ 2 - 2
application/admin/view/task/show.html

@@ -46,7 +46,7 @@
             <tr>
                 <th class="col-xs-12 col-sm-1">批次号</th>
                 <th class="col-xs-12 col-sm-1">原材料</th>
-                <th class="col-xs-12 col-sm-1">百分比</th> 
+                <th class="col-xs-12 col-sm-1">百分比</th>
                 <th class="col-xs-12 col-sm-5">操作工艺说明</th>
                 <th class="col-xs-12 col-sm-1">工序</th>
                 <th class="col-xs-12 col-sm-1">版本号</th>
@@ -55,7 +55,7 @@
             </tr>
             {foreach name='formula_detail.detail' item='vo'}
             <tr>
-                <td><input class='form-control' style="text-align: center" type="text" readonly value="{$vo.pid}"></td>
+                <td><input class='form-control' style="text-align: center" type="text" readonly value="{$formula_detail['data']['bach']}"></td>
                 <td><input class='form-control' style="text-align: center" type="text" readonly value="{$vo.material}"></td>
                 <td><input class='form-control' style="text-align: center" type="text" readonly value="{$vo.percentage}"></td>
                 <td><input class='form-control' type="text" readonly value="{$vo.gy_name}"></td>