Pārlūkot izejas kodu

刘功能优化

liuhairui 3 gadi atpakaļ
vecāks
revīzija
718f7e6509

+ 33 - 3
application/admin/controller/Formula.php

@@ -230,7 +230,7 @@ class Formula extends Backend
          * 百分比变更?   ->工艺信息变更生成新配方
          * 工艺变更?
          * $change 0:未更改工艺信息   1:原材料更改  2:百分比更改 3:操作工艺更改    4:增加或减少工艺信息
-        */
+         */
         $base = $this->request->post('baseData/a');
         $formula = $this->request->post('formulaData/a');
 
@@ -386,12 +386,28 @@ class Formula extends Backend
             foreach ($list['gyinfo'] as $key=>$value){
                 $list['gyinfo'][$key]['percentage'] = decode($value['percentage']);
             }
+            //新增关联订单
+            $order = Db::name('order')->where('status','neq',3)->field('id,customer,product,number,completed')->select();
+            $uncompleted_order = array();
+            if (!empty($order)){
+                foreach($order as $k=>$v){
+                    $uncompleted_order[$k]['id'] = $v['id'];
+                    if (empty($v['completed'])){
+                        $completed = 0;
+                    }else{
+                        $completed = $v['completed'];
+                    }
+                    $uncompleted_order[$k]['str'] = $v['id'].'、'.$v['customer'].'-'.$v['product'].'-'.'总数量('.$v['number'].'kg)'.'-' .'已完成('.$completed.'kg)';
+                }
+            }
             $this->view->assign('ids',$ids);
+            $this->view->assign('order',$uncompleted_order);
             $this->view->assign('machineList',\app\admin\model\Machine::select());
             $this->view->assign('row', $list);
             return $this->view->fetch();
         }
         $base = $this->request->post('baseData/a');
+//        print_r($base);die;
         if (empty($base)){
             $this->error('数据不能为空');
         }
@@ -405,11 +421,22 @@ class Formula extends Backend
         $params['number'] = $base[5];
         $params['remark'] = $base[6];
         $params['machine'] = $base[7];
+        $params['oid'] = $base[8];
         $params['create'] = date('Y-m-d H:i:s');
         $result = false;
         Db::startTrans();
         try {
             $result = Db::name('task')->insert($params);
+            //更改订单已完成数量,修改订单状态
+            $order_info = Db::name('order')->where('id',$params['oid'])->find();
+            if (empty($order_info['completed'])){
+                $new_completed = $params['number'];
+                $order_status = 2;//生产中
+                Db::name('order')->where('id',$params['oid'])->setField('status',2);
+            }else{
+                $new_completed = $params['number'] + $order_info['completed'];
+            }
+            Db::name('order')->where('id',$params['oid'])->setField('completed',$new_completed);
             Db::commit();
         } catch (Exception $e) {
             Db::rollback();
@@ -543,7 +570,10 @@ class Formula extends Backend
     }
     //获取工艺说明
     public function gyName(){
-        $data = \app\admin\model\GyName::select();
-        return json($data);
+        $list = Db::name('formula_detail')->where('gy_name','neq','')->field('id,gy_name')->limit(100)->select();
+        $total = count($list);
+        $result = ['total'=>$total,'rows'=>$list];
+//        return array('status'=>1,'rows'=>$list);
+        return json($result);
     }
 }

+ 85 - 0
application/admin/controller/Task.php

@@ -43,8 +43,93 @@ class Task extends Backend
         return $this->view->fetch();
     }
 
