优化配方新增输入下拉功能

application/admin/controller/Formula.php

@@ -570,7 +570,14 @@ class Formula extends Backend
     }
     //获取工艺说明
     public function gyName(){
-        $list = Db::name('formula_detail')->where('gy_name','neq','')->field('id,gy_name')->limit(100)->select();
+        $params = input('gy_name');
+//        print_r($params);die;
+        if ($params){
+            $list = Db::name('formula_detail')->where('gy_name','like','%'.$params.'%')->field('id,gy_name')->limit(20)->select();
+        }else{
+            $list = Db::name('formula_detail')->where('gy_name','neq','')->field('id,gy_name')->limit(20)->select();
+        }
+
         $total = count($list);
         $result = ['total'=>$total,'rows'=>$list];
 //        return array('status'=>1,'rows'=>$list);

application/admin/view/formula/add.html

@@ -48,9 +48,26 @@
           <input id="c-usability" class="form-control selectpage"  data-multiple="true"  data-source="formula/getCustomer" data-field="customer_name" name="row[usability]" type="text" value="" placeholder="请选择配方对应客户,不选默认全部客户可用">
         </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">
+            <input id="add_material" class="form-control"  type="text" value="" placeholder="请输入原材料">
+        </div>
+        <div class="col-xs-12 col-sm-3">
+            <input id="add_percentage" class="form-control"  type="text" value="" placeholder="请输入百分比(%)">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1"></label>
+        <div class="col-xs-12 col-sm-6">
+            <input type="text" id="add_gy_name" placeholder="请输入操作工艺说明" data-source="formula/gyName" data-field="gy_name" data-pagination="true" data-page-size="10"  name="row[gy_name]" class="form-control selectpage" >
+        </div>
         <button type="button" id="add" class="btn btn-success">添加原材料</button>
+        <div id="show">
+            <div></div>
+        </div>
     </div>
     <div class="form-group">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
@@ -72,3 +89,4 @@
     </div>
 </form>
 
+

application/admin/view/formula/edit.html

@@ -71,8 +71,28 @@
     </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">
+            <input id="add_material" class="form-control"  type="text" value="" placeholder="请输入原材料">
+        </div>
+        <div class="col-xs-12 col-sm-3">
+            <input id="add_percentage" class="form-control"  type="text" value="" placeholder="请输入百分比(%)">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-1"></label>
+        <div class="col-xs-12 col-sm-6">
+            <input type="text" id="add_gy_name" placeholder="请输入操作工艺说明" data-source="formula/gyName" data-field="gy_name" data-pagination="true" data-page-size="10"  name="row[gy_name]" class="form-control selectpage" >
+        </div>
         <button type="button" id="add" class="btn btn-success">添加原材料</button>
+        <div id="show">
+            <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">
         <table class="table table-striped table-bordered table-hover table-nowrap" id="gy">
             <tr>

public/assets/js/backend/formula.js

@@ -69,36 +69,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.bindevent(table);
         },
         add: function () {
+            var gy_num = 1;
             $('#add').click(function () {
-                // $.ajax({
-                //     method:"POST",
-                //     url:'formula/gyName',
-                //     success(res){
-                //         var html = '';
-                //         html += '<tr><td><input  class="form-control material" type="text" value=""></td>';
-                //         html += '<td><input  class="form-control percentage" type="number" value=""></td>';
-                //         html += "<td><select class='form-control selectpicker' name='gy_name' id=''><option value=''>请选择工艺</option>";
-                //         for (var key in res){
-                //             html += "<option value='"+res[key].title+"'>"+res[key].title+"</option>";
-                //         }
-                //         html += "</select></td>";
-                //         // html += '<td><input  class="form-control gy_name" type="text" value=""></td>';
-                //         // html += '<td><input  class="form-control gy_num" type="text" value=""></td>';
-                //         html += '<td><button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
-                //         $('#gy').append(html);
-                //     }
-                // });
+                var material = $('#add_material').val();
+                var percentage = $('#add_percentage').val();
+                var gy_name = $('#add_gy_name').selectPageText();
                 var html = '';
-                html += '<tr><td><input  class="form-control material" type="text" value=""></td>';
-                html += '<td><input  class="form-control percentage" type="number" value=""></td>';
-                html += '<td><input  class="form-control gy_name" type="text" value=""></td>';
-                html += '<td><input  class="form-control gy_num" type="text" value=""></td>';
+                html += '<tr><td><input  class="form-control material" type="text" value="'+material+'"></td>';
+                html += '<td><input  class="form-control percentage" type="number" value="'+percentage+'"></td>';
+                html += '<td><input  class="form-control gy_name" type="text" value="'+gy_name+'" ></td>';
+                html += '<td><input  class="form-control gy_num" type="text" value="'+gy_num+'" ></td>';
                 html += '<td><button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
                 $('#gy').append(html);
+                if (gy_name !=''){
+                    gy_num = gy_num +1;
+                }
             });
             $(document).on('click','.del',function () {
                 $(this).parent().parent().remove();
             });
+
             Controller.api.bindevent();
 
             $(document).on('click','.submit',function () {
@@ -197,27 +187,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         edit: function () {
             $('#add').click(function () {
-                // $.ajax({
-                //     method: "POST",
-                //     url: 'formula/gyName',
-                //     success(res) {
-                //         var html = '';
-                //         html += '<tr><td><input  class="form-control material" type="text" value=""></td>';
-                //         html += '<td><input  class="form-control percentage" type="number" value=""></td>';
-                //         html += "<td><select class='form-control selectpicker' name='gy_name' id=''><option value=''>请选择工艺</option>";
-                //         for (var key in res) {
-                //             html += "<option value='" + res[key].title + "'>" + res[key].title + "</option>";
-                //         }
-                //         html += "</select></td>";
-                //         // html += '<td><input  class="form-control gy_num" type="text" value=""></td>';
-                //         html += '<td><button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
-                //         $('#gy').append(html);
-                //     }
-                // });
+                var material = $('#add_material').val();
+                var percentage = $('#add_percentage').val();
+                var gy_name = $('#add_gy_name').selectPageText();
                 var html = '';
-                html += '<tr><td><input  class="form-control material" type="text" value=""></td>';
-                html += '<td><input  class="form-control percentage" type="number" value=""></td>';
-                html += '<td><input  class="form-control gy_name" type="text" value=""></td>';
+                html += '<tr><td><input  class="form-control material" type="text" value="'+material+'"></td>';
+                html += '<td><input  class="form-control percentage" type="number" value="'+percentage+'"></td>';
+                html += '<td><input  class="form-control gy_name" type="text" value="'+gy_name+'"></td>';
                 html += '<td><input  class="form-control gy_num" type="text" value=""></td>';
                 html += '<td><button type="button"  class="btn btn-danger  del">删除</button></td></tr>';
                 $('#gy').append(html);