Jelajahi Sumber

1130刘功能优化

liuhairui 3 tahun lalu
induk
melakukan
4846dd6686

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

@@ -386,6 +386,7 @@ class Formula extends Backend
             $this->error(__('No Results were found'));
         }
         if (false === $this->request->isPost()) {
+
             //生产部=>开票人
             $sckp = Db::name('personnel')->where('bid',"=",3)->where('position','=',"sckp")->order('name desc')->select();
             //生产部=>审核人

+ 1 - 0
application/admin/view/formula/task.html

@@ -24,6 +24,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">批次号:</label>
         <div class="col-xs-12 col-sm-3">
+            <input id="hidden" type="hidden" value="{$bach}">
             <input id="c-bach" class="form-control" name="row[bach]" type="text" value="{$bach}">
         </div>
     </div>

+ 0 - 1
application/admin/view/order/add.html

@@ -79,7 +79,6 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('User_name')}:</label>
         <div class="col-xs-12 col-sm-8">
             <select  id="c-user_name" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[user_name]">
-                <option></option>
                 {foreach $yxjb as $key=>$vv}
                     <option value="{$vv.name}">{$vv.name}</option>
                 {/foreach}

+ 16 - 0
public/assets/js/backend/formula.js

@@ -367,6 +367,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     layer.confirm('生产量不能为空');
                     return false;
                 }
+                // var bach = $('#hidden').val();//当前批次号
+                if($('#hidden').val() > $('#c-bach').val()){
+                    layer.confirm("批次号不能小于之前的批次", {
+                        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();