油墨优化功能

application/admin/controller/Customer.php

@@ -19,6 +19,7 @@ class Customer extends Backend
      * @var \app\admin\model\Customer
      */
     protected $model = null;
+    protected $searchFields = "id,customer_name";//搜索查询字段
 
     public function _initialize()
     {

application/admin/controller/Feeding.php

@@ -56,7 +56,7 @@ class Feeding extends Backend
             $this->assign('cjjy',$cjjy);
             return $this->view->fetch();
         }
-//        echo "<pre>";print_r($_POST);echo "</pre>";
+//        echo "<pre>";print_r($_POST['bach']);echo "</pre>";die;
         $tid = Db::name('task')->where('bach',$_POST['bach'])->order('id desc')->find();
         if(empty($_POST['weight'])){
             $this->error('投料数据不能为空');
@@ -140,6 +140,7 @@ class Feeding extends Backend
         $bach = $this->request->post('bach');
         $row = Db::name('feeding')->where('bach',$bach)->select();
         $res = Db::name('task')->where('bach',$bach)->order('create','desc')->select();
+
         //已有过工序
         if($row){
             $result['inspector'] = $row[0]['inspector'];
@@ -193,6 +194,9 @@ class Feeding extends Backend
             if($v['material'] == null){
                 $v['material'] = '';
             }
+            if($v['material_bach'] == null){
+                $v['material_bach'] = '';
+            }
             $total = array_column($res,'percentage');
             foreach ($total as $key=>$value){
                 $total[$key] = decode($value);

application/admin/controller/Formula.php

@@ -21,7 +21,7 @@ class Formula extends Backend
      * @var \app\admin\model\Formula
      */
     protected $model = null;
-    protected $searchFields = "name";
+    protected $searchFields = "id,name";//搜索查询字段
     protected $noNeedLogin = ['gyName',"addFormulaChinese"];
 
     public function _initialize()
@@ -93,6 +93,7 @@ class Formula extends Backend
                 ->order($sort, $order)
                 ->paginate($limit);
         }
+
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
@@ -129,6 +130,8 @@ class Formula extends Backend
         $params['version'] = $base[5];
         $params['date'] = $base[6];
         $params['model'] = $base[8];
+        $params['controlled_one'] = $base[9];
+        $params['controlled_two'] = $base[10];
         if ($base[7] !== 99){
             $customer= explode(',',$base[7]);
 //            print_r($base[7]);die;
@@ -262,11 +265,10 @@ class Formula extends Backend
          */
         $base = $this->request->post('baseData/a');
         $formula = $this->request->post('formulaData/a');
-
         if (empty($base) || empty($formula)){
             $this->error('数据不能为空');
         }
-        $version = Db::name('formula')->where('name',$base[0])->order('id desc')->value('version');
+        $version = Db::name('formula')->where('id',$ids)->order('id desc')->value('version');
         $version = substr($version,1);//获取当前最新版本号，后续看工艺情况是否更改
         //基础数据
         $params = [];
@@ -417,12 +419,23 @@ class Formula extends Backend
             $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();
+
+            //查询该配方是否生产过
+            $taskbach = Db::name('task')->where('fid',$list['id'])->order('create desc')->find();
+            $count = Db::name('task')->where('fid',$list['id'])->count();
+                if($taskbach){
+                    $erro = '该配方在于最近 '.$taskbach['create'].' 已生产过'.$count.'次';
+                }else{
+                    $erro = '该配方未生产过';
+                }
+            $this->view->assign('erro',$erro);
+
             $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){
                 $list['gyinfo'][$key]['percentage'] = decode($value['percentage']);
@@ -539,12 +552,13 @@ class Formula extends Backend
             return $this->view->fetch();
         }
         $status =  $this->request->post('status');
-
         if (!isset($status) || !isset($ids)){
             $this->error('审核失败');
         }
         $params = [];
-        $params['examine_status'] = $status;
+        $user_info = Session::get('admin');
+        $params['examine_userid'] = $user_info['id'];//审核用户id
+        $params['examine_status'] = $status;//审核状态
         $params['update'] = date('Y-m-d H:i:s');
         $result = false;
         Db::startTrans();
@@ -568,6 +582,32 @@ class Formula extends Backend
         }
 
     }
+
+    //审核记录列表
+    public function examine_status(){
+        $user_info = Session::get('admin');
+        $formula = Db::name('formula')->where('examine_userid',$user_info['id'])->order('update desc')
+                    ->paginate(10,false);
+        $page = $formula->render();
+        $this->view->assign('page',$page);
+        $this->view->assign('formula',$formula);
+        return $this->view->fetch();
+    }
+
+    //审核记录详情列表
+    public function examine_list(){
+            $get = $this->request->get();
+            $formula = Db::name('formula')->where('id',$get['id'])->find();
+            $formula_detail = Db::name('formula_detail')->where('pid',$get['id'])->select();
+            foreach ($formula_detail as $key=>$value){
+                $formula_detail[$key]['percentage'] = decode($value['percentage']);
+            }
+            $this->view->assign('formula',$formula);
+            $this->view->assign('formula_detail',$formula_detail);
+        return $this->view->fetch();
+    }
+
+
     //下拉选择获取客户列表
     public function getCustomer(){
         $user_info = Session::get('admin');

application/admin/controller/Index.php

@@ -101,7 +101,7 @@ class Index extends Backend
                     $this->error($validate->getError(), $url, ['token' => $this->request->token()]);
                 }
                 AdminLog::setTitle(__('Login'));
-                $result = $this->auth->login($username, $password, $keeplogin ? 86400 : 0);
+                $result = $this->auth->login($username, $password, $keeplogin ? 2592000 : 0);
                 if ($result === true) {
                     // 登陆成功后,短信通知账号拥有者
                     $mobile = Admin::get($this->auth->id)['mobile'];
@@ -121,8 +121,8 @@ class Index extends Backend
                 }
                 $tel = Admin::get(['mobile'=>$mobile]);
                 // 是否已注册过账号
