投料打印微调,

application/admin/controller/Index.php

@@ -105,7 +105,7 @@ class Index extends Backend
                 if ($result === true) {
                     // 登陆成功后,短信通知账号拥有者
                     $mobile = Admin::get($this->auth->id)['mobile'];
-//                    (new Sample)->send_verify($mobile,$username,'SMS_243348221');
+                    (new Sample)->send_verify($mobile,$username,'SMS_243348221');
                     Hook::listen("admin_login_after", $this->request);
                     $this->success(__('Login successful'), $url, ['url' => $url, 'id' => $this->auth->id, 'username' => $username, 'avatar' => $this->auth->avatar]);
                 } else {
@@ -125,7 +125,7 @@ class Index extends Backend
                     $result = $this->auth->login($mobile, '', $keeplogin ? 86400 : 0,1);
                     if ($result === true) {
                         $mobile = Admin::get($this->auth->id)['mobile'];
-//                        (new Sample)->send_verify($mobile,$mobile,'SMS_243348221');
+                        (new Sample)->send_verify($mobile,$mobile,'SMS_243348221');
                         Hook::listen("admin_login_after", $this->request);
                         $this->success(__('Login successful'), $url, ['url' => $url, 'id' => $this->auth->id, 'username' => $tel, 'avatar' => $this->auth->avatar]);
                     } else {

application/admin/view/feeding/add.html

@@ -92,7 +92,7 @@
                         <img src="" id="myImage" alt=""/>
                     </div>
                     <tr>
-                        <th class="tg-v8dz" colspan="6" >
+                        <th class="tg-v8dz" colspan="7" >
                             <p id="formula_no"></p>
                             <hr style="border: 1px solid;margin-top: -5px">
                         </th>
@@ -102,20 +102,20 @@
                     <tr>
                         <td class="tg-s5vw"></td>
                         <td class="tg-svyg"></td>
-                        <td class="tg-ub5w" colspan="2" rowspan="2">投料单</td>
+                        <td class="tg-ub5w" colspan="3" 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">{:date("Y-m-d")}</td>
-                        <td class="tg-9d8n">开票人</td>
-                        <td class="tg-9d8n">审核</td>
+                        <td class="tg-9d8n" style="border: none;width: 80px;">日期：</td>
+                        <td class="tg-z7m5" style="width:134px" id="date">{:date("Y-m-d")}</td>
+                        <td class="tg-9d8n" style="width:100px">开票人</td>
+                        <td class="tg-9d8n" style="width:100px">审核</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" id="formula"></td>
+                        <td class="tg-z7m5" style="text-decoration: underline" id="bach"></td>
+                        <td class="tg-kghl" style="border: none;text-align: center"><input style="text-align: center" type="text" id="formula"></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-x1hj" id="specifications"></td>

public/assets/js/backend/feeding.js

@@ -1,4 +1,4 @@
-define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], function ($, undefined, Backend, Table, Form) {
+define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery.qrcode.min'], function ($, undefined, Backend, Table, Form) {
     var Controller = {
         index: function () {
             // 初始化表格参数配置
@@ -55,6 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                             data:{bach:$("#c-bach").val()},//批次号
                             url:"feeding/get_task",
                             success(res){
+                                $("#table").append("<input id='name' type='hidden' value='"+res.data[0].name+"'>");
                                 //批次号重复/做下拉选择
                                 if(res.data.length>1){
                                     let str = '';
@@ -101,7 +102,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                                     if (result.data[i].weight) {
                                                         html += parseFloat(result.data[i].weight);
                                                     }
-                                                    html += `</td><td>${result.data[i].gy_name}</td></tr>`;
+                                                    html += `</td><td style="text-align: left">${result.data[i].gy_name}</td></tr>`;
 
                                                 }
                                                 html+= `<tr>
@@ -144,7 +145,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                         });
                                     });
                                 }else{//批次号不重复直接赋值
-                                    $("#bach").css('cssText','display:none! important');
+                                    // $("#bach").css('cssText','display:none! important');
                                     $("#btn").css('display','none');
                                     $("#c-name").val(res.data[0].name);
                                     $("#c-specifications").val(res.data[0].drawer_name);
@@ -177,11 +178,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                                 if (result.data[i].weight) {
                                                     html += parseFloat(result.data[i].weight);
                                                 }
-                                                html += `</td><td>${result.data[i].gy_name}</td></tr>`;
+                                                html += `</td><td style="text-align: left">${result.data[i].gy_name}</td></tr>`;
                                             }
                                             html+= `<tr>
                                                             <td style="width: 100px;text-align: center">总计</td>
-                                                            <td class="total" style="width: 100px;text-align: center"></td>
+                                                            <td class="total" id="stotal" style="width: 100px;text-align: center"></td>
                                                             <td id="total"></td>
                                                             <td></td>
                                                         </tr>`;//${res.data[0].number}
@@ -236,6 +237,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                 $(".print-link").on('click', function() {
                     var status = 1;
                     var total = 0;
+                    var stotal = 0;
                     //开票人
                     $("#specifications").html($('#c-specifications').val());
                     //审核
@@ -243,7 +245,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                     //批次号
                     var bach = $('#c-bach').val();
                     //写入到add页面
-                    $("#formula").html(bach);
+                    $("#bach").html(bach);
+                    $("#formula").val($("#name").val());
                     //添加重量,包装规格,机组到表格内
                     for(var i=0;i<$(".tablestr").length;i++){
                         var weight =  parseFloat($(".tablestr:eq("+i+")").children("tr td:eq(2)").children().val());
@@ -251,8 +254,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                             $(".print:eq("+i+")").children("tr td:eq(2)").html(weight);
                             total += weight;
                         }
+                        var weight2 =  parseFloat($(".tablestr:eq("+i+")").children("tr td:eq(1)").children().val());
+                        if(weight2){
+                            $(".print:eq("+i+")").children("tr td:eq(1)").html(weight2);
+                            stotal += weight2;
+                        }
+                    }
+                    $("#stotal").html(stotal.toFixed(2));
+                    if(total>0){
+                        $("#total").html(total.toFixed(2));
                     }
-                    $("#total").html(total.toFixed(2));
                     // console.log(total);
                     if(!$("#c-pickor").val()){
                         status = 2;
@@ -266,10 +277,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                         layer.confirm('领料人或仓管人为空,请检查!');return false;
                     }*/
 
-                    // createQrcode(bach,80,80);
+                    createQrcode(bach,80,80);
                     var img = document.getElementById("myImage"); /// get image element
                     var canvas = document.getElementsByTagName('canvas')[0];
-                    // img.src = canvas.toDataURL();                     /// update image
+                    img.src = canvas.toDataURL();                     /// update image
                     $.print('#print_area');
                     return false;
                 });