修改后台，减少对登录用户company_id的依赖

application/admin/controller/Order.php

@@ -86,13 +86,12 @@ class Order extends Backend
      */
     public function submitordernew(){
         if(!$this->request->isPost()){
-            $this->assign('staff_id',$this->auth->staff_id);
             return $this->view->fetch();
         }
 
         $data = request_post_hub([
             'user_name','user_car_number','user_mobile','user_address',
-            'servicetype_id','server_time','server_info','server_images','pay_fee'
+            'servicetype_id','server_time','server_info','server_images','pay_fee','company_id','staff_id'
         ]);
 
         Db::startTrans();
@@ -113,8 +112,6 @@ class Order extends Backend
         //准备数据
         $data['orderno']    = createUniqueNo('O',$user_info['id']);
         $data['ordertype']    = 2;  //类型:1=预约下单,2=在线下单,3=套餐订单
-        $data['company_id'] = $this->auth->company_id;
-        $data['staff_id'] = $this->auth->staff_id;
         $data['total_fee'] = $data['pay_fee'];
 
         $data['status'] = 2; //2=已支付,待处理
@@ -190,7 +187,6 @@ class Order extends Backend
             $this->assign('id',$id);
             $info = Db::name('order')->where('id',$id)->find();
             $this->assign('info',$info);
-            $this->assign('staff_id',$this->auth->staff_id);
 
             //是否弹出保养
             $baoyang_switch = Db::name('servicetype')->where('id',$info['servicetype_id'])->value('baoyang_switch');
@@ -216,7 +212,7 @@ class Order extends Backend
 
         //完成
         $time = time();
-        $updateData = ['status'=>3,'finish_time'=>time(),'staff_id'=>$this->auth->staff_id];
+        $updateData = ['status'=>3,'finish_time'=>time()];
         $updateData = array_merge($updateData,$baoyang_data);
         $rs = Db::name('order')->where('id',$id)->update($updateData);
         if($rs === false){
@@ -226,7 +222,7 @@ class Order extends Backend
 
         //给门店加钱
         if($info['ordertype'] == 3 && $info['paytype'] == 3 && $info['pay_fee'] > 0){
-            $wallet_rs = model('walletcompany')->lockChangeAccountRemain($this->auth->company_id,'money',$info['pay_fee'],203,$remark='套餐订单完成服务','order',$id);
+            $wallet_rs = model('walletcompany')->lockChangeAccountRemain($info['company_id'],'money',$info['pay_fee'],203,$remark='套餐订单完成服务','order',$id);
             if($wallet_rs['status'] === false){
                 Db::rollback();
                 $this->error($wallet_rs['msg']);

application/admin/lang/zh-cn/company.php

@@ -19,7 +19,7 @@ return [
     'Latitude'        => '纬度',
     'Aptitude_images' => '资质',
     'Status'          => '状态',
-    'Status -1'       => '新来的',
+    'Status -1'       => '已申请的',
     'Status 0'        => '待审核',
     'Status 1'        => '审核通过',
     'Status 2'        => '审核不通过',

application/admin/view/order/finish.html

@@ -8,12 +8,6 @@
             <input  class="form-control" disabled type="text" value="{$info.orderno}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">操作店员:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-staff_id" data-rule="required" disabled data-source="company_staff/index" data-field="truename" class="form-control selectpage" type="text" value="{$staff_id|htmlentities}">
-        </div>
-    </div>
 
     <?php if($baoyang_switch == 1){ ?>
         <div class="form-group">

application/admin/view/order/submitordernew.html

@@ -65,9 +65,15 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">选择门店:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-company_id" data-rule="required" data-source="company/index" data-field="name" name="company_id" class="form-control selectpage" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">操作店员:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-staff_id" data-rule="required" disabled data-source="company_staff/index" data-field="truename" class="form-control selectpage" type="text" value="{$staff_id|htmlentities}">
+            <input id="c-staff_id" data-rule="required" data-source="company_staff/index" data-field="truename" name="staff_id" class="form-control selectpage" type="text" value="">
         </div>
     </div>
 

application/api/controller/company/Order.php

@@ -155,7 +155,7 @@ class Order extends Apic
 
         //完成
         $time = time();
-        $updateData = ['status'=>3,'finish_time'=>time(),'staff_id'=>$this->auth->id];
+        $updateData = ['status'=>3,'finish_time'=>time()];
 
         $rs = Db::name('order')->where('id',$id)->update($updateData);
         if($rs === false){

public/assets/js/backend/order.js

@@ -149,3 +149,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
     };
     return Controller;
 });
+$("#c-staff_id").data("params", function (obj) {
+    return {
+        custom: {company_id: $("#c-company_id").val()}
+    };
+});
+$(document).on("change","#c-company_id",function(){
+    $("#c-staff_id").selectPageClear();
+})