+    /**
+     * 生成领料单
+     * @return string
+     * @throws \think\Exception
+     */
+
+    public function taskadd(){
+        $ids = input('ids');//获取作业票id
+        if(empty($ids)){$this->error('异常');}
+        $ids = substr($ids,0,strlen($ids)-1);
+        $id = explode(',',$ids);//逗号分割开
+        $list = [];
+        foreach ($id as $k=>$v){
+            $task[$k]= Db::name('task')->where('id',$v)->find();
+            $list[$k] = Db::name('formula_detail')->where('pid',$task[$k]['fid'])->field('material,percentage')->select();
+        }
+        /*
+         * 根据查到的配方fid去查配方详情表  fid = pid
+         * 解密百分比字段
+         * 根据task['number'] 算出应该领出的数量 应领重量 = 材料百分比/(所有材料百分比相加)*task['number']
+         * 值相加去重
+         */
+        $res = array();
+        foreach ($list as $key=>$value){
+            //查出百分比  相加得出总计百分比
+            $total = Db::name('formula_detail')->where('pid',$task[$key]['fid'])->column('percentage');
+            foreach ($total as $k=>$v){
+                $total[$k] = decode($v);
+            }
+            $num = array_sum($total);//算出所有百分比总数
+            for ($i=0;$i<count($value);$i++){
+                if (!empty($value[$i]['percentage'])) {//判断有没有材料和百分比
+                    $list[$key][$i]['percentage'] = decode($value[$i]['percentage']);
+                    //计算应加入的重量
+                    $list[$key][$i]['num'] = number_format($list[$key][$i]['percentage'] / $num * $task[$key]['number'],3);
+                    array_push($res,$list[$key][$i]);//将数组push到新的需要整合的数组中
+                }else{
+                    unset($list[$key][$i]);
+                }
+            }
+
+            $list[$key] = array_values($list[$key]);
+        }
+        $result = $this->sumWeight($res,'material','num');
+
+//        echo "<pre>";
+//        print_r($task);//一维
+//        echo "</pre>";
+//
+//        echo "<pre>";
+//        print_r($list);//原材料信息
+//        echo "</pre>";
+
+//        echo "<pre>";
+//        print_r($result);//汇总领料单
+//        echo "</pre>";
 
 
+        $this->view->assign("task", $task);//生成领料单配方信息
+        $this->view->assign("list", $list);//生成领料单
+        $this->view->assign("result", $result);//汇总领料单
+        return $this->view->fetch('taskadd');
+    }
+
+    /**
+     * 计算数量,值去重&相加
+     * $arr 数组
+     * $str1 要合并的值
+     * $str2 要计算的值
+     */
+    function sumWeight($arr,$str1,$str2) {
+        $item = array();
+        foreach ($arr as $k => $v) {
+            if (!isset($item[$v[$str1]])) {
+                $item[$v[$str1]] = $v;
+            } else {
+                $item[$v[$str1]][$str2] += $v[$str2];
+            }
+//            if ($k == 13) {
+//                echo "<pre>";
+//                print_r($item);die;
+//                echo "</pre>";
+//            }
+        }
+        return array_values($item);
+    }
+
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑

+ 96 - 84
application/admin/view/formula/task.html

@@ -49,12 +49,24 @@
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">机台选择:</label>
-            <select id="c-mid" data-rule="required" class="control-label col-xs-12 col-sm-2 selectpicker" name="row[mid]">
+        <div class="col-xs-12 col-sm-3">
+            <select id="c-mid" data-rule="required" class="control-label col-xs-12 col-sm-8 selectpicker" name="row[mid]">
                 {foreach name="machineList" item="vo"}
                 <option value="{$vo.id}" {in name="key" value=""}selected{/in}>{$vo.name}</option>
                 {/foreach}
             </select>
+        </div>
+        <label class="control-label col-xs-12 col-sm-1">请选择关联订单:</label>
+        <div class="col-xs-12 col-sm-6">
+            <select id="c-order-uncompleted" data-rule="required" class="control-label col-xs-12 col-sm-24 selectpicker" name="row[uncompleted]">
+                {foreach name="order" item="vo"}
+                <option value="{$vo.id}">{$vo.str}</option>
+                {/foreach}
+            </select>
+        </div>
+
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1"></label>
         <button type="button" id="add" class="btn btn-success">确定生成作业票</button>
@@ -82,89 +94,89 @@
     <!--===========================================================-->
     <div style="display: none">
         <div class="form-group" id="print_area" >