-                if($tel){  // 注册过,直接登录
-                    $result = $this->auth->login($mobile, '', $keeplogin ? 86400 : 0,1);
+                if($tel){  // 注册过,直接登录86400
+                    $result = $this->auth->login($mobile, '', $keeplogin ? 2592000 : 0,1);
                     if ($result === true) {
                         $mobile = Admin::get($this->auth->id)['mobile'];
                         (new Sample)->send_verify($mobile,$mobile,'SMS_243348221');
@@ -135,7 +135,7 @@ class Index extends Backend
                     }
                 }else{  // 没注册过, 先注册
                     $this->register($mobile);
-                    $this->auth->login($mobile, '', $keeplogin ? 86400 : 0,1);
+                    $this->auth->login($mobile, '', $keeplogin ? 2592000 : 0,1);
                     Hook::listen("admin_login_after", $this->request);
                     $this->success(__('Login successful'), $url, ['url' => $url, 'id' => $this->auth->id, 'username' => $tel, 'avatar' => $this->auth->avatar]);
                 }

application/admin/controller/Order.php

@@ -15,7 +15,7 @@ use think\Db;
  */
 class Order extends Backend
 {
-    protected $searchFields = 'customer,product';
+    protected $searchFields = 'customer,product,id,remark';
 
     /**
      * Order模型对象
@@ -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("eseList", $this->model->getEseList());
 //        $this->view->assign("personnel", $this->model->getpersonnel());
     }
 
@@ -121,6 +122,7 @@ class Order extends Backend
             $arr['username'] = $user_info['nickname'];
             $arr['type'] = 1;
             $arr['orderstu'] = 1;
+
             $this->model->save($arr);//添加到订单管理
             $this->logmodel->save($arr);//在添加订单管理日志
             Db::commit();
@@ -268,6 +270,8 @@ class Order extends Backend
                                     $arr['after'] = '生产中';
                                 }else if($params['status'] == 3){
                                     $arr['after'] = '已完成';
+                                }else if($params['status'] == 4){
+                                    $arr['after'] = '待申购';
                                 }
                             }
                             if ($row['status'] == 2) {
@@ -276,6 +280,8 @@ class Order extends Backend
                                     $arr['after'] = '计划中';
                                 }else if($params['status'] == 3){
                                     $arr['after'] = '已完成';
+                                }else if($params['status'] == 4){
+                                    $arr['after'] = '待申购';
                                 }
                             }
                             if ($row['status'] == 3) {
@@ -284,6 +290,33 @@ class Order extends Backend
                                     $arr['after'] = '生产中';
                                 }else if($params['status'] == 1){
                                     $arr['after'] = '计划中';
+                                }else if($params['status'] == 4){
+                                    $arr['after'] = '待申购';
+                                }
+                            }
+                            if ($row['status'] == 4) {
+                                $arr['before'] = '待申购';
+                                if($params['status'] == 2){
+                                    $arr['after'] = '生产中';
+                                }else if($params['status'] == 1){
+                                    $arr['after'] = '计划中';
+                                }else if($params['status'] == 3){
+                                    $arr['after'] = '已完成';
+                                }
+                            }
+                            break;
+                        case 'ese':
+                            $arr['field'] = '是否烟标';
+                            if ($row['ese'] == 1) {
+                                $arr['before'] = '烟标';
+                                if($params['ese'] == 2){
+                                    $arr['after'] = '非烟标';
+                                }
+                            }
+                            if ($row['ese'] == 2) {
+                                $arr['before'] = '非烟标';
+                                if($params['ese'] == 1){
+                                    $arr['after'] = '烟标';
                                 }
                             }
                             break;
@@ -336,6 +369,17 @@ class Order extends Backend
                 $res = $this->get_repeat_data($list);
             }
 
+            //查询该配方是否生产过
+//            $list = Db::name('formula')->where($map)->find();
+//            $taskbach = Db::name('task')->where('fid',$list['id'])->order('create desc')->find();
+//            $count = Db::name('task')->where('fid',$list['id'])->count();//生产次数
+//            if($taskbach){
+//                $erro = '该配方在于最近 '.$taskbach['create'].' 已生产过'.$count.'次';
+//            }else{
+//                $erro = '该配方未生产过';
+//            }
+//            $this->view->assign('erro',$erro);
+
             //批次号顺序新增
             $tastbach = Db::name('task')->order('bach desc')->find();
             $bach = $tastbach['bach'] +1;
@@ -377,20 +421,42 @@ class Order extends Backend
 
     //关联客户管理中：客户名称 => 订货单位
     public function customer_customer(){
-        $params = input('customer');
+        $params = $this->request->post();
         $user_info = Session::get('admin');
         $map = [];
         if($user_info['id'] !== 1){
             $map['company_id'] = $user_info['company_id'];
         }
         if ($params){
-            $customer = Db::name('customer')->where('customer_name','like','%'.$params.'%')->where($map)->select();
+            $customer = Db::name('customer')->where('customer_name','like','%'.$params['q_word'][0].'%')->order('id desc')->where($map)->select();
+//            $customer = Db::name('customer')->where('customer_name','like','%'.$params['q_word'][0].'%')->order('id desc')->where($map)->limit(20)->select();
         }else{
-            $customer = Db::name('customer')->where('customer_name','neq','')->where($map)->field('id,customer_name')->limit(20)->select();
+            $customer = Db::name('customer')->where('customer_name','neq','')->where($map)->field('id,customer_name')->order('id desc')->select();
         }
-        $result = ['rows'=>$customer];
+        $total = count($customer);
+        $result = ['total'=>$total,'rows'=>$customer];
         return json($result);
     }
+//    public function customer_customer(){
+//        $params = input('customer');
+//        $user_info = Session::get('admin');
+//        $map = [];
+//        if($user_info['id'] !== 1){
+//            $map['company_id'] = $user_info['company_id'];
+//        }
+//        if ($params){
+//            $customer = Db::name('customer')->where('customer_name','like','%'.$params.'%')->where($map)->select();
+//        }else{
+//            $customer = Db::name('customer')->where('customer_name','neq','')->where($map)->field('id,customer_name')->order('id desc')->select();
+//        }
+////        $result = ['rows'=>$customer];
+//
+//        $total = count($customer);
+//        $result = ['total'=>$total,'rows'=>$customer];
+//        return json($result);
+//    }
+
+
 
     //关联订单品名
 //    public function order_product(){

application/admin/controller/Printt.php

@@ -30,5 +30,4 @@ class Printt extends Backend
             return $formula_material;
         }
     }
-
 }

application/admin/controller/Task.php

@@ -12,7 +12,7 @@ use think\Db;
  */
 class Task extends Backend
 {
-    protected $searchFields = 'name,bach,machine';
+    protected $searchFields = 'id,name,bach,machine,fid';
     /**
      * Task模型对象
      * @var \app\admin\model\Task

application/admin/lang/zh-cn/formula.php

@@ -20,5 +20,7 @@ return [
     'Status'           => '状态',
     'Status 1'         => '正常',
     'Status 2'         => '弃用',
-    'Create'           => '创建时间'
+    'Create'           => '创建时间',
+    'controlled_one'           => 'voc标准',
+    'controlled_two'           => '受控'
 ];

application/admin/lang/zh-cn/order.php

@@ -18,8 +18,12 @@ return [
     'Status 1'      => '计划中',
     'Status 2'      => '生产中',
     'Status 3'      => '已完成',
+    'Status 4'      => '待申购',
     'Create'        => '创建时间',
     'Update'        => '更新时间',
     'Company_id'    => '公司id',
     'Completed'    => '已完成数量',
+    'Ese'    => '是否烟标',
 ];
+
+

application/admin/model/Order.php

@@ -27,9 +27,15 @@ class Order extends Model
     
     public function getStatusList()
     {
-        return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3')];
+        return ['1' => __('Status 1'), '2' => __('Status 2'), '3' => __('Status 3'), '4' => __('Status 4')];
     }
 
+    public function getEseList()
+    {
+        return ['1' => __('烟标'), '2' => __('非烟标')];
+    }
+
+
 
     public function getStatusTextAttr($value, $data)
     {

application/admin/view/common/header.html

@@ -62,7 +62,7 @@
 
                 <!-- 全屏按钮 -->
                 <li class="hidden-xs">
-                    <a href="#" data-toggle="fullscreen"><i class="fa fa-arrows-alt"></i></a>
+                    <a href="#" data-toggle="fullscreen" title="全屏或取消全屏">全屏或取消全屏&nbsp;<i class="fa fa-arrows-alt"></i></a>
                 </li>
 
                 <!-- 账号信息下拉框 -->

application/admin/view/common/menu.html

@@ -11,7 +11,7 @@
         </div>
     </div>
 
-    <!-- 菜单搜索 -->
+     <!--菜单搜索 -->
     <form action="" method="get" class="sidebar-form" onsubmit="return false;">
         <div class="input-group">
             <input type="text" name="q" class="form-control" placeholder="{:__('Search menu')}">

application/admin/view/customer/index.html

@@ -8,21 +8,22 @@
                     <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('customer/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('customer/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('customer/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('customer/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
-                        <div class="dropdown btn-group {:$auth->check('customer/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
-                            </ul>
-                        </div>
+                        <!--<div class="dropdown btn-group {:$auth->check('customer/multi')?'':'hide'}">-->
+                            <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+                            <!--<ul class="dropdown-menu text-left" role="menu">-->
+                                <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
+                                <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
+                            <!--</ul>-->
+                        <!--</div>-->
 
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-show-toggle="false"
                            data-operate-edit="{:$auth->check('customer/edit')}"
                            data-operate-del="{:$auth->check('customer/del')}"
                            width="100%">

application/admin/view/feeding/add.html

@@ -275,5 +275,4 @@
 <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>
-
 </script>

application/admin/view/feeding/index.html

@@ -12,13 +12,13 @@
                         <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>
                         
 
-                        <div class="dropdown btn-group {:$auth->check('feeding/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
-                            </ul>
-                        </div>
+                        <!--<div class="dropdown btn-group {:$auth->check('feeding/multi')?'':'hide'}">-->
+                            <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+                            <!--<ul class="dropdown-menu text-left" role="menu">-->
+                                <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
+                                <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
+                            <!--</ul>-->
+                        <!--</div>-->
 
                         
                     </div>

application/admin/view/formula/add.html

@@ -75,9 +75,12 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1"></label>
         <div class="col-xs-12 col-sm-3">
-            <label><input name="controlled" type="checkbox" value="voc标准" id="controlled_one">voc标准</label>
-            <label><input name="controlled" type="checkbox" value="受控" checked  id="controlled_two">受控</label>
-            <label><input name="controlled" type="checkbox" value="ROHS" checked id="controlled_thr">ROHS</label>
+            <label><input name="row[controlled]" type="checkbox" value="voc标准" id="controlled_one">voc标准</label>
+            <label><input name="row[controlled]" type="checkbox" value="受控" checked  id="controlled_two">受控</label>
+
+            <!--<label><input name="controlled" type="checkbox" value="voc标准" id="controlled_one">voc标准</label>-->
+            <!--<label><input name="controlled" type="checkbox" value="受控" checked  id="controlled_two">受控</label>-->
+            <!--<label><input name="controlled" type="checkbox" value="ROHS" checked id="controlled_thr">ROHS</label>-->
         </div>
     </div>
 
@@ -129,11 +132,10 @@
                         <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" colspan="3" style="border: none;" id="str">
-
-                           </td>
-<!--                        <td class="tg-4qqe"  style="border: none"></td>-->
-<!--                        <td class="tg-s5vw"  style="border: none"></td>-->
+                        <!--voc标准 受控-->
+                        <td class="tg-4qqe" colspan="3" style="border: none;" id="str"></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>
@@ -144,7 +146,8 @@
                     <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-kghl"  style="border: none"><input id="formula" value="" style="width: 400px;text-align: center"></td>-->
+                        <td class="tg-kghl"  style="border: none"><textarea id="formula" value=""  style="overflow-x:hidden;overflow-y:hidden;height: 80px;resize:none;width: 400px;text-align: center;font-size: 16px"></textarea></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>
@@ -197,21 +200,25 @@
             var date = $('#c-date').val();
             $('#date').text(date);
             var str = '';
+            //voc标准
             if ($('#controlled_one').prop("checked") == true){
                 var print_controlled_one = $('#controlled_one').val();
                 str += '<span style="border:2px solid;" id="print_controlled_one">'+print_controlled_one+'</span>';
             }
+            //受控
             if ($('#controlled_two').prop("checked") == true){
                 var print_controlled_two = $('#controlled_two').val();
                 str += ' <span  style="border:2px solid;" id="print_controlled_two">'+print_controlled_two+'</span>&nbsp;';
             }
-            if ($('#controlled_thr').prop("checked") == true){
-                var print_controlled_thr = $('#controlled_thr').val();
-                str += '<span style="border:2px solid;" id="print_controlled_thr">'+print_controlled_thr+'</span>';
-            }
+            //ROHS
+            // if ($('#controlled_thr').prop("checked") == true){
+            //     var print_controlled_thr = $('#controlled_thr').val();
+            //     str += '<span style="border:2px solid;" id="print_controlled_thr">'+print_controlled_thr+'</span>';
+            // }
             $('#str').html(str);
             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>';
+            html += '<tr><td style="width: 200px;text-align: center">原材料</td><td  style="width: 50px;text-align: center">百分比</td><td style="width: 400px;text-align: center">操作工艺说明</td></tr>';
+            // 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++) {
@@ -219,8 +226,8 @@
                 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 += '<tr ><td style="width: 100px;text-align: center;font-size: 18px">'+tdOne+'</td>';
+                html += '<td style="width: 50px;text-align: center;font-size: 18px">'+tdTwo+'</td>';
                 html += '<td style="width: 400px;">'+tdThr+'</td>';
                 sum = sum + tdTwo * 1000;
             }

application/admin/view/formula/edit.html

@@ -75,12 +75,31 @@
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">可用性:</label>
-        <div class="col-xs-12 col-sm-7">
+        <div class="col-xs-12 col-sm-3">
             <input id="c-usability"  data-source="formula/getCustomer"
                    data-params='{"custom[type]":"bm","isTree":1}' data-multiple="true" data-field="customer_name"  class="form-control selectpage" name="usability"
                    type="text" value="{$row['usability']|htmlentities}" placeholder="请选择配方对应客户,不选默认全部客户可用">
         </div>
+
+        <label class="control-label col-xs-12 col-sm-1"></label>
+        <div class="col-xs-12 col-sm-3">
+
+            {if $row['controlled_two'] == 'voc标准'}
+                <label><input name="row[controlled]" type="checkbox" checked value="{$row['controlled_two']}" class="controlled_one" id="controlled_one">voc标准</label>
+            {else if}
+                <label><input name="row[controlled]" type="checkbox" value="{$row['controlled_two']}" class="controlled_one">voc标准</label>
+            {/if}
+
+            {if $row['controlled_two'] == '受控'}
+                <label><input name="row[controlled]" type="checkbox" checked value="{$row['controlled_two']}" class="controlled_two" id="controlled_two">受控</label>
+            {else if}
+                <label><input name="row[controlled]" type="checkbox" value="{$row['controlled_two']}" class="controlled_two">受控</label>
+            {/if}
+
+        </div>
+
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">工艺信息:</label>
         <div id="nav" class="col-xs-12 col-sm-3">
@@ -146,8 +165,10 @@
                         <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>
+                        <!--voc标准 受控-->
+                        <td class="tg-4qqe" colspan="3" style="border: none;" id="str"></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>
@@ -158,7 +179,8 @@
                     <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-kghl"  style="border: none"><input id="formula" value="" style="width: 400px;text-align: center;"></td>-->
+                        <td class="tg-kghl"  style="border: none"><textarea id="formula" value=""  style="resize:none;overflow-x:hidden;overflow-y:hidden;height: 80px;width: 400px;text-align: center;font-size: 16px"></textarea></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>
@@ -207,8 +229,22 @@
             $('#examine_name').text(examine_name);
             var date = $('#c-date').val();
             $('#date').text(date);
+            var str = '';
+            //voc标准
+            if ($('#controlled_one').prop("checked") == true){
+                var print_controlled_one = $('#controlled_one').val();
+                str += '<span style="border:2px solid;" id="print_controlled_one">'+print_controlled_one+'</span>';
+            }
+            //受控
+            if ($('#controlled_two').prop("checked") == true){
+                var print_controlled_two = $('#controlled_two').val();
+                console.log(print_controlled_two)
+                str += ' <span  style="border:2px solid;" id="print_controlled_two">'+print_controlled_two+'</span>&nbsp;';
+            }
+            $('#str').html(str);
             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>';
+            html += '<tr><td style="width: 200px;text-align: center">原材料</td><td  style="width: 50px;text-align: center">百分比</td><td style="width: 400px;text-align: center">操作工艺说明</td></tr>';
+            // 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++) {
@@ -216,8 +252,8 @@
                 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 += '<tr ><td style="width: 100px;text-align: center;font-size: 18px">'+tdOne+'</td>';//加font-size: 18px
+                html += '<td style="width: 50px;text-align: center;font-size: 18px">'+tdTwo+'</td>';//加font-size: 18px
                 html += '<td style="width: 400px;">'+tdThr+'</td>';
                 sum = sum + tdTwo * 1000;
             }

application/admin/view/formula/status.html

@@ -1,5 +1,5 @@
 
-<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="" >
 
     <div class="form-group">
         <span id="ids" data-value="{$ids}"></span>
@@ -49,23 +49,42 @@
         </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" >
             <tr>
                 <th class="col-sm-2">原材料</th>
                 <th class="col-sm-1">百分比(%)</th>
-                <th class="col-sm-8">操作工艺说明</th>
-                <th class="col-sm-1">工序号(必填)</th>
+                <th class="col-sm-4">操作工艺说明</th>
+                <!--<th class="col-sm-1">工序号(必填)</th>-->
+
             </tr>
             {foreach name='row["gyinfo"]' id='vo'}
             <tr>
-                <td><input  class="form-control material" type="text" value="{$vo.material}" ></td>
-                <td><input  class="form-control percentage" type="text" value="{$vo.percentage}"></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><textarea name="material"   style="resize:none;" disabled class="form-control material"   cols="15" rows="4">{$vo.material}</textarea></td>
+                <td><textarea name="percentage" style="resize:none;" disabled class="form-control percentage" cols="10"  rows="4">{$vo.percentage}</textarea></td>
+                <td><textarea name="gy_name"    style="resize:none;" disabled class="form-control gy_name"    cols="50" rows="4">{$vo.gy_name}</textarea></td>
+                <!--<td><textarea name="gy_num"     style="resize:none;" disabled class="form-control gy_num"     cols="6" rows="4">{$vo.gy_num}</textarea></td>-->
             </tr>
             {/foreach}
         </table>
     </div>
+    <!--<div class="form-group">-->
+        <!--<table class="table table-striped table-bordered table-hover table-nowrap" id="gy">-->
+            <!--<tr>-->
+                <!--<th class="col-sm-2">原材料</th>-->
+                <!--<th class="col-sm-1">百分比(%)</th>-->
+                <!--<th class="col-sm-8">操作工艺说明</th>-->
+                <!--<th class="col-sm-1">工序号(必填)</th>-->
+            <!--</tr>-->
+            <!--{foreach name='row["gyinfo"]' id='vo'}-->
+            <!--<tr>-->
+                <!--<td><input  class="form-control material" type="text" value="{$vo.material}" ></td>-->
+                <!--<td><input  class="form-control percentage" type="text" value="{$vo.percentage}"></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>-->
+            <!--</tr>-->
+            <!--{/foreach}-->
+        <!--</table>-->
+    <!--</div>-->
 
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>

application/admin/view/formula/task.html

@@ -17,6 +17,12 @@
 </style>
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
     <div class="form-group">
+        {if $erro=='该配方未生产过'}
+        <h1 style="text-align: center;color: red">{$erro}</h1>
+        {else/}
+        <h1 style="text-align: center;">{$erro}</h1>
+        {/if}
+        <br>
         <input style="display: none" id="ids" value="{$ids}">
         <label class="control-label col-xs-12 col-sm-1">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-3">
@@ -81,34 +87,38 @@
         <label class="control-label col-xs-12 col-sm-1"></label>
         <button type="button" id="add" class="btn btn-success">确定生成作业票</button>
     </div>
-    <div class="form-group">
-        <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
-            <tr>
-                <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-1">应加量(KG)</th>
-                <th class="col-xs-12 col-sm-6">操作记录</th>
-                <th class="col-xs-12 col-sm-1">工序号</th>
-            </tr>
-            {foreach name='row["gyinfo"]' id='vo'}
-            <tr>
-                <td><input  class="form-control material" type="text" value="{$vo.material}" readonly></td>
-                <td><input  class="form-control percentage" type="text" value="{$vo.percentage}" readonly></td>
-                <td><input  class="form-control num" type="text" data-id="{$vo.id}" id="input-{$vo.id}" value="" readonly></td>
-                <td><input  class="form-control gy_name" type="text" value="{$vo.gy_name}" readonly></td>
-                <td><input  class="form-control gy_num" type="text" value="{$vo.gy_num}" readonly></td>
-            </tr>
-            {/foreach}
-        </table>
-    </div>
+    <!--<div class="form-group">-->
+        <!--<table class="table table-striped table-bordered table-hover table-nowrap" id="gy">-->
+            <!--<tr>-->
+                <!--<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-1">应加量(KG)</th>-->
+                <!--<th class="col-xs-12 col-sm-6">操作记录</th>-->
+                <!--<th class="col-xs-12 col-sm-1">工序号</th>-->
+            <!--</tr>-->
+            <!--{foreach name='row["gyinfo"]' id='vo'}-->
+            <!--<tr>-->
+                <!--<td><input  class="form-control material" type="text" value="{$vo.material}" readonly></td>-->
+                <!--<td><input  class="form-control percentage" type="text" value="{$vo.percentage}" readonly></td>-->
+                <!--<td><input  class="form-control num" type="text" data-id="{$vo.id}" id="input-{$vo.id}" value="" readonly></td>-->
+                <!--<td><input  class="form-control gy_name" type="text" value="{$vo.gy_name}" readonly></td>-->
+                <!--<td><input  class="form-control gy_num" type="text" value="{$vo.gy_num}" readonly></td>-->
+            <!--</tr>-->
+            <!--{/foreach}-->
+        <!--</table>-->
+    <!--</div>-->
     <!--===========================================================-->
-    <div style="display: none">
+    <!--<div style="padding: 1000px 0 0 0">-->
+    <div style="">
         <div class="form-group" id="print_area" >
             <div id="head">
                 <table class="tg" style="width: 800px;">
                     <thead>
-                    <div id="qrcode" style="margin:0 0 -450px 500px;width: 80px;height: 80px;">
-                        <img src="" id="myImage" alt=""/>
+                    <!--<div id="qrcode" style="margin:0 0 -450px 500px;width: 80px;height: 80px;">-->
+                        <!--<img src="" id="myImage" alt=""/>-->
+                    <!--</div>-->
+                    <div id="qrcode" style="width: 80px;height: 80px;">
+                        <img src="" id="myImage" alt="" style="margin:0 0 -200px 500px;"/>
                     </div>
                     <tr>
                         <th class="tg-v8dz" colspan="6" >
@@ -134,7 +144,8 @@
                     <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"><input type="text" id="formula" value="" style="width: 400px;text-align: center"></td>-->
+                        <td class="tg-kghl" style="border: none"><textarea type="text" id="formula" value="" disabled style="resize:none;width: 400px;overflow-x:hidden;overflow-y:hidden;height: 80px;text-align: center;font-size: 16px"></textarea></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-x1hj" id="drawer_name"></td>
                         <td class="tg-x1hj" id="examine_name"></td>
@@ -146,29 +157,29 @@
             <div id="body">
                 <table class="tg" style="width: 800px;" id="print_gy">
                     <tr>
-                        <th  style="text-align: center">原材料</th>
+                        <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">操作记录</th>
+                        <th  style="text-align: center;">应加量(KG)</th>
+                        <th  style="text-align: center;">实加量(KG)</th>
+                        <th  style="text-align: center;">操作记录</th>
                     </tr>
                     {foreach name='row["gyinfo"]' id='vo'}
                     <tr>
-                        <td style="width: 100px;text-align: center">{$vo.material}</td>
+                        <td style="width: 200px;text-align: center;font-size: 18px;line-height: 100%">{$vo.material}</td>
                         <!--                                <td style="width: 100px">{$vo.percentage}</td>-->
-                        <td data-id="{$vo.id}" id="text-{$vo.id}" style="width: 100px;text-align: center"></td>
-                        <td style="width: 100px;text-align: center"></td>
+                        <td data-id="{$vo.id}" id="text-{$vo.id}" style="width: 100px;text-align: center;font-size: 18px;line-height: 10px"></td>
+                        <td style="width: 100px;text-align: center;"></td>
                         <td style="width: 400px;">{$vo.gy_name}</td>
                     </tr>
                     {/foreach}
                     <tr>
-                        <td style="width: 100px;text-align: center">总计</td>
-                        <td class="total" style="width: 100px;text-align: center"></td>
+                        <td style="width: 100px;text-align: center;font-size: 18px;">总计</td>
+                        <td class="total" style="width: 100px;text-align: center;font-size: 18px;"></td>
                         <td></td>
                         <td></td>
                     </tr>
                     <tr>
-                        <td colspan="5" class="remark"></td>
+                        <td colspan="5" class="remark" style=";font-size: 18px"></td>
                     </tr>
                 </table>
                 <div style="height: 5px;"></div>

application/admin/view/index/login.html

@@ -195,6 +195,7 @@
     </div>
 </div>
 <script>
+
     // 切换选项卡
     $("#sms_login").click(function(){
         $(this).css('display','inline-block').css('text-decoration','underline').css('color','#fff');

application/admin/view/order/add.html

@@ -10,6 +10,7 @@
         <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"  placeholder="请选择订货单位" readonly="readonly"  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">
+            <!--<input id="c-customer" data-rule="required"  placeholder="请选择订货单位"  data-primary-key="id" 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">
@@ -50,6 +51,18 @@
             <input id="c-price" class="form-control" name="row[price]" type="text">
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ese')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="radio">
+                {foreach name="eseList" item="vop"}
+                <label for="row[ese]-{$key}"><input id="row[ese]-{$key}" name="row[ese]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vop}</label>
+                {/foreach}
+            </div>
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -124,4 +137,7 @@
             <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
         </div>
     </div>
-</form>
+</form>
+<script>
+
+</script>

application/admin/view/order/edit.html

@@ -56,6 +56,20 @@
             <input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price|htmlentities}">
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <div class="radio">
+                {foreach name="eseList" item="vop"}
+                <label for="row[ese]-{$key}"><input id="row[ese]-{$key}" name="row[ese]" type="radio" value="{$key}" {in name="key" value="$row.ese"}checked{/in} /> {$vop}</label>
+                {/foreach}
+            </div>
+
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/order/task.html

@@ -131,7 +131,8 @@
                     <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"><input type="text" id="formula" value="" style="width: 400px;text-align: center"></td>-->
+                        <td class="tg-kghl" style="border: none"><textarea type="text" id="formula" value="" style="resize:none;width: 400px;text-align: center;font-size: 16px"></textarea></td>
                         <td class="tg-0pky"></td>
                         <td class="tg-x1hj" id="drawer_name"></td>
                         <td class="tg-x1hj" id="examine_name"></td>

application/admin/view/printt/index.html

@@ -144,19 +144,23 @@
         LODOP.PRINT_INIT("");
         //判断用户打印份数
         if(number){LODOP.SET_PRINT_COPIES(number);}else{LODOP.SET_PRINT_COPIES(2);}
+        if(time != ''){
+            time = '_'+time;
+        }
         // 判断用户选择的纸张大小规格
         if(selectList == "10*6"){
-            var strBodyStyle = "<style>body{font-size: 42px;text-align: center;}</style>";
+            var strBodyStyle = "<style>body{font-size: 60px;text-align: center;font-weight:bold;}</style>";
+            // var strBodyStyle = "<style>body{font-size: 42px;text-align: center;font-weight:bold;}</style>";
             var barcodenumber = barcode.substring(0,6)+"</br>"+barcode.substring(6,12)+"</br>"+barcode.substring(12,18)+"</br>"+barcode.substring(18,24)+"</br>"+barcode.substring(24,30);
             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(13,-133,498,334,strBodyStyle+barcodenumber);
-            LODOP.ADD_PRINT_TEXT(228,-4,238,37,time);
-            LODOP.SET_PRINT_STYLEA(0,"FontSize",15);
+            LODOP.ADD_PRINT_TEXT(200,-4,238,37,time);
+            LODOP.SET_PRINT_STYLEA(0,"FontSize",30);
             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_Engish+"_"+time);
+            LODOP.ADD_PRINT_BARCODE(245,45,"108.9mm","49mm","QRCode",barcode_Engish+time);
             LODOP.SET_PRINT_STYLEA(0,"QRCodeVersion",7);
         }
         if(selectList == "10*15"){
@@ -287,13 +291,13 @@
             LODOP.SET_PRINT_STYLEA(0,"FontSize",20);
             LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
             LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-            LODOP.ADD_PRINT_BARCODE(235,328,"108.9mm","49mm","QRCode",barcode_Engish+"_"+time);
+            LODOP.ADD_PRINT_BARCODE(235,328,"108.9mm","49mm","QRCode",barcode_Engish+time);
             LODOP.SET_PRINT_STYLEA(0,"QRCodeVersion",7);
         }
-        LODOP.PRINT();//打印
+        // LODOP.PRINT();//打印
         // LODOP.PREVIEW();//打印预览
         // LODOP.PRINTA();//选择打印机进行打印
-        // LODOP.PRINT_SETUP();//打印维护设置大小
+        LODOP.PRINT_SETUP();//打印维护设置大小
     };
 
     //将中文括号转换成英文括号

public/assets/js/adminlte.js

@@ -247,6 +247,7 @@ function _init() {
      *        $.AdminLTE.layout.fix()
      *        $.AdminLTE.layout.fixSidebar()
      */
+    
     $.AdminLTE.layout = {
         activate: function () {
             var _this = this;

public/assets/js/backend/feeding.js

@@ -48,26 +48,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                 document.documentElement.webkitRequestFullScreen();
                 document.body.onkeyup = function (e) {
                     e = e || window.event;
-                    if(e.keyCode == 27){//按Esc全屏或退出全屏
+                    // console.log(e.keyCode);
+                    if(e.keyCode == 27){//Esc全屏或退出全屏
                         document.documentElement.webkitRequestFullScreen();
                     }
+                    if(e.keyCode==116){//F5
+                        document.documentElement.webkitRequestFullScreen();
+                    }
+                    if (e.keyCode == 82 && e.ctrlKey) {//Ctrl+R
+                        document.documentElement.webkitRequestFullScreen();
+                    }
+
                 };
             }
+
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
         add: function () {
             // 进入页面全屏
-
-            // if(document.documentElement){
-            //     document.documentElement.webkitRequestFullScreen();
-            //     document.body.onkeyup = function (e) {
-            //         e = e || window.event;
-            //         if(e.keyCode == 27){//按Esc全屏或退出全屏
-            //             document.documentElement.webkitRequestFullScreen();
-            //         }
-            //     };
-            // }
+            // document.documentElement.webkitRequestFullScreen();
             $('#c-bach').focus();
             var num=0;
             $('#c-bach').keydown((e)=>{
@@ -234,7 +234,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                     str += "<td><input class='form-control bach' type='text' name='row[bach][]'   value=''></td>";
                                                 }else{
                                                     str += "<td><button type=\"button\" class=\"btn btn-primary btn-embossed\">已保存</button></td>";
-                                                    str += "<td><input class='form-control bach' type='text' name='row[bach][]' readonly  value='"+result.data[i].material_bach+"'></td>";
+                                                    str += "<td><input class='form-control bach' type='text' name='row[bach][]' disabled readonly  value='"+result.data[i].material_bach+"'></td>";
                                                 }
                                                 // if(result.data[i].material_bach){
                                                 //     str += "<td><input class='form-control bach' type='text' name='row[bach][]' readonly  value='"+result.data[i].material_bach+"'></td>";
@@ -289,6 +289,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                                         if(result.data[i].material===data.data[j].m_name){
                                                                             if (result.data[i].gy_num <= result.process){
                                                                                 //投料重量为空时 扫描物料文字为红
+
+
                                                                                 if (result.data[i].weight == 0) {
                                                                                     $(".material")[i].setAttribute('style','color:red');
                                                                                     $(".nweight")[i].setAttribute('style','color:red');
@@ -300,9 +302,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                                                     //语音播报
                                                                                     var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
                                                                                     window.speechSynthesis.speak(msg);
-                                                                                    error++;
                                                                                 }
-
+                                                                                error++;
                                                                             }else if (result.data[i].gy_num > result.process){
                                                                                 Layer.confirm("此物料不在当前工序，请确认！",{
                                                                                     area: ['60%', '60%'],
@@ -371,11 +372,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                                             var the_bach = document.getElementsByClassName('bach')[i];
                                                                             if(the_bach.readOnly == false){
                                                                                 the_bach.value = bach;
+                                                                                $(".number")[i].focus();
+                                                                                //语音播报
+                                                                                var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
+                                                                                window.speechSynthesis.speak(msg);
                                                                             }
-                                                                            $(".number")[i].focus();
-                                                                            //语音播报
-                                                                            var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
-                                                                            window.speechSynthesis.speak(msg);
                                                                             error++;
                                                                         }else if (result.data[i].gy_num > result.process){
                                                                             Layer.confirm("此物料不在当前工序，请确认！",{
@@ -412,9 +413,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                                                                 $(".number")[i].focus();
                                                                                 var msg = new SpeechSynthesisUtterance("应投入物料"+result.data[i].material+"应投入重量"+result.data[i].nweight+"千克");
                                                                                 window.speechSynthesis.speak(msg);
-                                                                                error++;
                                                                             }
-
+                                                                            error++;
                                                                         } else if (arr.indexOf($("#wuliao").val()) !== -1) {
                                                                             Layer.confirm("此物料不在当前工序，请确认！", {
                                                                                 area: ['60%', '60%'],
@@ -464,6 +464,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                         closeBtn:0,
                         time:3000
                     });
+                    //语音播报
+                    var msg = new SpeechSynthesisUtterance("请选择 操作人员 或 检验人员");
+                    window.speechSynthesis.speak(msg);
                 }else{
                     // console.log("批次号"+$("#c-bach").val());
                     // console.log("日期"+$("#c-date").val());
@@ -514,10 +517,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                             closeBtn:0,
                             time:2000
                         });
+                        //语音播报
+                        var msg = new SpeechSynthesisUtterance("请输入投料重量");
+                        window.speechSynthesis.speak(msg);
                     }else{
                         $(this).text('已保存');
-                        $(this).parent().siblings().eq(3).children('input').attr('readonly','readonly');
-                        $(this).parent().siblings().eq(4).children('input').attr('readonly','readonly');
+                        $(this).parent().siblings().eq(3).children('input').attr('disabled',true);
+                        $(this).parent().siblings().eq(4).children('input').attr('disabled',true);
+                        $(this).attr('disabled',true);
                     }
                     $.ajax({
                         type: "POST",

public/assets/js/backend/formula.js

@@ -35,7 +35,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'company_id', title: __('Company_id')},
                         // {field: 'no', title: __('No'), operate: 'LIKE'},
                         // {field: 'formula_no', title: __('Formula_no'), operate: 'LIKE'},
-                        {field: 'name', title: __('Name'), operate: 'LIKE'},
+                        {field: 'name', title: __('Name'), operate: 'LIKE',},
+                        // {field: 'name', title: __('Name'), operate: 'LIKE',
+                            // cellStyle: function (value, row, index) {
+                            // console.log(row['id']);
+                                // return {css: {"color": "red"}};
+                            // }},
                         {field: 'version', title: __('Version'),operate: false},
                         // {field: 'date', title: __('Date'), operate: 'LIKE'},
                         // {field: 'charge_name', title: __('Charge_name'), operate: 'LIKE'},
@@ -151,6 +156,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     var date = $('#c-date').val();
                     var model = $('#c-model').val();
                     var usability = $('#c-usability').selectPageText();
+                    //判断复选框是否选择
+                    if($('#controlled_one').is(":checked")){
+                        $('#controlled_one').val('voc标准');//voc标准
+                    }else{
+                        $('#controlled_one').val('');//voc标准
+                    }
+                    if($('#controlled_two').is(":checked")){
+                        $('#controlled_two').val('受控');//受控
+                    }else{
+                        $('#controlled_two').val('');//受控
+                    }
+                    var controlled_one = $('#controlled_one').val();//voc标准
+                    var controlled_two = $('#controlled_two').val();//受控
                     if (usability == ''){
                         usability = 99;
                     }
@@ -169,6 +187,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(date);
                     baseData.push(usability);
                     baseData.push(model);
+                    baseData.push(controlled_one);
+                    baseData.push(controlled_two);
                     console.log(baseData);
                     //配方数据
                     var data = [];
@@ -293,6 +313,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     var date = $('#c-date').val();
                     var model = $('#c-model').val();
                     var usability = $('#c-usability').selectPageText();
+                    //判断复选框是否选择
+                    if($('.controlled_one').is(":checked")){
+                        $('.controlled_one').val('voc标准');//voc标准
+                    }else{
+                        $('.controlled_one').val('');//voc标准
+                    }
+                    if($('.controlled_two').is(":checked")){
+                        $('.controlled_two').val('受控');//受控
+                    }else{
+                        $('.controlled_two').val('');//受控
+                    }
+                    var controlled_one = $('.controlled_one').val();//voc标准
+                    var controlled_two = $('.controlled_two').val();//受控
                     if (usability == ''){
                         usability = 99;
                     }
@@ -311,6 +344,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(date);
                     baseData.push(usability);
                     baseData.push(model);
+                    baseData.push(controlled_one);
+                    baseData.push(controlled_two);
                     console.log(baseData);
                     //配方数据
                     var data = [];
@@ -368,21 +403,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     return false;
                 }
                 var pc = $('#hidden').val();//当前批次号
-                if($('#hidden').val() > $('#c-bach').val()){
-                    layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
-                        title: ['信息'],
-                        btn: ['确认'],
-                        icon: 0,
-                        closeBtn: 2,
-                        shade: [0.3, '#000'],
-                        shadeClose: true,
-                        id: "one",
-                        anim: 2,
-                        isOutAnim: false,
-                        area: ['30%', '30%'],
-                    });
-                    return false;
-                }
+                // if($('#hidden').val() > $('#c-bach').val()){
+                //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
+                //         title: ['信息'],
+                //         btn: ['确认'],
+                //         icon: 0,
+                //         closeBtn: 2,
+                //         shade: [0.3, '#000'],
+                //         shadeClose: true,
+                //         id: "one",
+                //         anim: 2,
+                //         isOutAnim: false,
+                //         area: ['30%', '30%'],
+                //     });
+                //     return false;
+                // }
                 //给打印界面赋值
                 $('.total').text(number);
                 var remark = $('#c-remark').val();
@@ -441,21 +476,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
                 var pc = $('#hidden').val();//当前批次号
-                if($('#hidden').val() > $('#c-bach').val()){
-                    layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
-                        title: ['信息'],
-                        btn: ['确认'],
-                        icon: 0,
-                        closeBtn: 2,
-                        shade: [0.3, '#000'],
-                        shadeClose: true,
-                        id: "one",
-                        anim: 2,
-                        isOutAnim: false,
-                        area: ['30%', '30%'],
-                    });
-                    return false;
-                }else{
+                // if($('#hidden').val() > $('#c-bach').val()){
+                //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
+                //         title: ['信息'],
+                //         btn: ['确认'],
+                //         icon: 0,
+                //         closeBtn: 2,
+                //         shade: [0.3, '#000'],
+                //         shadeClose: true,
+                //         id: "one",
+                //         anim: 2,
+                //         isOutAnim: false,
+                //         area: ['30%', '30%'],
+                //     });
+                //     return false;
+                // }else{
                     Form.api.bindevent($("form[role=form]"), function(data, ret){
                         Toastr.success('111');//成功
                     }, function(data, ret){
@@ -513,7 +548,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         });
                         return false;
                     });
-                }
+                // }
 
             });
         },
