Browse Source

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

lizhen_gitee 1 year ago
parent
commit
ae628d3a83

+ 2 - 3
application/admin/controller/Preorder.php

@@ -114,14 +114,14 @@ class Preorder extends Backend
         if(!$this->request->ispost()){
             $this->assign('id',$pre_order_id);
             $this->assign('row',$pre_order);
-            $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','staff_id'
         ]);
 
         Db::startTrans();
@@ -158,7 +158,6 @@ class Preorder extends Backend
         $data['orderno']    = createUniqueNo('O',$pre_order_id);
         $data['ordertype']    = 1;  //类型:1=预约下单,2=在线下单,3=套餐订单
         $data['company_id'] = $pre_order['company_id'];
-        $data['staff_id']   = $this->auth->staff_id;
         $data['total_fee']  = $data['pay_fee'];
 
         $data['status'] = 2; //2=已支付,待处理

+ 7 - 7
application/admin/controller/UserWallet.php

@@ -81,7 +81,7 @@ class UserWallet extends Backend
             $this->assign('comefrom',$data);
             return $this->view->fetch();
         }
-        $field = ['nickname','mobile','car_number','address','comefrom','remark'];
+        $field = ['nickname','mobile','car_number','address','comefrom','remark','company_id','staff_id'];
         $data = request_post_hub($field);
 
         $user = Db::name('user')->field('id,nickname,mobile')->where('mobile',$data['mobile'])->find();
@@ -90,7 +90,7 @@ class UserWallet extends Backend
             //已经是我公司的客户
             $map = [
                 'w.user_id'    => $user['id'],
-                'w.company_id' => $this->auth->company_id,
+                'w.company_id' => $data['company_id'],
             ];
             $check = Db::name('user_wallet')->alias('w')
                 ->field('w.*,staff.truename')
@@ -105,8 +105,8 @@ class UserWallet extends Backend
             //添加新客户
             $new_data = [
                 'user_id'    => $user['id'],
-                'company_id' => $this->auth->company_id,
-                'staff_id'   => $this->auth->staff_id,
+                'company_id' => $data['company_id'],
+                'staff_id'   => $data['staff_id'],
                 'money'      => 0,
                 'address'    => $data['address'],
                 'createtime' => time(),
@@ -151,7 +151,7 @@ class UserWallet extends Backend
                 'jointime'  => time(),
                 'joinip'    => request()->ip(),
                 'status'    => 1,
-                'company_id'=> $this->auth->company_id,
+                'company_id'=> $data['company_id'],
             ];
             Db::startTrans();
             $user_id = Db::name('user')->insertGetId($user_data);
@@ -166,8 +166,8 @@ class UserWallet extends Backend
             //添加新客户
             $new_data = [
                 'user_id'    => $user_id,
-                'company_id' => $this->auth->company_id,
-                'staff_id'   => $this->auth->staff_id,
+                'company_id' => $data['company_id'],
+                'staff_id'   => $data['staff_id'],
                 'money'      => 0,
                 'address'    => $data['address'],
                 'createtime' => time(),

+ 7 - 1
application/admin/view/preorder/submitorder.html

@@ -67,9 +67,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" disabled data-source="company/index" data-field="name" name="company_id" class="form-control selectpage" type="text" value="{$row.company_id}">
+        </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>
 

+ 12 - 0
application/admin/view/user_wallet/newone.html

@@ -2,6 +2,18 @@
 
 
     <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" data-source="company_staff/index" data-field="truename" name="staff_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-mobile" data-rule="required" class="form-control" step="0.01" name="mobile" type="text">

+ 8 - 0
public/assets/js/backend/user_wallet.js

@@ -68,3 +68,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();
+})