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

配方管理功能

huangsanjia 3 éve
szülő
commit
765ac2a641

+ 56 - 2
application/admin/controller/Formula.php

@@ -60,6 +60,7 @@ class Formula extends Backend
         $map = [];
         if ($user_info['id'] !== 1){
             $map['company_id'] = $user_info['company_id'];
+            $map['examine_status'] = 1;
         }
         $list = $this->model
             ->where($where)
@@ -185,6 +186,7 @@ class Formula extends Backend
             $this->view->assign('ids',$ids);
             $this->view->assign('name',$name);
             $this->view->assign('row', $list);
+
             return $this->view->fetch();
         }
         /**
@@ -335,13 +337,41 @@ class Formula extends Backend
         }
         if (false === $this->request->isPost()) {
             $list = Db::name('formula')->where('id',$ids)->find();
-
-            $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('material,percentage,gy_name,gy_num')->select();
+            $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('id,material,percentage,gy_name,gy_num')->select();
             $this->view->assign('ids',$ids);
             $this->view->assign('row', $list);
             return $this->view->fetch();
         }
+        $base = $this->request->post('baseData/a');
+        if (empty($base)){
+            $this->error('数据不能为空');
+        }
+        //基础数据
+        $params = [];
+        $params['fid'] = $base[0];
+        $params['name'] = $base[1];
+        $params['bach'] = $base[2];
+        $params['drawer_name'] = $base[3];
+        $params['examine_name'] = $base[4];
+        $params['number'] = $base[5];
+        $params['remark'] = $base[6];
+        $params['create'] = date('Y-m-d H:i:s');
+        $result = false;
+        Db::startTrans();
+        try {
+            $result = Db::name('task')->insert($params);
+            Db::commit();
+        } catch (Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if (false === $result) {
+            $this->error(__('No rows were updated'));
+        }
+        $this->success();
+
     }
+    //下拉选择获取客户列表
     public function getCustomer(){
         $user_info = Session::get('admin');
         $where = [];
@@ -352,4 +382,28 @@ class Formula extends Backend
         $result = ['total' => count($row), 'rows' => $row];
         return json($result);
     }
+    //获取生产单应加量
+    public function getNumber(){
+        $params = input('');
+        if ($params['ids'] == '' || $params['number'] == '' || !is_numeric($params['number'])){
+            return array('status'=>0,'msg'=>'请求参数错误');
+        }
+        $list = Db::name('formula')->where('id',$params['ids'])->find();
+        $gyinfo= Db::name('formula_detail')->where('pid',$params['ids'])->where('version',$list['version'])->field('id,material,percentage')->select();
+        if (empty($gyinfo)){
+            return array('status'=>0,'msg'=>'数据错误');
+        }
+        $total = Db::name('formula_detail')->where('pid',$params['ids'])->where('version',$list['version'])->sum('percentage');
+        if (empty($total)){
+            return array('status'=>0,'msg'=>'数据错误');
+        }
+        foreach ($gyinfo as $key=>$value){
+            $gyinfo[$key]['num'] = '';
+            if (!empty($value['percentage'])){
+                $gyinfo[$key]['num'] = number_format($value['percentage'] / $total * $params['number'],3);
+            }
+        }
+        $date = date('Y/m/d');
+        return array('status'=>1,'data'=>$gyinfo,'formula_no'=>$list['formula_no'],'date'=>$date);
+    }
 }

+ 125 - 1
application/admin/view/formula/edit.html

@@ -1,3 +1,21 @@
+<style type="text/css">
+    .tg  {border-collapse:collapse;border-spacing:0;}
+    .tg td{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
+        overflow:hidden;padding:10px 5px;word-break:normal;}
+    .tg th{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
+        font-weight:normal;overflow:hidden;padding:10px 5px;word-break:normal;}
+    .tg .tg-ub5w{font-size:36px;text-align:center;vertical-align:middle}
+    .tg .tg-x1hj{font-size:22px;text-align:left;vertical-align:top}
+    .tg .tg-kghl{font-size:22px;text-align:left;vertical-align:middle}
+    .tg .tg-z7m5{font-size:22px;text-align:left;text-decoration:underline;vertical-align:top}
+    .tg .tg-s5vw{font-size:22px;font-weight:bold;text-align:center;vertical-align:bottom}
+    .tg .tg-v8dz{font-size:24px;text-align:left;vertical-align:top}
+    .tg .tg-svyg{font-size:22px;font-weight:bold;text-align:left;text-decoration:underline;vertical-align:bottom}
+    .tg .tg-4qqe{font-size:22px;font-weight:bold;text-align:center;vertical-align:top}
+    .tg .tg-9d8n{font-size:22px;text-align:left;vertical-align:top}
+    .tg .tg-0pky{text-align:left;vertical-align:top;border: none;}
+</style>
+
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
@@ -71,12 +89,118 @@
             {/foreach}
         </table>
     </div>
+    <div >
+        <div class="form-group" id="print_area" >
+            <div id="head">
+                <table class="tg"  style="width: 800px;">
+                    <thead>
+                    <tr>
+                        <th class="tg-v8dz" colspan="6" style="border: none"><p id="no">MN/****</p>
+                            <hr style="border: 1px solid;margin-top: -5px"></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td class="tg-s5vw"  style="border: none"></td>
+                        <td class="tg-svyg"  style="border: none"></td>
+                        <td class="tg-ub5w" colspan="2" rowspan="2"  style="border: none">配方单</td>
+                        <td class="tg-4qqe"  style="border: none"></td>
+                        <td class="tg-s5vw"  style="border: none"></td>
+                    </tr>
+                    <tr>
+                        <td class="tg-9d8n"  style="border: none">日期:</td>
+                        <td class="tg-z7m5" id="date" style="border: none"></td>
+                        <td class="tg-9d8n">担当人</td>
+                        <td class="tg-9d8n">审核</td>
+                    </tr>
+                    <tr>
+                        <td class="tg-x1hj"  style="border: none">编号:</td>
+                        <td class="tg-z7m5" id="formula_no" style="border: none"></td>
+                        <td class="tg-kghl"  style="border: none"><input id="formula" value="" style="width: 400px;text-align: center"></td>
+                        <td class="tg-0pky" style="border: none" ></td>
+                        <td class="tg-x1hj" id="charge_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">
+
+
+                </table>
+            </div>
+        </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">
             <button type="submit" class="btn btn-primary btn-embossed disabled submit">{:__('OK')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+            <button type="button" class="btn btn-default btn-embossed  print-link">打印预览</button>
         </div>
     </div>
 </form>
+<script type='text/javascript' src='__CDN__/assets/js/jquery2.1.1.min.js'></script>
+<script type="text/javascript" src="__CDN__/assets/js/jquery.qrcode.min.js"></script>
+<script type="text/javascript" src="__CDN__/assets/js/jQuery.print.js"></script>
+<script >
+
+    jQuery(function($) { 'use strict';
+
+        $(".print-link").on('click', function() {
+            //给打印界面赋值
+            var remark = $('#c-remark').val();
+            remark = '备注:'+remark;
+            $('.remark').text(remark);
+            //给打印表头赋值
+            var formula = $('#c-name').val();
+            $('#formula').val(formula);
+            var formula_no = $('#c-formula_no').val();
+            $('#formula_no').text(formula_no);
+            var charge_name = $('#c-charge_name').val();
+            $('#charge_name').text(charge_name);
+            var examine_name = $('#c-examine_name').val();
+            $('#examine_name').text(examine_name);
+            var date = $('#c-date').val();
+            $('#date').text(date);
+            var html = '';
+            html += '<tr><td style="width: 100px;text-align: center">原材料</td><td  style="width: 100px;text-align: center">百分比</td><td style="width: 400px;text-align: center">操作工艺说明</td></tr>';
+            var sum = 0;
+            var formulaTrList = $("#gy").find("tr");//行数
+            for (var i = 1; i < formulaTrList.length; i++) {
+                var formulaTrArr=formulaTrList.eq(i);
+                var tdOne = formulaTrArr.children("td").eq(0).find("input").val();
+                var tdTwo = formulaTrArr.children("td").eq(1).find("input").val();
+                var tdThr = formulaTrArr.children("td").eq(2).find("input").val();
+                html += '<tr ><td style="width: 100px;text-align: center">'+tdOne+'</td>';
+                html += '<td style="width: 50px;text-align: center">'+tdTwo+'</td>';
+                html += '<td style="width: 400px;">'+tdThr+'</td>';
+                sum = sum + tdTwo * 1000;
+            }
+            sum = sum / 1000;
+            html += '<tr><td style="width: 100px;text-align: center">总计</td><td class="total" style="width: 100px;text-align: center">'+sum+'</td><td class="remark"></td></tr>';
+
+            $('#print_gy').html(html)
+            // createQrcode(bach,80,80);
+            // var img = document.getElementById("myImage"); /// get image element
+            // var canvas = document.getElementsByTagName('canvas')[0];
+            // img.src = canvas.toDataURL();                     /// update image
+            $.print('#print_area');
+            return false;
+        });
+        function createQrcode(txt,width,height) {
+            $("#qrcode").qrcode({
+                render: "canvas",//canvas和table两种渲染方式
+                width: width,
+                height: height,
+                correctLevel:2,//二维码纠错级别
+                background:"#ffffff",//背景颜色
+                foreground:"#000000", //二维码颜色
+                text:txt
+            });
+        }
+    });
+</script>
 

+ 160 - 31
application/admin/view/formula/task.html

@@ -1,19 +1,36 @@
+<style type="text/css">
+    .tg  {border-collapse:collapse;border-spacing:0;}
+    .tg td{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
+        overflow:hidden;padding:10px 5px;word-break:normal;}
+    .tg th{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;
+        font-weight:normal;overflow:hidden;padding:10px 5px;word-break:normal;}
+    .tg .tg-ub5w{font-size:36px;text-align:center;vertical-align:middle;border: none}
+    .tg .tg-x1hj{font-size:22px;text-align:left;vertical-align:top;}
+    .tg .tg-kghl{font-size:22px;text-align:left;vertical-align:middle;}
+    .tg .tg-z7m5{font-size:22px;text-align:left;text-decoration:underline;vertical-align:top;border: none}
+    .tg .tg-s5vw{font-size:22px;font-weight:bold;text-align:center;vertical-align:bottom;border: none}
+    .tg .tg-v8dz{font-size:24px;text-align:left;vertical-align:top;border: none}
+    .tg .tg-svyg{font-size:22px;font-weight:bold;text-align:left;text-decoration:underline;vertical-align:bottom;border: none}
+    .tg .tg-4qqe{font-size:22px;font-weight:bold;text-align:center;vertical-align:top;border: none}
+    .tg .tg-9d8n{font-size:22px;text-align:left;vertical-align:top;}
+    .tg .tg-0pky{text-align:left;vertical-align:top;border: none}
+</style>
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
     <div class="form-group">
+        <input style="display: none" id="ids" value="{$ids}">
         <label class="control-label col-xs-12 col-sm-1">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row['name']}" readonly>
         </div>
-        <label class="control-label col-xs-12 col-sm-1">编号:</label>
+        <label class="control-label col-xs-12 col-sm-1">批次号:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-formula_no" class="form-control" name="row[formula_no]" type="text">
+            <input id="c-bach" class="form-control" name="row[bach]" type="text">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-1">{:__('Charge_name')}:</label>
+        <label class="control-label col-xs-12 col-sm-1">开票人:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-charge_name" data-rule="required" class="form-control" name="row[charge_name]" type="text">
+            <input id="c-drawer_name" data-rule="required" class="form-control" name="row[drawer_name]" type="text">
         </div>
         <label class="control-label col-xs-12 col-sm-1">{:__('Examine_name')}:</label>
         <div class="col-xs-12 col-sm-3">
@@ -21,50 +38,162 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-1">{:__('Remark')}:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input id="c-remark" class="form-control" name="row[remark]" type="text">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-1">{:__('Version')}:</label>
+        <label class="control-label col-xs-12 col-sm-1">生产量(KG):</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-version" data-rule="required" class="form-control" name="row[version]" type="text" value="v1.0" readonly>
+            <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text">
         </div>
-        <label class="control-label col-xs-12 col-sm-1">{:__('Date')}:</label>
+        <label class="control-label col-xs-12 col-sm-1">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-date" class="form-control datetimepicker" name="row[date]" type="text" data-date-format="YYYY-MM-DD" data-use-current="true" value="{:date('Y-m-d')}">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-1">可用性:</label>
-        <div class="col-xs-12 col-sm-7">
-            <input id="c-usability" class="form-control selectpage"  data-multiple="true"  data-source="formula/getCustomer" data-field="customer_name" name="row[usability]" type="text" value="" placeholder="请选择配方对应客户,不选默认全部客户可用">
+            <input id="c-remark" class="form-control" name="row[remark]" type="text">
         </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>
+        <label class="control-label col-xs-12 col-sm-1"></label>
+        <button type="button" id="add" class="btn btn-success">确定生成</button>
     </div>
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
             <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-8">操作工艺说明</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-1">应加量(KG)</th>
+                <th class="col-xs-12 col-sm-6">操作记录</th>
+                <th class="col-xs-12 col-sm-1">工序号</th>
+            </tr>
+            {foreach name='row["gyinfo"]' id='vo'}
+            <tr>
+                <td><input  class="form-control material" type="text" value="{$vo.material}" readonly></td>
+                <td><input  class="form-control percentage" type="text" value="{$vo.percentage}" readonly></td>
+                <td><input  class="form-control num" type="text" data-id="{$vo.id}" id="input-{$vo.id}" value="" readonly></td>
+                <td><input  class="form-control gy_name" type="text" value="{$vo.gy_name}" readonly></td>
+                <td><input  class="form-control gy_num" type="text" value="{$vo.gy_num}" readonly></td>
             </tr>
+            {/foreach}
         </table>
     </div>
+    <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 -50px 650px;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">作业票</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">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-primary btn-embossed disabled submit">{:__('OK')}</button>
-            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+            <button type="button" class="btn btn-default btn-embossed  print-link">打印预览</button>
         </div>
     </div>
 </form>
 
+<script type='text/javascript' src='__CDN__/assets/js/jquery2.1.1.min.js'></script>
+<script type="text/javascript" src="__CDN__/assets/js/jquery.qrcode.min.js"></script>
+<script type="text/javascript" src="__CDN__/assets/js/jQuery.print.js"></script>
+<script >
+
+    jQuery(function($) { 'use strict';
+
+        $(".print-link").on('click', function() {
+
+            var bach = $('#c-bach').val();
+            createQrcode(bach,80,80);
+            var img = document.getElementById("myImage"); /// get image element
+            var canvas = document.getElementsByTagName('canvas')[0];
+            img.src = canvas.toDataURL();                     /// update image
+            $.print('#print_area');
+            return false;
+        });
+        function createQrcode(txt,width,height) {
+            $("#qrcode").qrcode({
+                render: "canvas",//canvas和table两种渲染方式
+                width: width,
+                height: height,
+                correctLevel:2,//二维码纠错级别
+                background:"#ffffff",//背景颜色
+                foreground:"#000000", //二维码颜色
+                text:txt
+            });
+        }
+    });
+</script>

+ 121 - 2
public/assets/js/backend/formula.js

@@ -46,8 +46,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'create', title: __('Create'),operate: false, addclass:'datetimerange', autocomplete:false},
                         {field: 'operate', title: '操作',  buttons:[{
                                 name:'task',
-                                text:'生成作业',
-                                title:'生成作业',
+                                text:'生成作业',
+                                title:'生成作业',
                                 icon:'fa fa-add',
                                 extend: 'data-area=["100%","100%"]',
                                 classname:'btn btn-xs btn-info btn-fields btn-dialog task',
@@ -186,6 +186,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             $(document).on('click','.del',function () {
                 $(this).parent().parent().remove();
             });
+
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
                 Form.api.bindevent($("form[role=form]"), function(data, ret){
@@ -280,7 +281,125 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
         },
         task: function () {
+            $('#add').click(function () {
+                //配方获取和计算
+                var ids = $('#ids').val();
+                var number = $('#c-number').val();
+                if (number == ''){
+                    layer.confirm('生产量不能为空');
+                    return false;
+                }
+                //给打印界面赋值
+                $('.total').text(number);
+                var remark = $('#c-remark').val();
+                remark = '备注:'+remark;
+                $('.remark').text(remark);
+                //给打印表头赋值
+                var bach = $('#c-bach').val();
+                $('#bach').text(bach);
+                var formula = $('#c-name').val();
+                $('#formula').val(formula);
+                var drawer_name = $('#c-drawer_name').val();
+                $('#drawer_name').text(drawer_name);
+                var examine_name = $('#c-examine_name').val();
+                $('#examine_name').text(examine_name);
+                $.ajax({
+                    type: "POST",
+                    url: "formula/getNumber",
+                    data: {
+                        'ids': ids,
+                        'number': number
+                    },
+                    success:function(data) {
+                        if (1 == data.status)
+                        {
+                            var formulaTrList = $("#gy").find("tr");//行数
+                            for (var i = 1; i < formulaTrList.length; i++) {
+                                var formulaTrArr=formulaTrList.eq(i);
+                                var id = formulaTrArr.children("td").eq(2).find('input').attr('data-id');//应加量
+                                $.each(data.data,function (key,value){
+                                    if (id == value.id){
+                                        $('#input-'+id).val(value.num);
+                                    }
+                                })
+                            }
+
+                            var print_gyList = $("#print_gy").find("tr");//行数
+                            for (var i = 1; i < print_gyList.length; i++) {
+                                var formulaTrArr=print_gyList.eq(i);
+                                var id = formulaTrArr.children("td").eq(1).attr('data-id');//应加量
+                                $.each(data.data,function (key,value){
+                                    if (id == value.id){
+                                        $('#text-'+id).text(value.num);
+                                    }
+                                })
+                            }
+                            $('#formula_no').text(data.formula_no);
+                            $('#date').text(data.date);
+
+                        }else {
+                            layer.confirm(data.msg);
+                        }
+                    }
+                })
+            })
+
             Controller.api.bindevent();
+            $(document).on('click','.submit',function () {
+                Form.api.bindevent($("form[role=form]"), function(data, ret){
+                    Toastr.success('111');//成功
+                }, function(data, ret){
+                    Toastr.success("222");
+                }, function(success, error){
+                    var verify = 1;
+                    var ids = $('#ids').attr('value');
+                    var name = $('#c-name').val();
+                    if (name == '' || name== undefined) {
+                        verify = -1;
+                    }
+                    var bach = $('#c-bach').val();
+                    if (bach == '' || bach== undefined) {
+                        verify = -1;
+                    }
+                    var drawer_name = $('#c-drawer_name').val();
+                    if (drawer_name == '' || drawer_name== undefined) {
+                        verify = -1;
+                    }
+                    var examine_name = $('#c-examine_name').val();
+                    if (examine_name == '' || examine_name== undefined) {
+                        verify = -1;
+                    }
+                    var number = $('#c-number').val();
+                    var remark = $('#c-remark').val();
+                    if (verify == -1){
+                        layer.confirm("数据格式不对,请仔细核查!");return false;
+                    }
+                    //基础数据
+                    var baseData = [];
+                    baseData.push(ids);
+                    baseData.push(name);
+                    baseData.push(bach);
+                    baseData.push(drawer_name);
+                    baseData.push(examine_name);
+                    baseData.push(number);
+                    baseData.push(remark);
+                    Fast.api.ajax({
+                        url:'formula/task?ids='+ids,
+                        data:{baseData:baseData}
+                    },function (data,ret) {
+                        //成功回调
+                        parent.Toastr.success("添加成功");
+                        Fast.api.close();
+                        parent.Fast.api.refreshmenu();
+                        return false;
+                    },function (data,ret) {
+                        parent.Toastr.error("添加失败");
+                        Fast.api.close();
+                        return false;
+                    });
+                    return false;
+                });
+            });
         },
         api: {
             bindevent: function () {

+ 279 - 0
public/assets/js/jQuery.print.js

@@ -0,0 +1,279 @@
+/* @license 
+ * jQuery.print, version 1.6.0
+ *  (c) Sathvik Ponangi, Doers' Guild
+ * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
+ *--------------------------------------------------------------------------*/
+(function ($) {
+    "use strict";
+    // A nice closure for our definitions
+
+    function jQueryCloneWithSelectAndTextAreaValues(elmToClone, withDataAndEvents, deepWithDataAndEvents) {
+        // Replacement jQuery clone that also clones the values in selects and textareas as jQuery doesn't for performance reasons - https://stackoverflow.com/questions/742810/clone-isnt-cloning-select-values
+        // Based on https://github.com/spencertipping/jquery.fix.clone
+        var $elmToClone = $(elmToClone),
+            $result           = $elmToClone.clone(withDataAndEvents, deepWithDataAndEvents),
+            $myTextareas     = $elmToClone.find('textarea').add($elmToClone.filter('textarea')),
+            $resultTextareas = $result.find('textarea').add($result.filter('textarea')),
+            $mySelects       = $elmToClone.find('select').add($elmToClone.filter('select')),
+            $resultSelects   = $result.find('select').add($result.filter('select')),
+            i, l, j, m;
+
+        for (i = 0, l = $myTextareas.length; i < l; ++i) {
+            $($resultTextareas[i]).val($($myTextareas[i]).val());
+        }
+        for (i = 0, l = $mySelects.length;   i < l; ++i) {
+            for (j = 0, m = $mySelects[i].options.length; j < m; ++j) {
+                if ($mySelects[i].options[j].selected === true) {
+                    $resultSelects[i].options[j].selected = true;
+                }
+            }
+        }
+        return $result;
+    }
+
+    function getjQueryObject(string) {
+        // Make string a vaild jQuery thing
+        var jqObj = $("");
+        try {
+            jqObj = jQueryCloneWithSelectAndTextAreaValues(string);
+        } catch (e) {
+            jqObj = $("<span />")
+                .html(string);
+        }
+        return jqObj;
+    }
+
+    function printFrame(frameWindow, content, options) {
+        // Print the selected window/iframe
+        var def = $.Deferred();
+        try {
+            frameWindow = frameWindow.contentWindow || frameWindow.contentDocument || frameWindow;
+            var wdoc = frameWindow.document || frameWindow.contentDocument || frameWindow;
+            if(options.doctype) {
+                wdoc.write(options.doctype);
+            }
+            wdoc.write(content);
+            wdoc.close();
+            var printed = false,
+                callPrint = function () {
+                    if(printed) {
+                        return;
+                    }
+                    // Fix for IE : Allow it to render the iframe
+                    frameWindow.focus();
+                    try {
+                        // Fix for IE11 - printng the whole page instead of the iframe content
+                        if (!frameWindow.document.execCommand('print', false, null)) {
+                            // document.execCommand returns false if it failed -http://stackoverflow.com/a/21336448/937891
+                            frameWindow.print();
+                        }
+                        // focus body as it is losing focus in iPad and content not getting printed
+                        $('body').focus();
+                    } catch (e) {
+                        frameWindow.print();
+                    }
+                    frameWindow.close();
+                    printed = true;
+                    def.resolve();
+                };
+            // Print once the frame window loads - seems to work for the new-window option but unreliable for the iframe
+            $(frameWindow).on("load", callPrint);
+            // Fallback to printing directly if the frame doesn't fire the load event for whatever reason
+            setTimeout(callPrint, options.timeout);
+        } catch (err) {
+            def.reject(err);
+        }
+        return def;
+    }
+
+    function printContentInIFrame(content, options) {
+        var $iframe = $(options.iframe + "");
+        var iframeCount = $iframe.length;
+        if (iframeCount === 0) {
+            // Create a new iFrame if none is given
+            $iframe = $('<iframe height="0" width="0" border="0" wmode="Opaque"/>')
+                .prependTo('body')
+                .css({
+                    "position": "absolute",
+                    "top": -999,
+                    "left": -999
+                });
+        }
+        var frameWindow = $iframe.get(0);
+        return printFrame(frameWindow, content, options)
+            .done(function () {
+                // Success
+                setTimeout(function () {
+                    // Wait for IE
+                    if (iframeCount === 0) {
+                        // Destroy the iframe if created here
+                        $iframe.remove();
+                    }
+                }, 1000);
+            })
+            .fail(function (err) {
+                // Use the pop-up method if iframe fails for some reason
+                console.error("Failed to print from iframe", err);
+                printContentInNewWindow(content, options);
+            })
+            .always(function () {
+                try {
+                    options.deferred.resolve();
+                } catch (err) {
+                    console.warn('Error notifying deferred', err);
+                }
+            });
+    }
+
+    function printContentInNewWindow(content, options) {
+        // Open a new window and print selected content
+        var frameWindow = window.open();
+        return printFrame(frameWindow, content, options)
+            .always(function () {
+                try {
+                    options.deferred.resolve();
+                } catch (err) {
+                    console.warn('Error notifying deferred', err);
+                }
+            });
+    }
+
+    function isNode(o) {
+        /* http://stackoverflow.com/a/384380/937891 */
+        return !!(typeof Node === "object" ? o instanceof Node : o && typeof o === "object" && typeof o.nodeType === "number" && typeof o.nodeName === "string");
+    }
+    $.print = $.fn.print = function () {
+        // Print a given set of elements
+        var options, $this, self = this;
+        // console.log("Printing", this, arguments);
+        if (self instanceof $) {
+            // Get the node if it is a jQuery object
+            self = self.get(0);
+        }
+        if (isNode(self)) {
+            // If `this` is a HTML element, i.e. for
+            // $(selector).print()
+            $this = $(self);
+            if (arguments.length > 0) {
+                options = arguments[0];
+            }
+        } else {
+            if (arguments.length > 0) {
+                // $.print(selector,options)
+                $this = $(arguments[0]);
+                if (isNode($this[0])) {
+                    if (arguments.length > 1) {
+                        options = arguments[1];
+                    }
+                } else {
+                    // $.print(options)
+                    options = arguments[0];
+                    $this = $("html");
+                }
+            } else {
+                // $.print()
+                $this = $("html");
+            }
+        }
+        // Default options
+        var defaults = {
+            globalStyles: true,
+            mediaPrint: false,
+            stylesheet: null,
+            noPrintSelector: ".no-print",
+            iframe: true,
+            append: null,
+            prepend: null,
+            manuallyCopyFormValues: true,
+            deferred: $.Deferred(),
+            timeout: 750,
+            title: null,
+            doctype: '<!doctype html>'
+        };
+        // Merge with user-options
+        options = $.extend({}, defaults, (options || {}));
+        var $styles = $("");
+        if (options.globalStyles) {
+            // Apply the stlyes from the current sheet to the printed page
+            $styles = $("style, link, meta, base, title");
+        } else if (options.mediaPrint) {
+            // Apply the media-print stylesheet
+            $styles = $("link[media=print]");
+        }
+        if (options.stylesheet) {
+            // Add a custom stylesheet if given
+            $styles = $.merge($styles, $('<link rel="stylesheet" href="' + options.stylesheet + '">'));
+        }
+        // Create a copy of the element to print
+        var copy = jQueryCloneWithSelectAndTextAreaValues($this);
+        // Wrap it in a span to get the HTML markup string
+        copy = $("<span/>")
+            .append(copy);
+        // Remove unwanted elements
+        copy.find(options.noPrintSelector)
+            .remove();
+        // Add in the styles
+        copy.append(jQueryCloneWithSelectAndTextAreaValues($styles));
+        // Update title
+        if (options.title) {
+            var title = $("title", copy);
+            if (title.length === 0) {
+                title = $("<title />");
+                copy.append(title);                
+            }
+            title.text(options.title);            
+        }
+        // Appedned content
+        copy.append(getjQueryObject(options.append));
+        // Prepended content
+        copy.prepend(getjQueryObject(options.prepend));
+        if (options.manuallyCopyFormValues) {
+            // Manually copy form values into the HTML for printing user-modified input fields
+            // http://stackoverflow.com/a/26707753
+            copy.find("input")
+                .each(function () {
+                    var $field = $(this);
+                    if ($field.is("[type='radio']") || $field.is("[type='checkbox']")) {
+                        if ($field.prop("checked")) {
+                            $field.attr("checked", "checked");
+                        }
+                    } else {
+                        $field.attr("value", $field.val());
+                    }
+                });
+            copy.find("select").each(function () {
+                var $field = $(this);
+                $field.find(":selected").attr("selected", "selected");
+            });
+            copy.find("textarea").each(function () {
+                // Fix for https://github.com/DoersGuild/jQuery.print/issues/18#issuecomment-96451589
+                var $field = $(this);
+                $field.text($field.val());
+            });
+        }
+        // Get the HTML markup string
+        var content = copy.html();
+        // Notify with generated markup & cloned elements - useful for logging, etc
+        try {
+            options.deferred.notify('generated_markup', content, copy);
+        } catch (err) {
+            console.warn('Error notifying deferred', err);
+        }
+        // Destroy the copy
+        copy.remove();
+        if (options.iframe) {
+            // Use an iframe for printing
+            try {
+                printContentInIFrame(content, options);
+            } catch (e) {
+                // Use the pop-up method if iframe fails for some reason
+                console.error("Failed to print from iframe", e.stack, e.message);
+                printContentInNewWindow(content, options);
+            }
+        } else {
+            // Use a new window for printing
+            printContentInNewWindow(content, options);
+        }
+        return this;
+    };
+})(jQuery);