@@ -578,11 +613,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             Controller.api.bindevent();
             $(document).on('click','.examine',function () {
-                console.log(44444)
+                console.log(44444);
                 var ids = $('#ids').attr('data-value');
                 var status = $(this).attr('data-value');
-                console.log(ids)
+                console.log(ids);
                 console.log(status);
+                // var cname = $('#c-name').val();
+                // var cformula_no = $('#c-formula_no').val();
+                //基础数据
+                // var baseData = [];
+                // baseData.push(cname);
+                // baseData.push(cformula_no);
+
 
                 if (status == ''){
                     layer.confirm('数据错误,请重新打开页面');return false;

public/assets/js/backend/order.js

@@ -37,7 +37,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'number', title: __('Number')},
                         {field: 'completed', title: __('Completed'), operate: 'LIKE'},
                         {field: 'price', title: __('Price'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('计划中'),"2":__('生产中'),"3":__('已完成')}, formatter: Table.api.formatter.status},
+                        {field: 'ese', title: __('Ese'), operate: 'LIKE', searchList: {"1":__('烟标'),"2":__('非烟标')},custom: {"1": "green", "2": "red"}, formatter: Table.api.formatter.status},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('计划中'),"2":__('生产中'),"3":__('已完成'),"4":__('待申购')}, formatter: Table.api.formatter.status},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE'},
                         {field: 'date', title: __('Date'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'user_name', title: __('User_name'), operate: 'LIKE'},
@@ -95,21 +96,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 var remark = $('#c-remark').val();
                 remark = '备注：'+remark;
                 var pc = $('#hidden').val();//当前批次号
-                if($('#hidden').val() > $('#c-bach').val()){
-                    layer.confirm("批次号不能小于当前的批次,当前批次为"+pc, {
-                        title: ['信息'],
-                        btn: ['确认'],
-                        icon: 0,
-                        closeBtn: 2,
-                        shade: [0.3, '#000'],
-                        shadeClose: true,
-                        id: "one",
-                        anim: 2,
-                        isOutAnim: false,
-                        area: ['30%', '30%'],
-                    });
-                    return false;
-                }
+                // if($('#hidden').val() > $('#c-bach').val()){
+                //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc, {
+                //         title: ['信息'],
+                //         btn: ['确认'],
+                //         icon: 0,
+                //         closeBtn: 2,
+                //         shade: [0.3, '#000'],
+                //         shadeClose: true,
+                //         id: "one",
+                //         anim: 2,
+                //         isOutAnim: false,
+                //         area: ['30%', '30%'],
+                //     });
+                //     return false;
+                // }
                 //给打印表头赋值
                 var bach = $('#c-bach').val();
                 $('#bach').text(bach);
@@ -152,7 +153,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             $('#gy').text('');
                             $('#gy').append(html);
 
-                            str += '<tr><td style="width: 100px;text-align: center">总计</td><td class="total" style="width: 100px;text-align: center">'+number+'</td> <td></td><td></td></tr>';
+                            str += '<tr><td style="width: 100px;text-align: center;">总计</td><td class="total" style="width: 100px;text-align: center">'+number+'</td> <td></td><td></td></tr>';
                             str += '<tr> <td colspan="5" class="remark">'+remark+'</td></tr>';
                             $('#print').text('');
                             $('#print').append(str);
@@ -170,21 +171,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Controller.api.bindevent();
             $(document).on('click','.submit',function () {
                 var pc = $('#hidden').val();//当前批次号
-                if($('#hidden').val() > $('#c-bach').val()){
-                    layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
-                        title: ['信息'],
-                        btn: ['确认'],
-                        icon: 0,
-                        closeBtn: 2,
-                        shade: [0.3, '#000'],
-                        shadeClose: true,
-                        id: "one",
-                        anim: 2,
-                        isOutAnim: false,
-                        area: ['30%', '30%'],
-                    });
-                    return false;
-                }else{
+                // if($('#hidden').val() > $('#c-bach').val()){
+                //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
+                //         title: ['信息'],
+                //         btn: ['确认'],
+                //         icon: 0,
+                //         closeBtn: 2,
+                //         shade: [0.3, '#000'],
+                //         shadeClose: true,
+                //         id: "one",
+                //         anim: 2,
+                //         isOutAnim: false,
+                //         area: ['30%', '30%'],
+                //     });
+                //     return false;
+                // }else{
                     Form.api.bindevent($("form[role=form]"), function(data, ret){
                         Toastr.success('111');//成功
                     }, function(data, ret){
@@ -251,7 +252,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         });
                         return false;
                     });
-                }
+                // }
 
             });
         },