tincey 3 年 前
コミット
4139535d99

+ 2 - 0
application/admin/controller/Feeding.php

@@ -23,6 +23,8 @@ class Feeding extends Backend
      */
     protected $model = null;
 
+    protected $noNeedRight = ['get_formula','get_task'];
+
     public function _initialize()
     {
         parent::_initialize();

+ 2 - 2
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 {

+ 5 - 0
application/admin/controller/Product.php

@@ -23,6 +23,8 @@ class Product extends Backend
 
     protected $detail = null;
 
+    protected $noNeedRight = ['ajax','get_formula'];
+
     public function _initialize()
     {
         parent::_initialize();
@@ -159,6 +161,9 @@ class Product extends Backend
                     $res['time'] = date("Y-m-d H:i:s");
                     $res['audit'] = $params['audit'][$key];
                     $res['status'] = $params['status'];
+                    $res['pickor'] = $params['pickor'];
+                    $res['note'] = $params['note'];
+                    $res['warehouseor'] = $params['warehouseor'];
                     $res['batch'] = $val;
                     $res['pname'] = $params['proname'][$key];
                     $res['specifications'] = $params['specifications'][$key];

+ 9 - 5
application/admin/view/feeding/add.html

@@ -61,6 +61,9 @@
         th,tr{
             text-align: center;
         }
+        .table_bottom tr{
+            text-align: left;
+        }
     </style>
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="table">
@@ -99,20 +102,21 @@
                     <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="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-z7m5" id="date">{:date("Y-m-d")}</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-kghl" style="border: none" id="formula"></td>
+                        <td class="tg-0pky"></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-x1hj" id="specifications"></td>
                         <td class="tg-x1hj" id="unit"></td>
@@ -127,7 +131,7 @@
                         <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;min-width: 100px;">实加量(KG)</th>
                         <th  style="text-align: center">操作记录</th>
                     </tr>
 
@@ -142,7 +146,7 @@
                     </tr>-->
                 </table>
                 <div style="height: 5px;"></div>
-                <table class="tg" style="width: 800px;">
+                <table class="tg table_bottom" style="width: 800px;">
                     <tr>
                         <td style="border: none">
                             <span>包装规格:</span>

+ 43 - 21
application/admin/view/index/login.html

@@ -16,7 +16,7 @@
 
 
         .login-screen {
-            max-width: 430px;
+            max-width: 400px;
             padding: 0;
             margin: 100px auto 0 auto;
 
@@ -24,12 +24,9 @@
 
         .login-screen .well {
             border-radius: 3px;
-            -webkit-box-shadow: 0 0 30px rgba(0, 0, 0, 0.1);
-            box-shadow: 0 0 30px rgba(0, 0, 0, 0.1);
-            background: rgba(255, 255, 255, 1);
-            border: none;
-            overflow: hidden;
-            padding: 0;
+            -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+            background: rgba(255,255,255, 0.2);
         }
 
         @media (max-width: 767px) {
@@ -45,8 +42,8 @@
             -moz-border-radius: 50%;
             -webkit-border-radius: 50%;
             border-radius: 50%;
-            margin: -93px auto 30px;
-            border: 5px solid #fff;
+            margin: 10px auto;
+            /*border: 5px solid #fff;*/
         }
 
         .profile-name-card {
@@ -57,11 +54,11 @@
             background: #899fe1;
         }
 
-        .login-form {
+      /*  .login-form {
             padding: 40px 30px;
             position: relative;
             z-index: 99;
-        }
+        }*/
 
         #login-form {
             margin-top: 20px;
@@ -81,7 +78,7 @@
         .change_login{
             margin: 0 auto;
             text-align: center;
-            padding-top: 20px;
+            /*padding-top: 20px;*/
             font-size: 20px;
         }
         #pass_login{
@@ -120,12 +117,12 @@
     <div class="login-wrapper">
         <div class="login-screen">
             <div class="well">
-                <div class="login-head">
+<!--                <div class="login-head">-->
                     <div class="change_login"><span id="pass_login">密码登录</span> | <span id="sms_login">验证码登录</span></div>
-                    <img src="__CDN__/assets/img/login-head.png" style="width:100%;"/>
-                </div>
+<!--                    <img src="__CDN__/assets/img/login-head.png" style="width:100%;"/>-->
+<!--                </div>-->
                 <div class="login-form" id="pass">
-                    <img id="profile-img" class="profile-img-card" src="__CDN__/assets/img/avatar.png"/>
+                    <img id="profile-img" class="profile-img-card" src="/assets/img/avatar.png"/>
                     <p id="profile-name" class="profile-name-card"></p>
 
                     <form action="" method="post" id="login-form">
@@ -159,14 +156,14 @@
                             </label>
                         </div>
                         <div class="form-group">
-                            <button type="submit" class="btn btn-success btn-lg btn-block" style="background:#708eea;">{:__('Sign in')}</button>
+                            <button type="submit" class="btn btn-success btn-lg btn-block">{:__('Sign in')}</button>
                         </div>
                         <!--@AdminLoginFormEnd-->
                     </form>
                 </div>
                 <!-- 验证码登录 -->
                 <div class="login-form" id="sms">
-                    <img id="profile-img" class="profile-img-card" src="__CDN__/assets/img/avatar.png" />
+                    <img id="profile-img" class="profile-img-card" src="/assets/img/avatar.png" />
                     <p id="profile-name" class="profile-name-card"></p>
 
                     <form action="" method="post" id="captcha">
@@ -175,7 +172,7 @@
                         <div class="input-group">
                             <div class="input-group-addon"><span class="glyphicon glyphicon-user" aria-hidden="true"></span></div>
                             <input type="text" class="form-control" id="pd-form-mobile" placeholder="{:__('Mobile')}" name="mobile" autocomplete="off" value="" />
-                            <div class="input-group-addon" id="getcaptcha" style="cursor:pointer;"><span>{:__('Get captcha')}</span></div>
+                            <div class="input-group-addon" id="getcaptcha" style="cursor:pointer;"><span id="get-captcha">{:__('Get captcha')}</span></div>
                         </div>
 
                         <div class="input-group">
@@ -189,7 +186,7 @@
                             </label>
                         </div>
                         <div class="form-group">
-                            <button type="submit" class="btn btn-success btn-lg btn-block" style="background:#708eea;">{:__('Sign in')}</button>
+                            <button type="submit" class="btn btn-success btn-lg btn-block">{:__('Sign in')}</button>
                         </div>
                     </form>
                 </div>
@@ -218,19 +215,44 @@
         let mobile = $("#pd-form-mobile").val()
         localStorage.setItem("mobile", mobile);
     })
+    var sec=60;
+    var countdown
     //获取验证码
     $("#getcaptcha").click(()=>{
+        if(sec !== 60){
+            return false;
+        }
         let mobile = $("#pd-form-mobile").val()
         let regExp = new RegExp("^1[3578]\\d{9}$");
         if(regExp.test(mobile)){
+
             $.post('index/getCaptcha',{mobile:mobile},(res)=>{
                 console.log(res);
             })
+            //立马触发,,防止暴力点击
+            setTimeout(()=>{
+                $("#get-captcha").html('60秒后重新获取');
+                sec--;
+            },0)
+
         }else{
             layer.confirm('请输入正确的手机号');
         }
+        countdown = setInterval(()=>{
+
+            $("#get-captcha").html(sec+'秒后重新获取');
+            sec--;
+            // console.log(sec);
+            if(sec < 0){
+                clearInterval(countdown);
+                sec=60;
+                $("#get-captcha").html("{:__('Get captcha')}");
+            }
+        },1000)
+
+
     })
-    //如果有缓存,读缓存,,,
+    //如果有缓存,读缓存,,,方便用户密码错误后不用重新输入电话号
     $(function(){
         let mobile = localStorage.getItem("mobile");
         if(mobile){

+ 1 - 1
application/admin/view/product/add.html

@@ -121,7 +121,7 @@
                     </tr>
                     <tr>
                         <td class="tg-9d8n" style="border: none">日期:</td>
-                        <td class="tg-z7m5" id="date">{:date("Y-m-d H:i-s")}</td>
+                        <td class="tg-z7m5" id="date">{:date("Y-m-d")}</td>
                         <td class="tg-9d8n">领料人</td>
                         <td class="tg-9d8n">仓管人</td>
                     </tr>

+ 1 - 1
application/admin/view/product/show.html

@@ -186,7 +186,7 @@
             // 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;
         });

+ 1 - 1
application/config.php

@@ -274,7 +274,7 @@ return [
         //是否开启IP变动检测
         'loginip_check'         => true,
         //登录页默认背景图
-        'login_background'      => "",
+        'login_background'      => "/assets/img/loginbg.jpg",
         //是否启用多级菜单导航
         'multiplenav'           => false,
         //是否开启多选项卡(仅在开启多级菜单时起作用)

+ 38 - 27
public/assets/js/backend/feeding.js

@@ -96,23 +96,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                                     str += "<input class='form-control' type='hidden' name='row[gy_num][]' value='"+result.data[i].gy_num+"'>";
                                                     str += "<td><input class='form-control' type='text' name='row[gy_name][]' readonly value='"+result.data[i].gy_name+"'></td>";
                                                     str += "</tr>";
-                                                    html += `<tr>
-                                                                <td>${result.data[i].material}</td>
+                                                    html += `<tr class="print${i} print"><td>${result.data[i].material}</td>
                                                                 <td>${result.data[i].nweight}</td><td>`;
                                                     if (result.data[i].weight) {
                                                         html += parseFloat(result.data[i].weight);
                                                     }
-                                                    html += `
-                                                                </td><td>${result.data[i].gy_name}</td>
-                                                            </tr>`;
+                                                    html += `</td><td>${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">${result.total}</td>
+                                                            <td class="total" style="width: 100px;text-align: center"></td>
                                                             <td id="total"></td>
                                                             <td></td>
-                                                        </tr>`;
+                                                        </tr>`;//${res.data.number}
                                                 $("#print_gy").append(html);
                                                 $("#table").append(str);
                                                 $("#c-bach").attr('readonly','readonly');
@@ -149,11 +146,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                 }else{//批次号不重复直接赋值
                                     $("#bach").css('cssText','display:none! important');
                                     $("#btn").css('display','none');
-                                    $("#c-name").val(res[0].name);
-                                    $("#c-specifications").val(res[0].drawer_name);
-                                    $("#c-unit").val(res[0].examine_name);
-                                    $("#c-operator").val(res.operator);
-                                    $("#c-inspector").val(res.inspector);
+                                    $("#c-name").val(res.data[0].name);
+                                    $("#c-specifications").val(res.data[0].drawer_name);
+                                    $("#c-unit").val(res.data[0].examine_name);
+                                    $("#c-operator").val(res.data.operator);
+                                    $("#c-inspector").val(res.data.inspector);
                                     $.ajax({
                                         method: "POST",
                                         url: "feeding/get_formula",
@@ -161,20 +158,34 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                             bach: $("#c-bach").val(),
                                             num:''
                                         },
-                                        success(res) {
+                                        success(result) {
                                             var str = '';
-                                            for(var i=0;i<res.data.length;i++){
-                                                str += "<tr class='tablestr"+i+" tablestr'><td><input class='form-control material' type='text' name='row[material][]' readonly value='"+res.data[i].material+"'></td>";
-                                                str += "<td><input class='form-control' type='text' name='row[nweight][]' readonly value='"+res.data[i].nweight+"'></td>";
-                                                str += "<input class='form-control' type='hidden' name='row[gy_num][]' value='"+res.data[i].gy_num+"'>";
+                                            var html = '';
+                                            for(var i=0;i<result.data.length;i++){
+                                                str += "<tr class='tablestr"+i+" tablestr'><td><input class='form-control material' type='text' name='row[material][]' readonly value='"+result.data[i].material+"'></td>";
+                                                str += "<td><input class='form-control' type='text' name='row[nweight][]' readonly value='"+result.data[i].nweight+"'></td>";
+                                                str += "<input class='form-control' type='hidden' name='row[gy_num][]' value='"+result.data[i].gy_num+"'>";
                                                 str += "<td><input class='form-control' type='number' name='row[weight][]' value='";
-                                                if (res.data[i].weight) {
-                                                    str += parseFloat(res.data[i].weight) + "' readonly ";
+                                                if (result.data[i].weight) {
+                                                    str += parseFloat(result.data[i].weight) + "' readonly ";
                                                 }
                                                 str += "'></td>";
-                                                str += "<td><input class='form-control' type='text' name='row[gy_name][]' readonly value='"+res.data[i].gy_name+"'></td>";
+                                                str += "<td><input class='form-control' type='text' name='row[gy_name][]' readonly value='"+result.data[i].gy_name+"'></td>";
                                                 str += "</tr>";
+                                                html += `<tr class="print${i} print"><td>${result.data[i].material}</td>
+                                                                <td>${result.data[i].nweight}</td><td>`;
+                                                if (result.data[i].weight) {
+                                                    html += parseFloat(result.data[i].weight);
+                                                }
+                                                html += `</td><td>${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 id="total"></td>
+                                                            <td></td>
+                                                        </tr>`;//${res.data[0].number}
+                                            $("#print_gy").append(html);
                                             $("#table").append(str);
                                             $("#c-bach").attr('readonly','readonly');
                                             $("#wuliao").keydown((e)=>{
@@ -182,13 +193,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                                                 var error = 0;
                                                 if(key === 13){
                                                     var wuliao = $("#wuliao").val();
-                                                    for(var i=0;i<res.data.length;i++) {
-                                                        if(res.data[i].material===wuliao){
+                                                    for(var i=0;i<result.data.length;i++) {
+                                                        if(result.data[i].material===wuliao){
                                                             $(".material")[i].setAttribute('style','color:red');
                                                             error++;
                                                         }
-                                                        if(res.data[i].material.indexOf('/')!==-1){
-                                                            var arr = res.data[i].material.split('/');
+                                                        if(result.data[i].material.indexOf('/')!==-1){
+                                                            var arr = result.data[i].material.split('/');
                                                             if(arr.indexOf($("#wuliao").val()) !== -1){
                                                                 $(".material")[i].value = wuliao;
                                                                 $(".material")[i].setAttribute('style','color:red');
@@ -226,9 +237,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                     var status = 1;
                     var total = 0;
                     //开票人
-                    $("#specifications").val($('#c-specifications').val());
+                    $("#specifications").html($('#c-specifications').val());
                     //审核
-                    $("#unit").val($('#c-unit').val());
+                    $("#unit").html($('#c-unit').val());
                     //批次号
                     var bach = $('#c-bach').val();
                     //写入到add页面
@@ -236,8 +247,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print'], funct
                     //添加重量,包装规格,机组到表格内
                     for(var i=0;i<$(".tablestr").length;i++){
                         var weight =  parseFloat($(".tablestr:eq("+i+")").children("tr td:eq(2)").children().val());
-                        $(".print:eq("+i+")").children("tr td:eq(2)").html(weight);
                         if(weight){
+                            $(".print:eq("+i+")").children("tr td:eq(2)").html(weight);
                             total += weight;
                         }
                     }

+ 2 - 2
public/assets/js/backend/product.js

@@ -158,9 +158,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','editable','jQuery.pri
                 $(".print-link").on('click', function() {
                     var status = 1;
                     //领料人
-                    $("#pickor").val($('#c-pickor').val());
+                    $("#pickor").html($('#c-pickor').val());
                     //仓管人
-                    $("#warehouseor").val($('#c-warehouseor').val());
+                    $("#warehouseor").html($('#c-warehouseor').val());
                     //批次
                     var bach = $('#c-batch').val();
                     //写入到add页面