1129刘功能优化

application/admin/view/feeding/add.html

@@ -52,7 +52,8 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">操作人员:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-operator"  class="form-control" name="row[operator]">
+            <select style="text-align: left" id="c-operator" class="control-label col-xs-12 col-sm-8 form-control"   name="row[operator]">
+                <option></option>
                 {foreach $cjcz as $key=>$vv}
                 <option value="{$vv.name}">{$vv.name}</option>
                 {/foreach}
@@ -61,7 +62,8 @@
         </div>
         <label class="control-label col-xs-12 col-sm-2">检验人员:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-inspector"  class="form-control" name="row[inspector]">
+            <select style="text-align: left"  id="c-inspector"  class="control-label col-xs-12 col-sm-8 form-control"   name="row[inspector]">
+                <option></option>
                 {foreach $cjjy as $key=>$vvv}
                 <option value="{$vvv.name}">{$vvv.name}</option>
                 {/foreach}
@@ -99,7 +101,7 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="submit" class="btn btn-primary btn-embossed disabled option">{:__('OK')}</button>
             <button type="button" class="btn btn-default btn-embossed print-link">打印预览</button>
         </div>
     </div>

application/admin/view/formula/add.html

@@ -30,7 +30,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">{:__('Charge_name')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-charge_name"  class="form-control" name="row[charge_name]">
+            <select style="width: 380px;height: 35px" id="c-charge_name"  class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[charge_name]">
                 {foreach $jsdd as $key=>$vv}
                 <option value="{$vv.name}">{$vv.name}</option>
                 {/foreach}
@@ -39,7 +39,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">{:__('Examine_name')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-examine_name" class="form-control" name="row[examine_name]">
+            <select style="width: 380px;height: 35px" id="c-examine_name" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine_name]">
                 {foreach $jssh as $key=>$vvv}
                 <option value="{$vvv.name}">{$vvv.name}</option>
                 {/foreach}

application/admin/view/formula/task.html

@@ -30,7 +30,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">开票人:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-drawer_name"  class="form-control" name="row[drawer_name]">
+            <select style="width: 375px;height: 35px" id="c-drawer_name"  class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[drawer_name]">
                 {foreach $sckp as $key=>$vv}
                 <option value="{$vv.name}">{$vv.name}</option>
                 {/foreach}
@@ -39,7 +39,7 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">{:__('Examine_name')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-examine_name"  class="form-control" name="row[examine_name]">
+            <select style="width: 375px;height: 35px" id="c-examine_name"  class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine_name]">
                 {foreach $scsh as $key=>$vvv}
                 <option value="{$vvv.name}">{$vvv.name}</option>
                 {/foreach}

application/admin/view/order/add.html

@@ -78,7 +78,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <select style="width: 1050px;height: 30px" id="c-user_name" data-rule="required" class="form-control" name="row[user_name]">
+            <select style="width: 1050px;height: 30px" id="c-user_name" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[user_name]">
                 {foreach $yxjb as $key=>$vv}
                     <option value="{$vv.name}">{$vv.name}</option>
                 {/foreach}
@@ -89,7 +89,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Examine')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <select style="width: 1050px;height: 30px" id="c-examine" data-rule="required" class="form-control" name="row[examine]">
+            <select style="width: 1050px;height: 30px" id="c-examine" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine]">
                 {foreach $yxsh as $key=>$vvv}
                 <option value="{$vvv.name}">{$vvv.name}</option>
                 {/foreach}

application/admin/view/order/task.html

@@ -23,7 +23,7 @@
             <select id="c-name" class="form-control">
                 <option value="0">请选择配方</option>
             {foreach name='row' id='vo'}
-                <option value="{$vo.id}" class="form-control ">{$vo.name}{$vo.version}</option>
+                <option value="{$vo.id}" class="form-control">{$vo.name}{$vo.version}</option>
             {/foreach}
             </select>
 <!--            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="" readonly>-->
@@ -36,7 +36,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-1">开票人:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-drawer_name"  class="form-control" name="row[drawer_name]">
+            <select style="width: 380px;height: 35px" id="c-drawer_name"  class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[drawer_name]">
                 {foreach $sckp as $key=>$vv}
                 <option value="{$vv.name}">{$vv.name}</option>
                 {/foreach}
@@ -45,9 +45,9 @@
         </div>
         <label class="control-label col-xs-12 col-sm-1">审核人:</label>
         <div class="col-xs-12 col-sm-3">
-            <select style="width: 380px;height: 35px" id="c-examine_name"  class="form-control" name="row[examine_name]">
+            <select style="width: 380px;height: 35px" id="c-examine_name"  class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine_name]">
                 {foreach $scsh as $key=>$vvv}
-                <option value="{$vvv.name}">{$vvv.name}</option>
+                <option value="{$vvv.name}" >{$vvv.name}</option>
                 {/foreach}
             </select>
             <!--<input id="c-examine_name" data-rule="required" class="form-control" name="row[examine_name]" type="text">-->

application/admin/view/printt/index.html

@@ -10,13 +10,13 @@
 
     <div class="form-group">
         <div class="col-xs-12 col-sm-8"><br>
-            <h4 style="color: red">提示：如果生成多个不同物料不请换行输入，打印中带有（）请使用英文()</h4><br>
+            <h4 style="color: red">提示：如果生成多个不同物料请换行输入</h4><br>
             <span>纸张选择&nbsp;</span>
             <select id="selectList" style="height: 25px;border-radius: 5px 5px 5px 5px">
-                <option value="10*6">不选择默认10*6&nbsp;&nbsp;</option>
-                <option value="10*5">10*5</option>
+                <!--<option value="10*6">不选择默认10*6&nbsp;&nbsp;</option>-->
+                <!--<option value="10*5">10*5</option>-->
                 <option value="10*6">10*6</option>
-                <option value="10*8">10*8</option>
+                <!--<option value="10*8">10*8</option>-->
             </select>
             <br><br>
             <span>打印数量&nbsp;</span>
@@ -28,7 +28,7 @@
     <div class="form-group">
         <div class="col-xs-12 col-sm-8">
             <span>日期&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-            <input type="text" id="time" placeholder="请输入日期" readonly disabled>
+            <input type="text" id="time" placeholder="请输入日期">
             <br><br>
         </div>
     </div>

public/assets/js/backend/feeding.js

@@ -190,13 +190,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jQuery.print','jquery
                                         });
                                     });
                                 }else{//批次号不重复直接赋值
-                                    console.log(2222)
+                                    // console.log(2222);
                                     $("#btn").css('display','none');
                                     $("#c-name").val(res.data[0].name);
                                     $("#c-specifications").val(res.data[0].drawer_name);
                                     $("#c-unit").val(res.data[0].examine_name);
-                                    // $("#c-operator").val(res.operator);
-                                    // $("#c-inspector").val(res.inspector);
+                                    // alert(res.operator)
+                                    if (res.operator != '' && res.inspector != ''){
+                                        $("#c-operator").val(res.operator);
+                                        $("#c-inspector").val(res.inspector);
+                                    }
                                     $.ajax({
                                         method: "POST",
                                         url: "feeding/get_formula",