-        <div id="head">
-            <table class="tg" style="width: 800px;">
-                <thead>
-                <div id="qrcode" style="margin:0 0 -450px 500px;width: 80px;height: 80px;">
-                    <img src="" id="myImage" alt=""/>
-                </div>
-                <tr>
-                    <th class="tg-v8dz" colspan="6" >
-                        <!--<p id="formula_no"></p>-->
-                        <!--<hr style="border: 1px solid;margin-top: -5px">-->
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="tg-s5vw"></td>
-                    <td class="tg-svyg"></td>
-                    <td class="tg-ub5w" colspan="2" rowspan="2">作业票&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-                    <td class="tg-4qqe"></td>
-                    <td class="tg-s5vw"></td>
-                </tr>
-                <tr>
-                    <td class="tg-9d8n" style="border: none">日期:</td>
-                    <td class="tg-z7m5" id="date"></td>
-                    <td class="tg-9d8n">开票人</td>
-                    <td class="tg-9d8n">审核</td>
-                </tr>
-                <tr>
-                    <td class="tg-9d8n" style="border: none">批号:</td>
-                    <td class="tg-z7m5" id="bach"></td>
-                    <td class="tg-kghl" style="border: none"><input type="text" id="formula" value="" style="width: 400px;text-align: center"></td>
-                    <td class="tg-0pky"></td>
-                    <td class="tg-x1hj" id="drawer_name"></td>
-                    <td class="tg-x1hj" id="examine_name"></td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-        <div style="height: 20px;"></div>
-        <div id="body">
-            <table class="tg" style="width: 800px;" id="print_gy">
-                            <tr>
-                                <th  style="text-align: center">原材料</th>
-<!--                                <th  style="text-align: center">百分比</th>-->
-                                <th  style="text-align: center">应加量(KG)</th>
-                                <th  style="text-align: center">实加量(KG)</th>
-                                <th  style="text-align: center">操作记录</th>
-                            </tr>
-                            {foreach name='row["gyinfo"]' id='vo'}
-                            <tr>
-                                <td style="width: 100px;text-align: center">{$vo.material}</td>
-<!--                                <td style="width: 100px">{$vo.percentage}</td>-->
-                                <td data-id="{$vo.id}" id="text-{$vo.id}" style="width: 100px;text-align: center"></td>
-                                <td style="width: 100px;text-align: center"></td>
-                                <td style="width: 400px;">{$vo.gy_name}</td>
-                            </tr>
-                            {/foreach}
-                            <tr>
-                                <td style="width: 100px;text-align: center">总计</td>
-                                <td class="total" style="width: 100px;text-align: center"></td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td colspan="5" class="remark"></td>
-                            </tr>
-                        </table>
-            <div style="height: 5px;"></div>
-            <table class="tg" style="width: 800px;">
-                <tr>
-                    <td style="border: none">
-                        <span>包装规格:</span>
-                        <hr style="border: 1px solid;width: 150px;margin-top: -5px;">
-                        <div style="position: absolute;margin-left: 270px;margin-top: -36px;">KG/桶</div>
-                    </td>
-                    <td style="border: none">作业票回收日期:<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
-                </tr>
-                <tr>
-                    <td style="border: none">操作人员:<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
-                    <td style="border: none">检验签字:<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
-                </tr>
-            </table>
-        </div>
+            <div id="head">
+                <table class="tg" style="width: 800px;">
+                    <thead>
+                    <div id="qrcode" style="margin:0 0 -450px 500px;width: 80px;height: 80px;">
+                        <img src="" id="myImage" alt=""/>
+                    </div>
+                    <tr>
+                        <th class="tg-v8dz" colspan="6" >
+                            <!--<p id="formula_no"></p>-->
+                            <!--<hr style="border: 1px solid;margin-top: -5px">-->
+                        </th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td class="tg-s5vw"></td>
+                        <td class="tg-svyg"></td>
+                        <td class="tg-ub5w" colspan="2" rowspan="2">作业票&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+                        <td class="tg-4qqe"></td>
+                        <td class="tg-s5vw"></td>
+                    </tr>
+                    <tr>
+                        <td class="tg-9d8n" style="border: none">日期:</td>
+                        <td class="tg-z7m5" id="date"></td>
+                        <td class="tg-9d8n">开票人</td>
+                        <td class="tg-9d8n">审核</td>
+                    </tr>
+                    <tr>
+                        <td class="tg-9d8n" style="border: none">批号:</td>
+                        <td class="tg-z7m5" id="bach"></td>
+                        <td class="tg-kghl" style="border: none"><input type="text" id="formula" value="" style="width: 400px;text-align: center"></td>
+                        <td class="tg-0pky"></td>
+                        <td class="tg-x1hj" id="drawer_name"></td>
+                        <td class="tg-x1hj" id="examine_name"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div style="height: 20px;"></div>
+            <div id="body">
+                <table class="tg" style="width: 800px;" id="print_gy">
+                    <tr>
+                        <th  style="text-align: center">原材料</th>
+                        <!--                                <th  style="text-align: center">百分比</th>-->
+                        <th  style="text-align: center">应加量(KG)</th>
+                        <th  style="text-align: center">实加量(KG)</th>
+                        <th  style="text-align: center">操作记录</th>
+                    </tr>
+                    {foreach name='row["gyinfo"]' id='vo'}
+                    <tr>
+                        <td style="width: 100px;text-align: center">{$vo.material}</td>
+                        <!--                                <td style="width: 100px">{$vo.percentage}</td>-->
+                        <td data-id="{$vo.id}" id="text-{$vo.id}" style="width: 100px;text-align: center"></td>
+                        <td style="width: 100px;text-align: center"></td>
+                        <td style="width: 400px;">{$vo.gy_name}</td>
+                    </tr>
+                    {/foreach}
+                    <tr>
+                        <td style="width: 100px;text-align: center">总计</td>
+                        <td class="total" style="width: 100px;text-align: center"></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr>
+                        <td colspan="5" class="remark"></td>
+                    </tr>
+                </table>
+                <div style="height: 5px;"></div>
+                <table class="tg" style="width: 800px;">
+                    <tr>
+                        <td style="border: none">
+                            <span>包装规格:</span>
+                            <hr style="border: 1px solid;width: 150px;margin-top: -5px;">
+                            <div style="position: absolute;margin-left: 270px;margin-top: -36px;">KG/桶</div>
+                        </td>
+                        <td style="border: none">作业票回收日期:<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
+                    </tr>
+                    <tr>
+                        <td style="border: none">操作人员:<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
+                        <td style="border: none">检验签字:<hr style="border: 1px solid;width: 150px;margin-top: -5px;"></td>
+                    </tr>
+                </table>
+            </div>
         </div>
     </div>
     <div class="form-group layer-footer">

