优化配方新增细节

application/admin/controller/Formula.php

@@ -20,6 +20,7 @@ class Formula extends Backend
      */
     protected $model = null;
     protected $searchFields = "name";
+    protected $noNeedLogin = ['gyName'];
 
     public function _initialize()
     {

application/admin/view/formula/add.html

@@ -1,3 +1,20 @@
+<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">
@@ -70,23 +87,120 @@
         </div>
     </div>
     <div class="form-group">
-        <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
+        <table class="table table-striped table-bordered table-hover table-nowrap" id="gy" style="table-layout:fixed;">
             <tr>
-                <th class="col-xs-12 col-sm-1">原材料</th>
+                <th class="col-xs-12 col-sm-2">原材料</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-2">操作</th>
             </tr>
         </table>
     </div>
+
+    <div style="display: none">
+        <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-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">'+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;
+        });
+    });
+</script>
+
 
 

application/admin/view/formula/edit.html

@@ -114,7 +114,7 @@
 <!--                    </select></td>-->
                 <td><input  class="form-control gy_name" type="text" value="{$vo.gy_name}"></td>
                 <td><input  class="form-control gy_num" type="text" value="{$vo.gy_num}"></td>
-                <td><button type="button"  class="btn btn-danger  del">删除</button></td>
+                <td><button type="button"  class="btn btn-success up" >上移</button>&nbsp;<button type="button"  class="btn btn-success down" >下移</button>&nbsp;<button type="button"  class="btn btn-danger  del">删除</button></td>
             </tr>
             {/foreach}
         </table>
@@ -210,7 +210,7 @@
                 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>';
+            html += '<tr><td style="width: 100px;text-align: center">总计</td><td class="total" style="width: 100px;text-align: center">'+sum+'</td><td class="remark">'+remark+'</td></tr>';
 
             $('#print_gy').html(html)
             // createQrcode(bach,80,80);

public/assets/js/backend/formula.js

@@ -79,7 +79,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 html += '<td><input  class="form-control percentage" type="number" value="'+percentage+'"></td>';
                 html += '<td><input  class="form-control gy_name" type="text" value="'+gy_name+'" ></td>';
                 html += '<td><input  class="form-control gy_num" type="text" value="'+gy_num+'" ></td>';
-                html += '<td><button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
+                html += '<td><button type="button"  class="btn btn-success up" >上移</button>&nbsp;' +
+                    '<button type="button"  class="btn btn-success down" >下移</button>&nbsp;<button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
                 $('#gy').append(html);
                 if (gy_name !=''){
                     gy_num = gy_num +1;
@@ -89,6 +90,37 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 $(this).parent().parent().remove();
             });
 
+            // 上移动
+            $(document).on('click', '.up', function () {
+                var ind = $(this).parents('tr').index();
+                console.log(ind);
+                if (ind == 1) {
+                    layer.confirm('已经是最上层了！');
+                    return false;
+                }
+                var trs = $(this).parents('tr').clone(true);
+                console.log(trs);
+
+                $(this).parents('table tbody').find('tr').eq(ind - 1).before(trs);
+                $(this).parents('tr').remove();
+                //重新添加序号
+                // drawOrder()
+            });
+            //下移动
+            $(document).on('click', '.down', function () {
+                var ind = $(this).parents('tr').index();
+                if (($(this).parents("tr").index()) == ($(this).parents("table tbody").find("tr").length - 1)) {
+                    layer.confirm('已经是最下层了！');
+                    return false;
+                }
+                var trs = $(this).parents('tr').clone(true);
+                $(this).parents('table tbody').find('tr').eq(ind + 1).after(trs);
+                $(this).parents('tr').remove();
+                //重新添加序号
+                // drawOrder();
+            });
+
+
             Controller.api.bindevent();
 
             $(document).on('click','.submit',function () {
@@ -195,13 +227,42 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 html += '<td><input  class="form-control percentage" type="number" value="'+percentage+'"></td>';
                 html += '<td><input  class="form-control gy_name" type="text" value="'+gy_name+'"></td>';
                 html += '<td><input  class="form-control gy_num" type="text" value=""></td>';
-                html += '<td><button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
+                html += '<td><button type="button"  class="btn btn-success up" >上移</button>&nbsp;' +
+                    '<button type="button"  class="btn btn-success down" >下移</button>&nbsp;<button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
                 $('#gy').append(html);
             });
             $(document).on('click','.del',function () {
                 $(this).parent().parent().remove();
             });
+            // 上移动
+            $(document).on('click', '.up', function () {
+                var ind = $(this).parents('tr').index();
+                console.log(ind);
+                if (ind == 1) {
+                    layer.confirm('已经是最上层了！');
+                    return false;
+                }
+                var trs = $(this).parents('tr').clone(true);
+                console.log(trs);
 
+                $(this).parents('table tbody').find('tr').eq(ind - 1).before(trs);
+                $(this).parents('tr').remove();
+                //重新添加序号
+                // drawOrder()
+            });
+            //下移动
+            $(document).on('click', '.down', function () {
+                var ind = $(this).parents('tr').index();
+                if (($(this).parents("tr").index()) == ($(this).parents("table tbody").find("tr").length - 1)) {
+                    layer.confirm('已经是最下层了！');
+                    return false;
+                }
+                var trs = $(this).parents('tr').clone(true);
+                $(this).parents('table tbody').find('tr').eq(ind + 1).after(trs);
+                $(this).parents('tr').remove();
+                //重新添加序号
+                // drawOrder();
+            });
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
                 Form.api.bindevent($("form[role=form]"), function(data, ret){