1129刘功能优化

application/admin/controller/Order.php

@@ -87,7 +87,6 @@ class Order extends Backend
                 $customer = Db::name('order')->where('product','neq','')->field('id,product')->limit(20)->select();
             }
             $this->assign('customer',$customer);
-
             //营销部=>经办
             $yxjb = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxjb")->order('name desc')->select();
             //营销部=>审核
@@ -162,12 +161,23 @@ class Order extends Backend
             $this->error(__('You have no permission'));
         }
         if (false === $this->request->isPost()) {
-            //营销部=>经办
+            $ids = input('ids');
+            $order = Db::name('order')->field('user_name,examine,customer')->where('id',"=",$ids)->find();
+            //查询公司
+            $customer_name = Db::name('customer')->field('id,customer_name')->where('customer_name','=',$order['customer'])->find();
+            $this->assign('customer_name',$customer_name);
+            $customer = Db::name('customer')->field('customer_name')->select();
+            $this->assign('customer',$customer);
+            //查询 经办 审核
             $yxjb = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxjb")->order('name desc')->select();
-            //营销部=>审核
             $yxsh = Db::name('personnel')->where('bid',"=",1)->where('position','=',"yxsh")->order('name desc')->select();
+            $personnel_yxjb = Db::name('personnel')->where('name','=',$order['user_name'])->find();
+            $personnel_yxsh = Db::name('personnel')->where('name','=',$order['examine'])->find();
             $this->assign('yxjb',$yxjb);
             $this->assign('yxsh',$yxsh);
+            $this->assign('personnel_yxjb',$personnel_yxjb);
+            $this->assign('personnel_yxsh',$personnel_yxsh);
+
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
@@ -366,26 +376,31 @@ class Order extends Backend
     //关联客户管理中：客户名称 => 订货单位
     public function customer_customer(){
         $params = input('customer');
+        $user_info = Session::get('admin');
+        $map = [];
+        if($user_info['id'] !== 1){
+            $map['company_id'] = $user_info['company_id'];
+        }
         if ($params){
-            $customer = Db::name('customer')->where('customer_name','like','%'.$params.'%')->select();
+            $customer = Db::name('customer')->where('customer_name','like','%'.$params.'%')->where($map)->select();
         }else{
-            $customer = Db::name('customer')->where('customer_name','neq','')->field('id,customer_name')->limit(20)->select();
+            $customer = Db::name('customer')->where('customer_name','neq','')->where($map)->field('id,customer_name')->limit(20)->select();
         }
         $result = ['rows'=>$customer];
         return json($result);
     }
 
     //关联订单品名
-    public function order_product(){
-        $params = input('product');
-        if ($params){
-            $customer = Db::name('order')->where('product','like','%'.$params.'%')->select();
-        }else{
-            $customer = Db::name('order')->where('product','neq','')->field('id,product')->limit(20)->select();
-        }
-        $total = count($customer);
-        $result = ['total'=>$total,'rows'=>$customer];
-        return json($result);
-    }
+//    public function order_product(){
+//        $params = input('product');
+//        if ($params){
+//            $customer = Db::name('order')->where('product','like','%'.$params.'%')->select();
+//        }else{
+//            $customer = Db::name('order')->where('product','neq','')->field('id,product')->limit(20)->select();
+//        }
+//        $total = count($customer);
+//        $result = ['total'=>$total,'rows'=>$customer];
+//        return json($result);
+//    }
 
 }

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="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[charge_name]">
+            <select  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="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine_name]">
+            <select 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/order/add.html

@@ -78,7 +78,8 @@
     <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="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[user_name]">
+            <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}
@@ -89,7 +90,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="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine]">
+            <select  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/edit.html

@@ -9,7 +9,15 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer" data-rule="required" class="form-control" name="row[customer]" type="text" value="{$row.customer|htmlentities}">
+            <input type="hidden" value="{$customer_name.id}">
+            <select id="c-customer" data-rule="required"  class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[customer]" type="text" value="{$row.customer|htmlentities}">
+            <!--<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]">-->
+                <option value="{$customer_name.customer_name}">{$customer_name.customer_name}</option>
+                {foreach $customer as $key=>$vvo}
+                <option value="{$vvo.customer_name}">{$vvo.customer_name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-customer" data-rule="required"  class="form-control" name="row[customer]" type="text" value="{$row.customer|htmlentities}">-->
         </div>
     </div>
     <div class="form-group">
@@ -76,13 +84,27 @@
     <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">
-            <input id="c-user_name" data-rule="required" class="form-control" name="row[user_name]" type="text" value="{$row.user_name|htmlentities}">
+            <input type="hidden" value="{$personnel_yxjb.id}">
+            <select  id="c-user_name" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[user_name]" type="text" value="{$row.user_name|htmlentities}">
+                <option value="{$personnel_yxjb.name}">{$personnel_yxjb.name}</option>
+                {foreach $yxjb as $key=>$vv}
+                <option value="{$vv.name}">{$vv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-user_name" data-rule="required" class="form-control" name="row[user_name]" type="text" value="{$row.user_name|htmlentities}">-->
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Examine')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-examine" data-rule="required" class="form-control" name="row[examine]" type="text" value="{$row.examine|htmlentities}">
+            <input type="hidden" value="{$personnel_yxsh.id}">
+            <select  id="c-examine" data-rule="required" class="control-label col-xs-12 col-sm-8 form-control selectpicker" name="row[examine]" type="text" value="{$row.examine|htmlentities}">
+                <option value="{$personnel_yxsh.name}">{$personnel_yxsh.name}</option>
+                {foreach $yxsh as $key=>$vvv}
+                <option value="{$vvv.name}">{$vvv.name}</option>
+                {/foreach}
+            </select>
+            <!--<input id="c-examine" data-rule="required" class="form-control" name="row[examine]" type="text" value="{$row.examine|htmlentities}">-->
         </div>
     </div>
     <div class="form-group">