Sfoglia il codice sorgente

生成作业票查看打印

liuhairui 3 anni fa
parent
commit
05e0a96fe9

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

@@ -137,7 +137,6 @@ class Task extends Backend
         $this->view->assign("formula_detail", $formula_detail);
 
 
-
         $task= Db::name('task')->where('id',$ids)->find();
         $gyinfo= Db::name('formula_detail')->where('pid',$row['fid'])->select();
         if (empty($gyinfo)){return array('status'=>0,'msg'=>'数据错误');}

+ 0 - 2
application/admin/view/task/show.html

@@ -203,8 +203,6 @@
             if (status == 2){
                 layer.confirm('数据不能为空,请仔细核查');return false
             }
-            // var ids = $('#ids').val();
-            // bach = bach + '-' + ids;
             createQrcode(bach,80,80);
             var img = document.getElementById("myImage"); /// get image element
             var canvas = document.getElementsByTagName('canvas')[0];

+ 2 - 9
public/assets/js/backend/feeding.js

@@ -41,19 +41,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
             table.on('post-body.bs.table',function(){
                 $(".btn-add").data("area",["100%","100%"]);
             });
-            var docElm = document.documentElement;
-
-            if (docElm.webkitRequestFullScreen) {
-                docElm.webkitRequestFullScreen();
-            }
-            document.addEventListener("webkitfullscreenchange", function () {
-
-                fullscreenState.innerHTML = (document.webkitIsFullScreen) ? "" : "not ";
-            }, false);
+            document.documentElement.webkitRequestFullScreen();
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
+            // document.documentElement.webkitRequestFullScreen();
             $('#c-bach').focus();
             var num=0;
             $('#c-bach').keydown((e)=>{