刘功能优化

application/admin/controller/Formula.php

@@ -132,7 +132,6 @@ class Formula extends Backend
         $user_info = Session::get('admin');
         $params['user_id'] = $user_info['id'];
         $params['company_id'] = $user_info['company_id'];
-
         $result = false;
         Db::startTrans();
         try {
@@ -422,10 +421,12 @@ class Formula extends Backend
         $params['remark'] = $base[6];
         $params['machine'] = $base[7];
         $params['oid'] = $base[8];
+
         $params['create'] = date('Y-m-d H:i:s');
         $result = false;
         Db::startTrans();
         try {
+
             $result = Db::name('task')->insert($params);
             //更改订单已完成数量，修改订单状态
             $order_info = Db::name('order')->where('id',$params['oid'])->find();

application/admin/view/formula/task.html

@@ -52,7 +52,7 @@
         <div class="col-xs-12 col-sm-3">
             <select id="c-mid" data-rule="required" class="control-label col-xs-12 col-sm-8 selectpicker" name="row[mid]">
                 {foreach name="machineList" item="vo"}
-                <option value="{$vo.id}" {in name="key" value=""}selected{/in}>{$vo.name}</option>
+                <option value="{$vo.name}" {in name="key" value=""}selected{/in}>{$vo.name}</option>
                 {/foreach}
             </select>
         </div>

public/assets/js/backend/formula.js

@@ -11,7 +11,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     del_url: 'formula/del',
                     multi_url: 'formula/multi',
                     import_url: 'formula/import',
-                    table: 'formula', 
+                    table: 'formula',
                 }
             });