Merge branch 'master' of gitee.com:huangsanjia/minongyun

application/admin/controller/Formula.php

@@ -82,6 +82,11 @@ class Formula extends Backend
         if (false === $this->request->isPost()) {
             return $this->view->fetch();
         }
+//        $ceshi = encrypt('111');
+//        $ceshitwo = decode('eGWIu/HvS5g4CbzdItvkig==');
+//        print_r($ceshi);
+//        print_r('-------------------------------');
+//        print_r($ceshitwo);die;
         $base = $this->request->post('baseData/a');
         $formula = $this->request->post('formulaData/a');
         if (empty($base) || empty($formula)){
@@ -118,16 +123,16 @@ class Formula extends Backend
             $data = [];
             $is_replace = 0;
             foreach($formula as $key=>$value){
-                $data[$key]['material'] = $value[0];
-                $data[$key]['percentage'] = $value[1];
-                $data[$key]['gy_name'] = $value[2];
-                $data[$key]['gy_num'] = $value[3];
                 if (strpos($value[0],'/') === false){
                     $data[$key]['is_replace'] = 0;
                 }else{
                     $data[$key]['is_replace'] = 1;
                     $is_replace = 1;
                 }
+                $data[$key]['material'] = encrypt($value[0]);
+                $data[$key]['percentage'] = $value[1];
+                $data[$key]['gy_name'] = $value[2];
+                $data[$key]['gy_num'] = $value[3];
                 $data[$key]['pid'] = $pid;
                 $data[$key]['version'] = $params['version'];
                 $data[$key]['create'] = $params['create'];
@@ -183,6 +188,9 @@ class Formula extends Backend
                 $name = Db::name('customer')->where('id','in',$customer)->column('customer_name');
             }
             $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('material,percentage,gy_name,gy_num')->select();
+            foreach ($list['gyinfo'] as $key=>$value){
+                $list['gyinfo'][$key]['material'] = decode($value['material']);
+            }
             $this->view->assign('ids',$ids);
             $this->view->assign('name',$name);
             $this->view->assign('row', $list);
@@ -286,16 +294,16 @@ class Formula extends Backend
             //新工艺信息
             $is_replace = 0;
             for($i=0;$i<count($formula);$i++){
-                $data[$i]['material'] = $formula[$i][0];
-                $data[$i]['percentage'] = $formula[$i][1];
-                $data[$i]['gy_name'] = $formula[$i][2];
-                $data[$i]['gy_num'] = $formula[$i][3];
                 if (strpos($formula[$i][0],'/') === false){
                     $data[$i]['is_replace'] = 0;
                 }else{
                     $data[$i]['is_replace'] = 1;
                     $is_replace = 1;
                 }
+                $data[$i]['material'] = encrypt($formula[$i][0]);
+                $data[$i]['percentage'] = $formula[$i][1];
+                $data[$i]['gy_name'] = $formula[$i][2];
+                $data[$i]['gy_num'] = $formula[$i][3];
                 $data[$i]['pid'] = $ids;
                 $data[$i]['version'] = 'v'.$version;
                 $data[$i]['create'] = date('Y-m-d H:i:s');
@@ -312,7 +320,7 @@ class Formula extends Backend
                     $material = explode('/',$v['material']);
                     for ($i=0;$i<count($material);$i++){
                         $replaceData[$j]['fid'] = $v['id'];
-                        $replaceData[$j]['material'] = $material[$i];
+                        $replaceData[$j]['material'] = encrypt($material[$i]);
                         $replaceData[$j]['create'] = date('Y-m-d H:i:s');
                         $j++;
                     }
@@ -338,6 +346,9 @@ class Formula extends Backend
         if (false === $this->request->isPost()) {
             $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){
+                $list['gyinfo'][$key]['material'] = decode($value['material']);
+            }
             $this->view->assign('ids',$ids);
             $this->view->assign('row', $list);
             return $this->view->fetch();
@@ -397,6 +408,7 @@ class Formula extends Backend
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
+    //审核操作
     public function status($ids=null){
         if (!$ids) {
             $this->error(__('No Results were found'));
@@ -409,6 +421,9 @@ class Formula extends Backend
                 $name = Db::name('customer')->where('id','in',$customer)->column('customer_name');
             }
             $list['gyinfo'] = Db::name('formula_detail')->where('pid',$ids)->where('version',$list['version'])->field('material,percentage,gy_name,gy_num')->select();
+            foreach ($list['gyinfo'] as $key=>$value){
+                $list['gyinfo'][$key]['material'] = decode($value['material']);
+            }
             $this->view->assign('ids',$ids);
             $this->view->assign('name',$name);
             $this->view->assign('row', $list);
@@ -458,6 +473,7 @@ class Formula extends Backend
             return array('status'=>0,'msg'=>'数据错误');
         }
         foreach ($gyinfo as $key=>$value){
+            $gyinfo[$key]['material']= decode($value['material']);
             $gyinfo[$key]['num'] = '';
             if (!empty($value['percentage'])){
                 $gyinfo[$key]['num'] = number_format($value['percentage'] / $total * $params['number'],3);

application/admin/view/formula/task.html

@@ -175,8 +175,27 @@
     jQuery(function($) { 'use strict';
 
         $(".print-link").on('click', function() {
-
+            var status = 1;
+            var number = $('#c-number').val();
+            if (number == ''){
+                status = 2;
+            }
             var bach = $('#c-bach').val();
+            if (bach == ''){
+                status = 2;
+            }
+            var drawer_name = $('#c-drawer_name').val();
+            if (drawer_name == ''){
+                status = 2;
+            }
+            var examine_name = $('#c-examine_name').val();
+            if (examine_name == ''){
+                status = 2;
+            }
+            if (status == 2){
+                layer.confirm('数据不能为空,请仔细核查');return false
+            }
+
             createQrcode(bach,80,80);
             var img = document.getElementById("myImage"); /// get image element
             var canvas = document.getElementsByTagName('canvas')[0];