+ 28 - 0
public/assets/js/jquery.qrcode.min.js

@@ -0,0 +1,28 @@
+(function(r){r.fn.qrcode=function(h){var s;function u(a){this.mode=s;this.data=a}function o(a,c){this.typeNumber=a;this.errorCorrectLevel=c;this.modules=null;this.moduleCount=0;this.dataCache=null;this.dataList=[]}function q(a,c){if(void 0==a.length)throw Error(a.length+"/"+c);for(var d=0;d<a.length&&0==a[d];)d++;this.num=Array(a.length-d+c);for(var b=0;b<a.length-d;b++)this.num[b]=a[b+d]}function p(a,c){this.totalCount=a;this.dataCount=c}function t(){this.buffer=[];this.length=0}u.prototype={getLength:function(){return this.data.length},
+write:function(a){for(var c=0;c<this.data.length;c++)a.put(this.data.charCodeAt(c),8)}};o.prototype={addData:function(a){this.dataList.push(new u(a));this.dataCache=null},isDark:function(a,c){if(0>a||this.moduleCount<=a||0>c||this.moduleCount<=c)throw Error(a+","+c);return this.modules[a][c]},getModuleCount:function(){return this.moduleCount},make:function(){if(1>this.typeNumber){for(var a=1,a=1;40>a;a++){for(var c=p.getRSBlocks(a,this.errorCorrectLevel),d=new t,b=0,e=0;e<c.length;e++)b+=c[e].dataCount;
+for(e=0;e<this.dataList.length;e++)c=this.dataList[e],d.put(c.mode,4),d.put(c.getLength(),j.getLengthInBits(c.mode,a)),c.write(d);if(d.getLengthInBits()<=8*b)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17;this.modules=Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=Array(this.moduleCount);for(var b=0;b<this.moduleCount;b++)this.modules[d][b]=null}this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-
+7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(a,c);7<=this.typeNumber&&this.setupTypeNumber(a);null==this.dataCache&&(this.dataCache=o.createData(this.typeNumber,this.errorCorrectLevel,this.dataList));this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,c){for(var d=-1;7>=d;d++)if(!(-1>=a+d||this.moduleCount<=a+d))for(var b=-1;7>=b;b++)-1>=c+b||this.moduleCount<=c+b||(this.modules[a+d][c+b]=
+0<=d&&6>=d&&(0==b||6==b)||0<=b&&6>=b&&(0==d||6==d)||2<=d&&4>=d&&2<=b&&4>=b?!0:!1)},getBestMaskPattern:function(){for(var a=0,c=0,d=0;8>d;d++){this.makeImpl(!0,d);var b=j.getLostPoint(this);if(0==d||a>b)a=b,c=d}return c},createMovieClip:function(a,c,d){a=a.createEmptyMovieClip(c,d);this.make();for(c=0;c<this.modules.length;c++)for(var d=1*c,b=0;b<this.modules[c].length;b++){var e=1*b;this.modules[c][b]&&(a.beginFill(0,100),a.moveTo(e,d),a.lineTo(e+1,d),a.lineTo(e+1,d+1),a.lineTo(e,d+1),a.endFill())}return a},
+setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(a=8;a<this.moduleCount-8;a++)null==this.modules[6][a]&&(this.modules[6][a]=0==a%2)},setupPositionAdjustPattern:function(){for(var a=j.getPatternPosition(this.typeNumber),c=0;c<a.length;c++)for(var d=0;d<a.length;d++){var b=a[c],e=a[d];if(null==this.modules[b][e])for(var f=-2;2>=f;f++)for(var i=-2;2>=i;i++)this.modules[b+f][e+i]=-2==f||2==f||-2==i||2==i||0==f&&0==i?!0:!1}},setupTypeNumber:function(a){for(var c=
+j.getBCHTypeNumber(this.typeNumber),d=0;18>d;d++){var b=!a&&1==(c>>d&1);this.modules[Math.floor(d/3)][d%3+this.moduleCount-8-3]=b}for(d=0;18>d;d++)b=!a&&1==(c>>d&1),this.modules[d%3+this.moduleCount-8-3][Math.floor(d/3)]=b},setupTypeInfo:function(a,c){for(var d=j.getBCHTypeInfo(this.errorCorrectLevel<<3|c),b=0;15>b;b++){var e=!a&&1==(d>>b&1);6>b?this.modules[b][8]=e:8>b?this.modules[b+1][8]=e:this.modules[this.moduleCount-15+b][8]=e}for(b=0;15>b;b++)e=!a&&1==(d>>b&1),8>b?this.modules[8][this.moduleCount-
+b-1]=e:9>b?this.modules[8][15-b-1+1]=e:this.modules[8][15-b-1]=e;this.modules[this.moduleCount-8][8]=!a},mapData:function(a,c){for(var d=-1,b=this.moduleCount-1,e=7,f=0,i=this.moduleCount-1;0<i;i-=2)for(6==i&&i--;;){for(var g=0;2>g;g++)if(null==this.modules[b][i-g]){var n=!1;f<a.length&&(n=1==(a[f]>>>e&1));j.getMask(c,b,i-g)&&(n=!n);this.modules[b][i-g]=n;e--; -1==e&&(f++,e=7)}b+=d;if(0>b||this.moduleCount<=b){b-=d;d=-d;break}}}};o.PAD0=236;o.PAD1=17;o.createData=function(a,c,d){for(var c=p.getRSBlocks(a,
+c),b=new t,e=0;e<d.length;e++){var f=d[e];b.put(f.mode,4);b.put(f.getLength(),j.getLengthInBits(f.mode,a));f.write(b)}for(e=a=0;e<c.length;e++)a+=c[e].dataCount;if(b.getLengthInBits()>8*a)throw Error("code length overflow. ("+b.getLengthInBits()+">"+8*a+")");for(b.getLengthInBits()+4<=8*a&&b.put(0,4);0!=b.getLengthInBits()%8;)b.putBit(!1);for(;!(b.getLengthInBits()>=8*a);){b.put(o.PAD0,8);if(b.getLengthInBits()>=8*a)break;b.put(o.PAD1,8)}return o.createBytes(b,c)};o.createBytes=function(a,c){for(var d=
+0,b=0,e=0,f=Array(c.length),i=Array(c.length),g=0;g<c.length;g++){var n=c[g].dataCount,h=c[g].totalCount-n,b=Math.max(b,n),e=Math.max(e,h);f[g]=Array(n);for(var k=0;k<f[g].length;k++)f[g][k]=255&a.buffer[k+d];d+=n;k=j.getErrorCorrectPolynomial(h);n=(new q(f[g],k.getLength()-1)).mod(k);i[g]=Array(k.getLength()-1);for(k=0;k<i[g].length;k++)h=k+n.getLength()-i[g].length,i[g][k]=0<=h?n.get(h):0}for(k=g=0;k<c.length;k++)g+=c[k].totalCount;d=Array(g);for(k=n=0;k<b;k++)for(g=0;g<c.length;g++)k<f[g].length&&
+(d[n++]=f[g][k]);for(k=0;k<e;k++)for(g=0;g<c.length;g++)k<i[g].length&&(d[n++]=i[g][k]);return d};s=4;for(var j={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,
+78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var c=a<<10;0<=j.getBCHDigit(c)-j.getBCHDigit(j.G15);)c^=j.G15<<j.getBCHDigit(c)-j.getBCHDigit(j.G15);return(a<<10|c)^j.G15_MASK},getBCHTypeNumber:function(a){for(var c=a<<12;0<=j.getBCHDigit(c)-
+j.getBCHDigit(j.G18);)c^=j.G18<<j.getBCHDigit(c)-j.getBCHDigit(j.G18);return a<<12|c},getBCHDigit:function(a){for(var c=0;0!=a;)c++,a>>>=1;return c},getPatternPosition:function(a){return j.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,c,d){switch(a){case 0:return 0==(c+d)%2;case 1:return 0==c%2;case 2:return 0==d%3;case 3:return 0==(c+d)%3;case 4:return 0==(Math.floor(c/2)+Math.floor(d/3))%2;case 5:return 0==c*d%2+c*d%3;case 6:return 0==(c*d%2+c*d%3)%2;case 7:return 0==(c*d%3+(c+d)%2)%2;default:throw Error("bad maskPattern:"+
+a);}},getErrorCorrectPolynomial:function(a){for(var c=new q([1],0),d=0;d<a;d++)c=c.multiply(new q([1,l.gexp(d)],0));return c},getLengthInBits:function(a,c){if(1<=c&&10>c)switch(a){case 1:return 10;case 2:return 9;case s:return 8;case 8:return 8;default:throw Error("mode:"+a);}else if(27>c)switch(a){case 1:return 12;case 2:return 11;case s:return 16;case 8:return 10;default:throw Error("mode:"+a);}else if(41>c)switch(a){case 1:return 14;case 2:return 13;case s:return 16;case 8:return 12;default:throw Error("mode:"+
+a);}else throw Error("type:"+c);},getLostPoint:function(a){for(var c=a.getModuleCount(),d=0,b=0;b<c;b++)for(var e=0;e<c;e++){for(var f=0,i=a.isDark(b,e),g=-1;1>=g;g++)if(!(0>b+g||c<=b+g))for(var h=-1;1>=h;h++)0>e+h||c<=e+h||0==g&&0==h||i==a.isDark(b+g,e+h)&&f++;5<f&&(d+=3+f-5)}for(b=0;b<c-1;b++)for(e=0;e<c-1;e++)if(f=0,a.isDark(b,e)&&f++,a.isDark(b+1,e)&&f++,a.isDark(b,e+1)&&f++,a.isDark(b+1,e+1)&&f++,0==f||4==f)d+=3;for(b=0;b<c;b++)for(e=0;e<c-6;e++)a.isDark(b,e)&&!a.isDark(b,e+1)&&a.isDark(b,e+
+2)&&a.isDark(b,e+3)&&a.isDark(b,e+4)&&!a.isDark(b,e+5)&&a.isDark(b,e+6)&&(d+=40);for(e=0;e<c;e++)for(b=0;b<c-6;b++)a.isDark(b,e)&&!a.isDark(b+1,e)&&a.isDark(b+2,e)&&a.isDark(b+3,e)&&a.isDark(b+4,e)&&!a.isDark(b+5,e)&&a.isDark(b+6,e)&&(d+=40);for(e=f=0;e<c;e++)for(b=0;b<c;b++)a.isDark(b,e)&&f++;a=Math.abs(100*f/c/c-50)/5;return d+10*a}},l={glog:function(a){if(1>a)throw Error("glog("+a+")");return l.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;256<=a;)a-=255;return l.EXP_TABLE[a]},EXP_TABLE:Array(256),
+LOG_TABLE:Array(256)},m=0;8>m;m++)l.EXP_TABLE[m]=1<<m;for(m=8;256>m;m++)l.EXP_TABLE[m]=l.EXP_TABLE[m-4]^l.EXP_TABLE[m-5]^l.EXP_TABLE[m-6]^l.EXP_TABLE[m-8];for(m=0;255>m;m++)l.LOG_TABLE[l.EXP_TABLE[m]]=m;q.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var c=Array(this.getLength()+a.getLength()-1),d=0;d<this.getLength();d++)for(var b=0;b<a.getLength();b++)c[d+b]^=l.gexp(l.glog(this.get(d))+l.glog(a.get(b)));return new q(c,0)},mod:function(a){if(0>
+this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(a.get(0)),d=Array(this.getLength()),b=0;b<this.getLength();b++)d[b]=this.get(b);for(b=0;b<a.getLength();b++)d[b]^=l.gexp(l.glog(a.get(b))+c);return(new q(d,0)).mod(a)}};p.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],
+[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,
+116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,
+43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
+3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
+55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
+45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
+(a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
+correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
+j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
+d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
public/assets/js/jquery2.1.1.min.js


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott