优化扩单功能

application/admin/controller/Formula.php

@@ -299,6 +299,8 @@ class Formula extends Backend
         $params['remark'] = $base[4];
         $params['date'] = $base[6];
         $params['model'] = $base[8];
+        $params['controlled_one'] = $base[9];
+        $params['controlled_two'] = $base[10];
         //配方对应客户id（可用性）
         if ($base[7] !== 99){
             $customer= explode(',',$base[7]);
@@ -498,7 +500,7 @@ class Formula extends Backend
 //        if(!empty($base[9]))
 //            if($base[9]){
 //                $params['kuodan']=$base[9];
-//            }
+//        }
         $params['create'] = date('Y-m-d H:i:s');
         $result = false;
         Db::startTrans();
@@ -610,7 +612,7 @@ 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);
+                ->paginate(10,false);
         $page = $formula->render();
         $this->view->assign('page',$page);
         $this->view->assign('formula',$formula);

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

@@ -9,5 +9,6 @@ return [
     'Remark'       => '备注',
     'Fid'          => '关联配方id',
     'Create'       => '创建时间',
+    'Kuodan'       => '扩单后应加量',
     'Machine'       => '机台'
 ];

application/admin/view/formula/edit.html

@@ -84,16 +84,16 @@
         <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>
+            {if $row['controlled_one'] == 'voc标准'}
+            <label><input name="row[controlled]" type="checkbox" checked value="{$row['controlled_one']}" 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>
+            <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>
+            <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>
+            <label><input name="row[controlled]" type="checkbox" value="{$row['controlled_two']}" class="controlled_two">受控</label>
             {/if}
 
         </div>
@@ -120,10 +120,10 @@
             <div></div>
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <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">-->
+    <!--        <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>
@@ -137,12 +137,12 @@
             <tr>
                 <td><input  class="form-control material" type="text" value="{$vo.material}"></td>
                 <td><input  class="form-control percentage" type="number" value="{$vo.percentage}"></td>
-<!--                <td><select class='form-control selectpicker' name='gy_name' id=''>-->
-<!--                    <option value=''>请选择工艺</option>-->
+                <!--                <td><select class='form-control selectpicker' name='gy_name' id=''>-->
+                <!--                    <option value=''>请选择工艺</option>-->
 
 
 
-<!--                    </select></td>-->
+                <!--                    </select></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><button type="button"  class="btn btn-success up" >上移</button>&nbsp;<button type="button"  class="btn btn-success down" >下移</button>&nbsp;<button type="button"  class="btn btn-danger  del">删除</button></td>
@@ -180,7 +180,7 @@
                         <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"><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-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>

public/assets/js/backend/formula.js

@@ -72,10 +72,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
             // 为表格绑定事件
             Table.api.bindevent(table);
-
-
-
         },
+        //添加
         add: function () {
             var gy_num = 1;
             $('#add').click(function () {
@@ -127,11 +125,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 //重新添加序号
                 // drawOrder();
             });
-
-
             Controller.api.bindevent();
-
-
+            //点击保存
             $(document).on('click','.submit',function () {
                 Form.api.bindevent($("form[role=form]"), function(data, ret){
                     Toastr.success('111');//成功
@@ -176,7 +171,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     if (usability == ''){
                         usability = 99;
                     }
-                    // console.log(usability);return false;
                     if (verify == -1){
                         layer.confirm("数据格式不对,请仔细核查!");return false;
                     }
@@ -193,7 +187,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(model);
                     baseData.push(controlled_one);
                     baseData.push(controlled_two);
-
                     //配方数据
                     var data = [];
                     var formulaTrList = $("#gy").find("tr");//行数
@@ -238,6 +231,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 });
             });
         },
+        //修改
         edit: function () {
             $('#add').click(function () {
                 var material = $('#add_material').val();
@@ -328,7 +322,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     if (usability == ''){
                         usability = 99;
                     }
-                    // console.log(usability);return false;
                     if (verify == -1){
                         layer.confirm("数据格式不对,请仔细核查!");return false;
                     }
@@ -345,7 +338,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(model);
                     baseData.push(controlled_one);
                     baseData.push(controlled_two);
-                    console.log(baseData);
                     //配方数据
                     var data = [];
                     var formulaTrList = $("#gy").find("tr");//行数
@@ -392,18 +384,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 });
             });
         },
+        //生成作业票
         task: function () {
             $('#kuodan').click(function () {
                 layer.prompt({
                     title: ['扩单'],
                     formType: 0, //输入框类型
                 },function(value2, index, elem){
-                    // kuoz= value2;//扩单全局变量
                     $('#c-kuoz').val(value2);
                     //配方获取和计算
                     var ids = $('#ids').val();
-                    var kd_number = parseFloat($('#c-kuoz').val());//获取扩单数据
                     var number = parseInt($('#c-number').val());//获取生产量数据
+                    var kd_number = parseFloat($('#c-kuoz').val());//获取扩单后应加重量数据
                     if (number == ''){
                         layer.confirm('生产量不能为空');
                         return false;
@@ -501,10 +493,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 });
             });
 
+            //点击确定生成作业票
             $('#add').click(function () {
                 //配方获取和计算
-                var ids = $('#ids').val();
-                var number = $('#c-number').val();
+                var ids = $('#ids').val();//获取配方ID
+                var number = $('#c-number').val();//获取生成作业票生产量值
                 if (number == ''){
                     layer.confirm('生产量不能为空');
                     return false;
@@ -582,7 +575,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             //提交数据
             Controller.api.bindevent();
+            //保存生成作业票
             $(document).on('click','.submit',function () {
+                var number = $('#c-number').val();//获取生成作业票生产量值
+                if (number == ''){
+                    layer.confirm('生产量不能为空');
+                    return false;
+                }
                 // var pc = $('#hidden').val();//当前批次号
                 // if($('#hidden').val() > $('#c-bach').val()){
                 //     layer.confirm("批次号不能小于当前的批次,当前批次为"+pc,  {
@@ -627,6 +626,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     var mid = $('#c-mid').val();
                     var oid = $('#c-order-uncompleted').val();
                     var kd_number = parseFloat($('#c-kuoz').val());
+                    if (isNaN(kd_number)) {
+                        kd_number = ''; //扩单后应加量为空
+                    }
                     if (verify == -1){
                         layer.confirm("数据格式不对,请仔细核查!");return false;
                     }
@@ -642,8 +644,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     baseData.push(mid);
                     baseData.push(oid);
                     baseData.push(kd_number);
-                    // if(kuoz)
-                    //     baseData.push(kuoz);
+                    // return false;
                     Fast.api.ajax({
                         url:'formula/task?ids='+ids,
                         data:{baseData:baseData}
@@ -660,8 +661,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     });
                     return false;
                 });
-                // }
-
             });
         },
         examine:function () {
@@ -695,8 +694,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'operate', title: '操作',  table: table, events: Table.api.events.operate, formatter: function (value,row,index) {
                                 var that = $.extend({},this);
                                 var table = $(that.table).clone(true);
-                                $(table).data('operate-del',null)//隐藏自带删除  修改按钮
-                                $(table).data('operate-edit',null)
+                                $(table).data('operate-del',null);//隐藏自带删除  修改按钮
+                                $(table).data('operate-edit',null);
                                 that.table = table;
                                 return Table.api.formatter.operate.call(that,value,row,index);
                             },
@@ -720,20 +719,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         status:function () {
-
             Controller.api.bindevent();
             $(document).on('click','.examine',function () {
                 console.log(44444);
                 var ids = $('#ids').attr('data-value');
                 var status = $(this).attr('data-value');
-                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;
                 }
@@ -752,7 +742,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     return false;
                 });
             });
-
         },
         api: {
             bindevent: function () {

public/assets/js/backend/task.js

@@ -32,6 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'examine_name', title: __('Examine_name'), operate: 'LIKE'},
                         {field: 'machine', title: __('Machine'), operate: 'LIKE'},
                         {field: 'number', title: __('Number'), operate: 'LIKE'},
+                        {field: 'kuodan', title: __('Kuodan'), operate: 'LIKE'},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE'},
                         {field: 'fid', title: __('Fid')},
                         {field: 'create', title: __('Create'), operate: 'LIKE'},