+ 23 - 15
application/admin/view/order/add.html

@@ -36,6 +36,12 @@
             <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="number">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Completed')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-completed" class="form-control" name="row[completed]" type="text">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -43,12 +49,18 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-<!--            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text">-->
-            <input id="c-delivery_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[delivery_date]" type="text" value="">
+
+            <div class="radio">
+                {foreach name="statusList" item="vo"}
+                <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label>
+                {/foreach}
+            </div>
+
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -58,7 +70,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Date')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[date]" type="text" value="{:date('Y-m-d')}">
+            <input id="c-date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[date]" type="text" value="{:date('Y-m-d H:m:s')}">
         </div>
     </div>
     <div class="form-group">
@@ -73,18 +85,7 @@
             <input id="c-examine" data-rule="required" class="form-control" name="row[examine]" type="text">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
 
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -97,6 +98,13 @@
             <input id="c-update" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <!--            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text">-->
+            <input id="c-delivery_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[delivery_date]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 17 - 10
application/admin/view/order/edit.html

@@ -36,6 +36,12 @@
             <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Completed')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-completed" data-rule="required" class="form-control" name="row[completed]" type="text" value="{$row.completed|htmlentities}">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -43,11 +49,18 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text" value="{$row.delivery_date|htmlentities}">
+
+            <div class="radio">
+                {foreach name="statusList" item="vo"}
+                <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label>
+                {/foreach}
+            </div>
+
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -73,15 +86,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
         <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
+            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text" value="{$row.delivery_date|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 7 - 4
application/admin/view/task/index.html

@@ -7,10 +7,11 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="#" class="btn btn-success"  id="button" >生成领料单</a>
                         <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('task/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
                         <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('task/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
                         <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('task/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
-                        
+
 
                         <div class="dropdown btn-group {:$auth->check('task/multi')?'':'hide'}">
                             <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
@@ -20,12 +21,14 @@
                             </ul>
                         </div>
 
-                        
+
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
-                           data-operate-edit="{:$auth->check('task/edit')}"
-                           data-operate-del="{:$auth->check('task/del')}"
+                           data-operate-edit=""
+                           data-operate-del=""
                            width="100%">
+                        <!--data-operate-edit="{:$auth->check('task/edit')}"-->
+                        <!--data-operate-del="{:$auth->check('task/del')}"-->
                     </table>
                 </div>
             </div>

+ 3 - 2
public/assets/js/backend/order.js

@@ -35,13 +35,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'specs', title: __('Specs'), operate: 'LIKE'},
                         {field: 'unit', title: __('Unit'), operate: 'LIKE'},
                         {field: 'number', title: __('Number')},
+                        {field: 'completed', title: __('Completed'), operate: 'LIKE'},
                         {field: 'price', title: __('Price'), operate: 'LIKE'},
-                        {field: 'delivery_date', title: __('Delivery_date'), operate: 'LIKE'},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('计划中'),"2":__('生产中'),"3":__('已完成')}, formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE'},
                         {field: 'date', title: __('Date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'user_name', title: __('User_name'), operate: 'LIKE'},
                         {field: 'examine', title: __('Examine'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('计划中'),"2":__('生产中'),"3":__('已完成')}, formatter: Table.api.formatter.status},
+                        {field: 'delivery_date', title: __('Delivery_date'), operate: 'LIKE'},
                         // {field: 'create', title: __('Create'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         // {field: 'update', title: __('Update'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         // {field: 'company_id', title: __('Company_id')},

+ 14 - 1
public/assets/js/backend/task.js

@@ -50,7 +50,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     ]
                 ]
             });
-
+            $("#button").on("click",function(){
+                var temp=table.bootstrapTable('getSelections');//获取复选框id中信息
+                var ids = '';
+                for (i=0;i<temp.length;i++){
+                    ids += temp[i].id+',';
+                }
+                if (ids == ''){return false;}
+                Fast.config.openArea = ['100%','100%'];
+                Fast.api.open("task/taskadd?ids="+ids, "生成领料单", {//将id传控制器
+                });
+            });
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
@@ -60,6 +70,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        taskadd: function () {
+            Controller.api.bindevent();
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));