1129刘功能优化

application/admin/controller/Feeding.php

@@ -48,6 +48,12 @@ class Feeding extends Backend
     public function add()
     {
         if (false === $this->request->isPost()) {
+            //车间=>操作人员
+            $cjcz = Db::name('personnel')->where('bid',"=",5)->where('position','=',"cjcz")->order('name desc')->select();
+            //车间=>检验人员
+            $cjjy = Db::name('personnel')->where('bid',"=",5)->where('position','=',"cjjy")->order('name desc')->select();
+            $this->assign('cjcz',$cjcz);
+            $this->assign('cjjy',$cjjy);
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');

application/admin/controller/Formula.php

@@ -105,6 +105,12 @@ class Formula extends Backend
     {
 
         if (false === $this->request->isPost()) {
+            //技术部=>担当人
+            $jsdd = Db::name('personnel')->where('bid',"=",2)->where('position','=',"jsdd")->order('name desc')->select();
+            //技术部=>审核人
+            $jssh = Db::name('personnel')->where('bid',"=",2)->where('position','=',"jssh")->order('name desc')->select();
+            $this->assign('jsdd',$jsdd);
+            $this->assign('jssh',$jssh);
             return $this->view->fetch();
         }
         $base = $this->request->post('baseData/a');
@@ -380,6 +386,17 @@ class Formula extends Backend
             $this->error(__('No Results were found'));
         }
         if (false === $this->request->isPost()) {
+            //生产部=>开票人
+            $sckp = Db::name('personnel')->where('bid',"=",3)->where('position','=',"sckp")->order('name desc')->select();
+            //生产部=>审核人
+            $scsh = Db::name('personnel')->where('bid',"=",3)->where('position','=',"scsh")->order('name desc')->select();
+            $this->assign('sckp',$sckp);
+            $this->assign('scsh',$scsh);
+            //批次号顺序新增
+            $tastbach = Db::name('task')->order('bach desc')->find();
+            $bach = $tastbach['bach'] +1;
+            $this->view->assign('bach',$bach);
+
             $list = Db::name('formula')->where('id',$ids)->find();
             $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('id,material,percentage,gy_name,gy_num')->select();
             foreach ($list['gyinfo'] as $key=>$value){

application/admin/controller/Order.php

@@ -30,6 +30,7 @@ class Order extends Backend
         $this->model = new \app\admin\model\Order;
         $this->logmodel = new \app\admin\model\OrderLog;
         $this->view->assign("statusList", $this->model->getStatusList());
+//        $this->view->assign("personnel", $this->model->getpersonnel());
     }
 
 
@@ -79,6 +80,20 @@ class Order extends Backend
      */
     public function add(){
         if (false === $this->request->isPost()) {
+            $params = input('product');
+            if ($params){
+                $customer = Db::name('order')->where('product','like','%'.$params.'%')->select();
+            }else{
+                $customer = Db::name('order')->where('product','neq','')->field('id,product')->limit(20)->select();
+            }
+            $this->assign('customer',$customer);
+
+            //营销部=>经办
+            $yxjb = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxjb")->order('name desc')->select();
+            //营销部=>审核
+            $yxsh = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxsh")->order('name desc')->select();
+            $this->assign('yxjb',$yxjb);
+            $this->assign('yxsh',$yxsh);
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');
@@ -147,6 +162,12 @@ class Order extends Backend
             $this->error(__('You have no permission'));
         }
         if (false === $this->request->isPost()) {
+            //营销部=>经办
+            $yxjb = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxjb")->order('name desc')->select();
+            //营销部=>审核
+            $yxsh = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxsh")->order('name desc')->select();
+            $this->assign('yxjb',$yxjb);
+            $this->assign('yxsh',$yxsh);
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
@@ -289,6 +310,12 @@ class Order extends Backend
             $this->error(__('No Results were found'));
         }
         if (false === $this->request->isPost()) {
+            //生产部=>开票人
+            $sckp = Db::name('personnel')->where('bid',"=",3)->where('position','=',"sckp")->order('name desc')->select();
+            //生产部=>审核人
+            $scsh = Db::name('personnel')->where('bid',"=",3)->where('position','=',"scsh")->order('name desc')->select();
+            $this->assign('sckp',$sckp);
+            $this->assign('scsh',$scsh);
             $order = Db::name('order')->where('id',$ids)->find();
             $map = [];
             $map['name'] = array('like','%'.$order['product'].'%');
@@ -298,6 +325,10 @@ class Order extends Backend
             if (!empty($list)){
                 $res = $this->get_repeat_data($list);
             }
+            //批次号顺序新增
+            $tastbach = Db::name('task')->order('bach desc')->find();
+            $bach = $tastbach['bach'] +1;
+            $this->view->assign('bach',$bach);
 //             halt($res);die;
             $this->view->assign('ids',$ids);
             $this->view->assign('row', $res);
@@ -332,4 +363,29 @@ class Order extends Backend
         return $result;
     }
 
+    //关联客户管理中：客户名称 => 订货单位
+    public function customer_customer(){
+        $params = input('customer');
+        if ($params){
+            $customer = Db::name('customer')->where('customer_name','like','%'.$params.'%')->select();
+        }else{
+            $customer = Db::name('customer')->where('customer_name','neq','')->field('id,customer_name')->limit(20)->select();
+        }
+        $result = ['rows'=>$customer];
+        return json($result);
+    }
+
+    //关联订单品名
+    public function order_product(){
+        $params = input('product');
+        if ($params){
+            $customer = Db::name('order')->where('product','like','%'.$params.'%')->select();
+        }else{
+            $customer = Db::name('order')->where('product','neq','')->field('id,product')->limit(20)->select();
+        }
+        $total = count($customer);
+        $result = ['total'=>$total,'rows'=>$customer];
+        return json($result);
+    }
+
 }

application/admin/controller/Task.php

@@ -198,7 +198,6 @@ class Task extends Backend
 //        print_r($result);//汇总领料单
 //        echo "</pre>";
 
-
         $this->view->assign("task", $task);//生成领料单配方信息
         $this->view->assign("list", $list);//生成领料单
         $this->view->assign("result", $result);//汇总领料单

application/admin/view/common/header.html

@@ -24,9 +24,9 @@
         <div class="navbar-custom-menu">
             <ul class="nav navbar-nav">
 
-                <li class="hidden-xs">
-                    <a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>
-                </li>
+                <!--<li class="hidden-xs">-->
+                    <!--<a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>-->
+                <!--</li>-->
 
                 <!-- 清除缓存 -->
                 <li class="hidden-xs">
@@ -45,20 +45,20 @@
                     </ul>
                 </li>
 
-                <!-- 多语言列表 -->
-                {if $Think.config.lang_switch_on}
-                <li class="hidden-xs">
-                    <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a>
-                    <ul class="dropdown-menu">
-                        <li class="{$config['language']=='zh-cn'?'active':''}">
-                            <a href="?ref=addtabs&lang=zh-cn">简体中文</a>
-                        </li>
-                        <li class="{$config['language']=='en'?'active':''}">
-                            <a href="?ref=addtabs&lang=en">English</a>
-                        </li>
-                    </ul>
-                </li>
-                {/if}
+                 <!--多语言列表 -->
+                <!--{if $Think.config.lang_switch_on}-->
+                <!--<li class="hidden-xs">-->
+                    <!--<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a>-->
+                    <!--<ul class="dropdown-menu">-->
+                        <!--<li class="{$config['language']=='zh-cn'?'active':''}">-->
+                            <!--<a href="?ref=addtabs&lang=zh-cn">简体中文</a>-->
+                        <!--</li>-->
+                        <!--<li class="{$config['language']=='en'?'active':''}">-->
+                            <!--<a href="?ref=addtabs&lang=en">English</a>-->
+                        <!--</li>-->
+                    <!--</ul>-->
+                <!--</li>-->
+                <!--{/if}-->
 
                 <!-- 全屏按钮 -->
                 <li class="hidden-xs">

application/admin/view/feeding/add.html

@@ -25,8 +25,8 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-3">{:__('Bach')}:</label>
-        <div class="col-xs-12 col-sm-6" id="c_bach">
-            <input id="c-bach" data-rule="required" class="form-control" name="row[bach]" type="text">
+        <div class="col-xs-12 col-sm-6" id="c_bach" >
+            <input id="c-bach" data-rule="required" class="form-control"  name="row[bach]" type="text">
         </div>
     </div>
     <div class="form-group">
@@ -52,16 +52,26 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">操作人员:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-operator" data-rule="required" class="form-control" name="row[operator]" type="text">
+            <select style="width: 380px;height: 35px" id="c-operator"  class="form-control" name="row[operator]">
+                {foreach $cjcz as $key=>$vv}
+                <option value="{$vv.name}">{$vv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-operator" data-rule="required" class="form-control" name="row[operator]" type="text">-->
         </div>
         <label class="control-label col-xs-12 col-sm-2">检验人员:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-inspector" class="form-control" data-rule="required" name="row[inspector]" type="text">
+            <select style="width: 380px;height: 35px" id="c-inspector"  class="form-control" name="row[inspector]">
+                {foreach $cjjy as $key=>$vvv}
+                <option value="{$vvv.name}">{$vvv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-inspector" class="form-control" data-rule="required" name="row[inspector]" type="text">-->
         </div>
     </div>
     <div class="form-group">
         <div class="col-xs-12 col-sm-2">
-            扫描物料<input class="form-control" id="wuliao" name="123" type="text">
+            扫描物料<input class="form-control"  id="wuliao" name="123" type="text">
         </div>
         <div class="col-xs-12 col-sm-6" style="margin-top: 25px;font-size: 18px">
             <span>您本次扫描的物料是：</span><span id="input" style="color: red"></span>

application/admin/view/feeding/index.html

@@ -7,7 +7,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('feeding/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" style="width: 200px;height: 35px" class="btn btn-success btn-add {:$auth->check('feeding/add')?'':'hide'}" title="{:__('Add')}"><i class="fa fa-plus"></i> {:__('Add')}</a>
 <!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('feeding/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('feeding/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         

application/admin/view/formula/add.html

@@ -30,11 +30,21 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">{:__('Charge_name')}:</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">
+            <select style="width: 380px;height: 35px" id="c-charge_name"  class="form-control" name="row[charge_name]">
+                {foreach $jsdd as $key=>$vv}
+                <option value="{$vv.name}">{$vv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-charge_name" data-rule="required" class="form-control" name="row[charge_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">
-            <input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">
+            <select style="width: 380px;height: 35px" id="c-examine_name" class="form-control" name="row[examine_name]">
+                {foreach $jssh as $key=>$vvv}
+                <option value="{$vvv.name}">{$vvv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">-->
         </div>
     </div>
     <div class="form-group">

application/admin/view/formula/task.html

@@ -24,17 +24,27 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">批次号:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-bach" class="form-control" name="row[bach]" type="text">
+            <input id="c-bach" class="form-control" name="row[bach]" type="text" value="{$bach}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">开票人:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-drawer_name" data-rule="required" class="form-control" name="row[drawer_name]" type="text">
+            <select style="width: 380px;height: 35px" id="c-drawer_name"  class="form-control" name="row[drawer_name]">
+                {foreach $sckp as $key=>$vv}
+                <option value="{$vv.name}">{$vv.name}</option>
+                {/foreach}
+            </select>
+            <!--<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">
-            <input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">
+            <select style="width: 380px;height: 35px" id="c-examine_name"  class="form-control" name="row[examine_name]">
+                {foreach $scsh as $key=>$vvv}
+                <option value="{$vvv.name}">{$vvv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">-->
         </div>
     </div>
     <div class="form-group">

application/admin/view/index/index.html

@@ -4,8 +4,7 @@
         <!-- 加载样式及META信息 -->
         {include file="common/meta" /}
     </head>
-    <body class="hold-transition {$Think.config.fastadmin.adminskin|default='skin-black-blue'} sidebar-mini {:$Think.cookie.sidebar_collapse?'sidebar-collapse':''} fixed {:$Think.config.fastadmin.multipletab?'multipletab':''} {:$Think.config.fastadmin.multiplenav?'multiplenav':''}" id="tabs">
-
+    <body  class="hold-transition  sidebar-collapse {$Think.config.fastadmin.adminskin|default='skin-black-blue'} sidebar-mini {:$Think.cookie.sidebar_collapse?'sidebar-collapse':''} fixed {:$Think.config.fastadmin.multipletab?'multipletab':''} {:$Think.config.fastadmin.multiplenav?'multiplenav':''}" id="tabs">
         <div class="wrapper">
 
             <!-- 头部区域 -->

application/admin/view/order/add.html

@@ -1,21 +1,23 @@
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+<form id="add-form" class="form-horizontal" role="form" autocomplete="on" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-no" class="form-control" name="row[no]" type="text">
+            <input id="c-no" class="form-control" name="row[no]" type="text" value="MN/Q4-24-1">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer" data-rule="required" class="form-control" name="row[customer]" type="text">
+            <input id="c-customer" data-rule="required"  placeholder="请输入订货单位" data-primary-key="customer_name" data-source="order/customer_customer" data-field="customer_name" class="form-control selectpage" data-pagination="true" data-page-size="10" name="row[customer]" type="text">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Product')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-product" data-rule="required" class="form-control" name="row[product]" type="text">
+            <!--模糊查询数据库订单中配方品名-->
+            <!--<input id="c-product" data-rule="required" placeholder="请输入品名"  data-primary-key="product" data-source="order/order_product" data-field="product" class="form-control selectpage" name="row[product]" type="text">-->
+            <input id="c-product" data-rule="required" autocomplete="on" placeholder="请输入品名" class="form-control" name="row[product]" type="text">
         </div>
     </div>
     <div class="form-group">
@@ -33,7 +35,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="number">
+            <input id="c-number" data-rule="required" placeholder="请输入数量" class="form-control" name="row[number]" type="number">
         </div>
     </div>
     <div class="form-group">
@@ -76,13 +78,23 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_name" data-rule="required" class="form-control" name="row[user_name]" type="text">
+            <select style="width: 1050px;height: 30px" id="c-user_name" data-rule="required" class="form-control" name="row[user_name]">
+                {foreach $yxjb as $key=>$vv}
+                    <option value="{$vv.name}">{$vv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-user_name" data-rule="required" class="form-control" name="row[user_name]" type="text">-->
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Examine')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-examine" data-rule="required" class="form-control" name="row[examine]" type="text">
+            <select style="width: 1050px;height: 30px" id="c-examine" data-rule="required" class="form-control" name="row[examine]">
+                {foreach $yxsh as $key=>$vvv}
+                <option value="{$vvv.name}">{$vvv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-examine" data-rule="required" class="form-control" name="row[examine]" type="text">-->
         </div>
     </div>
 
@@ -102,7 +114,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
         <div class="col-xs-12 col-sm-8">
             <!--            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text">-->
-            <input id="c-delivery_date" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[delivery_date]" type="text" value="">
+            <input id="c-delivery_date" data-rule="required" placeholder="请选择交货日期" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[delivery_date]" type="text" value="">
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/order/edit.html

@@ -85,12 +85,6 @@
             <input id="c-examine" data-rule="required" class="form-control" name="row[examine]" type="text" value="{$row.examine|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text" value="{$row.delivery_date|htmlentities}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Create')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -103,7 +97,12 @@
             <input id="c-update" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update]" type="text" value="{$row.update}">
         </div>
     </div>
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_date')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-delivery_date" data-rule="required" class="form-control" name="row[delivery_date]" type="text" value="{$row.delivery_date|htmlentities}">
+        </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">

application/admin/view/order/task.html

@@ -30,17 +30,27 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">批次号:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-bach" class="form-control" name="row[bach]" type="text">
+            <input id="c-bach" class="form-control" name="row[bach]" type="text" value="{$bach}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">开票人:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-drawer_name" data-rule="required" class="form-control" name="row[drawer_name]" type="text">
+            <select style="width: 380px;height: 35px" id="c-drawer_name"  class="form-control" name="row[drawer_name]">
+                {foreach $sckp as $key=>$vv}
+                <option value="{$vv.name}">{$vv.name}</option>
+                {/foreach}
+            </select>
+            <!--<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">审核人:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">
+            <select style="width: 380px;height: 35px" id="c-examine_name"  class="form-control" name="row[examine_name]">
+                {foreach $scsh as $key=>$vvv}
+                <option value="{$vvv.name}">{$vvv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">-->
         </div>
     </div>
     <div class="form-group">

application/admin/view/printt/index.html

@@ -6,169 +6,138 @@
     <script language="javascript" src="__CDN__/assets/js/template.js"></script>
 </head>
 <body>
-    <div style="width: 60%; height: 510px;margin: 0 auto;">
-        <div class="form-group">
-            <div class="col-xs-12 col-sm-8">
-                <h3 style="color: red">提示：如果生成多个不同物料码请换行输入</h3><br>
-                <span>纸张选择&nbsp;</span>
-                <select id="selectList" style="height: 25px;border-radius: 5px 5px 5px 5px">
-                    <option value="10*6">不选择默认10*6&nbsp;&nbsp;</option>
-                    <option value="10*5">10*5</option>
-                    <option value="10*6">10*6</option>
-                    <option value="10*8">10*8</option>
-                </select>
-                <br><br>
-                <span>打印数量&nbsp;</span>
-                <!--if(value>100)value=100 最大限制100-->
-                <input type="number" id="number" placeholder="不填默认打印两份"  min="0" oninput="value=value.replace('-', '');" >
-                <!--<select id="number"  style="border-radius: 5px 5px 5px 5px">-->
-                    <!--<option value="2">不填默认打印两份</option>-->
-                    <!--<option value="1">1</option>-->
-                    <!--<option value="2">2</option>-->
-                    <!--<option value="3">3</option>-->
-                    <!--<option value="4">4</option>-->
-                    <!--<option value="5">5</option>-->
-                    <!--<option value="6">6</option>-->
-                    <!--<option value="7">7</option>-->
-                    <!--<option value="8">8</option>-->
-                    <!--<option value="9">9</option>-->
-                    <!--<option value="10">10</option>-->
-                    <!--<option value="11">11</option>-->
-                    <!--<option value="12">12</option>-->
-                    <!--<option value="13">13</option>-->
-                    <!--<option value="14">14</option>-->
-                    <!--<option value="15">15</option>-->
-                    <!--<option value="16">16</option>-->
-                    <!--<option value="17">17</option>-->
-                    <!--<option value="18">18</option>-->
-                    <!--<option value="19">19</option>-->
-                    <!--<option value="20">20</option>-->
-                <!--</select>-->
-                <br><br>
-            </div>
+<div style="width: 60%; height: 510px;margin: 0 auto;">
+
+    <div class="form-group">
+        <div class="col-xs-12 col-sm-8"><br>
+            <h4 style="color: red">提示：如果生成多个不同物料不请换行输入，打印中带有（）请使用英文()</h4><br>
+            <span>纸张选择&nbsp;</span>
+            <select id="selectList" style="height: 25px;border-radius: 5px 5px 5px 5px">
+                <option value="10*6">不选择默认10*6&nbsp;&nbsp;</option>
+                <option value="10*5">10*5</option>
+                <option value="10*6">10*6</option>
+                <option value="10*8">10*8</option>
+            </select>
+            <br><br>
+            <span>打印数量&nbsp;</span>
+            <input type="number" id="number" placeholder="不填默认打印两份"  min="0" oninput="value=value.replace('-', '');" >
+            <br><br>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-xs-12 col-sm-8">
+            <span>日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <input type="text" id="time" placeholder="请输入日期" readonly disabled>
+            <br><br>
         </div>
-        <div class="form-group">
-            <label class="control-label col-xs-12 col-sm-8">打印区域</label>
-            <div class="col-xs-12 col-sm-8">
-                <textarea name="" id="textarea"  cols="30" rows="10"></textarea>
-            </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-8">打印区域</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea name="" id="textarea" cols="70" rows="10"></textarea>
         </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"><br><br>
-                <a href="javascript:small_v2_print()" id="print" class="btn btn-default btn-embossed print">打印</a>
-                <!--<button id="button">选择其他打印机打印</button>-->
-            </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"><br><br>
+            <a href="javascript:small_v2_print()" id="print" class="btn btn-default btn-embossed print">打印</a>
         </div>
     </div>
+
+</div>
 <script language="javascript" type="text/javascript">
+    function time(){
+        var time = new Date();
+        var h = time.getFullYear();//获取年
+        var m = time.getMonth() + 1;//获取月
+        var d = time.getDate();//获取日
+        // var H = time.getHours();//获取时
+        // var M = time.getMinutes();//获取分
+        // var S = time.getSeconds();//获取秒
+        // return h+""+m+""+d+""+H+""+M+""+S;
+        return h+""+m+""+d; //返回 年月日时分秒
+    }
+    document.getElementById("time").value = time().slice(2);//获取年月日,截取前两位
+
     // 打印
-    function small_v2_print(result) {
-        // 获取 textarea 中的所有文本值
-        // 获取 selectList 下拉选项纸张大小
-        // 获取 number 打印数量
-        var textarea = $("#textarea").val();
-        let selectList =document.getElementById("selectList").value;
-        let number =document.getElementById("number").value;
-        // 拆分出每一行
-        var arr = textarea.split("\n");
-        for (var i=0;i<arr.length;i++) {
-            //将每一行继续按逗号、制表符拆分：split(/[符号1,符号2]/)
-            var pairs = arr[i].split(/[,\t]/);
-            for (var j=0;j<pairs.length;j++) {
-                if($("#textarea").val() == ''){
-                    alert("打印区域不能为空");
-                }else{
-                    // 打印具体的每个键值
-                    var barcode = pairs[0];
-                    // console.log(barcode);
-                    CreateOneFormPage(barcode,selectList,number);
+    function small_v2_print() {
+        var textarea = $("#textarea").val();// 获取 textarea 中的所有文本值
+        let selectList =document.getElementById("selectList").value;// 获取 selectList 下拉选项纸张大小
+        let number =document.getElementById("number").value; // 获取 number 打印数量
+        let time =document.getElementById("time").value;//获取六位数时间
+        if(escape(textarea).indexOf("%u")<0){
+            var arr = textarea.split("\n");// 按换行拆分出所有文本每一行
+            for (var i=0;i<arr.length;i++) {
+                //将每一行继续按逗号、制表符拆分：split(/[符号1,符号2]/)
+                var pairs = arr[i].split(/[,\t]/);
+                for (var j=0;j<pairs.length;j++) {
+                    if($("#textarea").val() == ''){
+                        alert("打印区域不能为空");
+                    }else{
+                        var barcode = pairs[0];// 取出具体的每个键值
+                        // console.log(barcode);
+                        // 文字,标签大小,数量,时间
+                        CreateOneFormPage(barcode,selectList,number,time);
+                    }
                 }
             }
         }
+        else{
+            layer.confirm("不能包含中文", {
+                title: ['信息'],
+                btn: ['确认'],
+                icon: 0,
+                closeBtn: 2,
+                shade: [0.3, '#000'],
+                shadeClose: true,
+                id: "one",
+                anim: 2,
+                isOutAnim: false,
+                area: ['30%', '30%'],
+            });
+            // alert("不能包含中文");
+        }
     };
 
     var LODOP; //声明为全局变量
-    function CreateOneFormPage(barcode,selectList,number){
+    function CreateOneFormPage(barcode,selectList,number,time){
         LODOP=getLodop();
-        var strBodyStyle="<style>body{color:balck;font-size: 20px;text-align: center;}</style>";
-        LODOP.SET_LICENSES("","152A06E8F6CBD6AC1F213ABFCB0D8604","C94CEE276DB2187AE6B65D56B3FC2848","");
+        //strBodyStyle=字体样式、barcodenumber=字体换行
+        var strBodyStyle = "<style>body{font-size: 30px;text-align: center;}</style>";
+        var barcodenumber = barcode.substring(0,10)+"</br>"+barcode.substring(10,20)+"</br>"+barcode.substring(20,30)+"</br>"+barcode.substring(30,40)+"</br>"+barcode.substring(40,50);
         LODOP.PRINT_INIT("");
         //判断用户打印份数
         if(number){
-            LODOP.SET_PRINT_COPIES(number);//打印数量
+            LODOP.SET_PRINT_COPIES(number);
         }else{
             LODOP.SET_PRINT_COPIES(2);
         }
-        //判断用户选择的纸张规格
-        if(selectList == "10*5"){
-            LODOP.SET_PRINT_PAGESIZE(3,1000,500,"");
-            LODOP.ADD_PRINT_HTM("4.45mm","2.91mm","RightMargin:-2.91mm","BottomMargin:41.54mm",strBodyStyle+barcode);
-            LODOP.ADD_PRINT_BARCODE(39,111,"88mm","40.01mm","QRCode",barcode);
-            // LODOP.PRINT();//打印
-        }
+        //判断用户选择的纸张大小规格
         if(selectList == "10*6"){
-            LODOP.SET_PRINT_PAGESIZE(3,1000,600,"");
-            LODOP.ADD_PRINT_HTM("4.71mm","0.26mm","RightMargin:-0.26mm","BottomMargin:41.28mm",strBodyStyle+barcode);
-            LODOP.ADD_PRINT_BARCODE(44,105,"88mm","40.01mm","QRCode",barcode);
-            // LODOP.PRINT();//打印
-        }
-        if(selectList == "10*8"){
-            LODOP.SET_PRINT_PAGESIZE(3,1000,800,"");
-            LODOP.ADD_PRINT_HTM(59,-199,"200mm","149.99mm",strBodyStyle+barcode);
-            LODOP.ADD_PRINT_BARCODE(98,97,"101.76mm","47.68mm","QRCode",barcode);
-            // LODOP.PRINT();//打印
+            LODOP.SET_PRINT_PAGESIZE(2,"1100","600","");
+            LODOP.SET_PRINT_MODE("RESELECT_ORIENT",true);
+            LODOP.SET_PRINT_MODE("PRINT_NOCOLLATE",1);
+            LODOP.ADD_PRINT_HTM(17,-133,498,334,strBodyStyle+barcodenumber);
+            LODOP.ADD_PRINT_TEXT(219,-4,238,37,time);
+            LODOP.SET_PRINT_STYLEA(0,"FontSize",15);
+            LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+            LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+            LODOP.ADD_PRINT_BARCODE(245,45,"108.9mm","49mm","QRCode",barcode);
+            // LODOP.ADD_PRINT_BARCODE(245,45,"108.9mm","49mm","QRCode","thUXsyxxh（frw）pch（14073142556，14071242329）");
+            LODOP.SET_PRINT_STYLEA(0,"QRCodeVersion",7);
+
         }
+
         LODOP.PRINT();//打印
         // LODOP.PREVIEW();//打印预览
         // LODOP.PRINTA();//选择打印机进行打印
         // LODOP.PRINT_SETUP();//打印维护设置大小
     };
-
-
-
-    //选择打印机打印   如果将button按钮打开,下面的数据代码不需要改动
-    var btn = document.getElementById("button");
-    btn.onclick = function(){
-        var textarea = $("#textarea").val();
-        let selectList =document.getElementById("selectList").value;
-        var arr = textarea.split("\n");
-        for (var i=0;i<arr.length;i++) {
-            var pairs = arr[i].split(/[,\t]/);
-            for (var j=0;j<pairs.length;j++) {
-                if($("#textarea").val() == ''){
-                    alert("打印区域不能为空");
-                }else{
-                    var barcode = pairs[0];
-                    CreateOneFormPage2(barcode,selectList);
-                }
-            }
-        }
-    }
-    function CreateOneFormPage2(barcode,selectList){
-        LODOP=getLodop();
-        var strBodyStyle="<style>body{color:balck;font-size: 20px;text-align: center;}</style>";
-        LODOP.SET_LICENSES("","152A06E8F6CBD6AC1F213ABFCB0D8604","C94CEE276DB2187AE6B65D56B3FC2848","");
-        LODOP.PRINT_INIT("");
-        //判断用户选择的纸张规格
-        if(selectList == "10*5"){
-            LODOP.SET_PRINT_PAGESIZE(3,1000,500,"");
-            LODOP.ADD_PRINT_HTM("4.45mm","2.91mm","RightMargin:-2.91mm","BottomMargin:41.54mm",strBodyStyle+barcode);
-            LODOP.ADD_PRINT_BARCODE(39,111,"88mm","40.01mm","QRCode",barcode);
-        }
-        if(selectList == "10*6"){
-            LODOP.SET_PRINT_PAGESIZE(3,1000,600,"");
-            LODOP.ADD_PRINT_HTM("4.71mm","0.26mm","RightMargin:-0.26mm","BottomMargin:41.28mm",strBodyStyle+barcode);
-            LODOP.ADD_PRINT_BARCODE(44,105,"88mm","40.01mm","QRCode",barcode);
-        }
-        if(selectList == "10*8"){
-            LODOP.SET_PRINT_PAGESIZE(3,1000,800,"");
-            LODOP.ADD_PRINT_HTM(59,-199,"200mm","149.99mm",strBodyStyle+barcode);
-            LODOP.ADD_PRINT_BARCODE(98,97,"101.76mm","47.68mm","QRCode",barcode);
-        }
-        LODOP.PRINTA();//选择打印机进行打印
-    };
 </script>
 </body>
 </html>
 
+

public/assets/js/backend/feeding.js

@@ -41,6 +41,15 @@ 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);
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
@@ -50,6 +59,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
             $('#c-bach').keydown((e)=>{
                 let key = e.which;
                 if(key == 13){
+                    $("#wuliao").focus();
                     if(num === 0){
                         var bach = $("#c-bach").val();
                         if (bach == ''){
@@ -92,6 +102,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                         }
                                         $("#bach").css('cssText','display:none! important');//隐藏按钮,下拉菜单
                                         $("#btn").css('display','none');
+
                                         $.ajax({
                                             method:"POST",
                                             url:"feeding/get_formula",
@@ -131,6 +142,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                 $("#print_gy").append(html);
                                                 $("#table").append(str);
                                                 $("#c-bach").attr('readonly','readonly');//批次号输入框变为只读
+
                                                 $("#wuliao").keydown((e)=>{
                                                     let key = e.which;
                                                     var error = 0;
@@ -183,8 +195,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                     $("#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.operator);
-                                    $("#c-inspector").val(res.inspector);
+                                    // $("#c-operator").val(res.operator);
+                                    // $("#c-inspector").val(res.inspector);
                                     $.ajax({
                                         method: "POST",
                                         url: "feeding/get_formula",

public/assets/js/backend/index.js

@@ -96,6 +96,17 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
                 });
             });
 
+            //所有界面全屏事件
+            // var docElm = document.documentElement;
+            //
+            // if (docElm.webkitRequestFullScreen) {
+            //     docElm.webkitRequestFullScreen();
+            // }
+            // document.addEventListener("webkitfullscreenchange", function () {
+            //
+            //     fullscreenState.innerHTML = (document.webkitIsFullScreen) ? "" : "not ";
+            // }, false);
+
             //全屏事件
             $(document).on('click', "[data-toggle='fullscreen']", function () {
                 var doc = document.documentElement;

public/assets/js/backend/stock.js

@@ -39,6 +39,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     ]
                 ]
             });
+            table.on('post-body.bs.table',function(){
+                $(".btn-editone").data("area",["100%","100%"]);
+            });
 
             // 为表格绑定事件
             Table.api.bindevent(table);
@@ -83,14 +86,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     });
             },10000);//10000 十秒
 
-
         },
+
         add: function () {
             Controller.api.bindevent();
         },
         edit: function () {
             Controller.api.bindevent();
         },
+        print: function () {
+            Controller.api.bindevent();
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));