会员用户录入修改

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -353,9 +353,6 @@ class CustomerDepositController extends Controller
         $team_id = (int)$request->input('team_id');
 
         $self_role = session('role_name');
-        if($self_role == '销售' || $self_role == '分销销售'){
-            $admin_id = session('admin_id');
-        }
 
         if($self_role == '管理员'){
             //只能看自己团队的
@@ -428,7 +425,20 @@ class CustomerDepositController extends Controller
      * @param Request $request
      */
     public function addVipCustomer(Request $request) {
-        return view('customer/vipCustomerCreate');
+        $self_role = session('role_name');
+        $team_id = null;
+        if($self_role == '管理员'){
+            //只能看自己团队的
+            $self_id = session('admin_id');
+            $team_id = DB::table('admin')->where('id', $self_id)->pluck('team_id');
+        }
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
+            if($self_role == '管理员') $query->where('team_id', $team_id);
+        })->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+        return view('customer/vipCustomerCreate',[
+            'adminlist' => $adminList,
+        ]);
     }
 
     /**
@@ -436,7 +446,7 @@ class CustomerDepositController extends Controller
      * @param Request $request
      */
     public function storeVipCustomer(Request $request) {
-        $self_id = session('admin_id');
+
         $this->validate($request, [
             'phone' => 'required',
             'birthday' => 'required',
@@ -449,7 +459,7 @@ class CustomerDepositController extends Controller
         $customerVip = new CustomerVip();
         $customerVip->phone = $request->input('phone');
         $customerVip->name = $request->input('name');
-        $customerVip->admin_id = $self_id;
+        $customerVip->admin_id = $request->input('admin_id');
         $customerVip->level = 1;
         $customerVip->discount = 95;
         $customerVip->create_time = date('Y-m-d H:i:s',time());
@@ -479,8 +489,22 @@ class CustomerDepositController extends Controller
      */
     public function editVipCustomer(Request $request) {
         $id = $request->input('id');
+        $self_role = session('role_name');
+        $team_id = null;
+        if($self_role == '管理员'){
+            //只能看自己团队的
+            $self_id = session('admin_id');
+            $team_id = DB::table('admin')->where('id', $self_id)->pluck('team_id');
+        }
         $customer = CustomerVip::findOrFail($id);
-        return view('customer/vipCustomerEdit',['info'=>$customer]);
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
+            if($self_role == '管理员') $query->where('team_id', $team_id);
+        })->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+        return view('customer/vipCustomerEdit',[
+            'info'=>$customer,
+            'adminlist' => $adminList,
+            ]);
     }
 
     /**
@@ -488,13 +512,13 @@ class CustomerDepositController extends Controller
      * @param Request $request
      */
     public function updateVipCustomer(Request $request) {
-        $self_id = session('admin_id');
         $id = $request->input('id');
 
         //修改vip用户信息
         $customerVip = CustomerVip::findOrFail($id);
         $customerVip->name = $request->input('name');
         $customerVip->birthday = $request->input('birthday');
+        $customerVip->admin_id = $request->input('admin_id');
         if($customerVip->save()){
             return redirect('/admin/customer/vipList')->with('info', '编辑成功');
         } else {

resources/views/admin/index.blade.php

@@ -75,7 +75,7 @@
                         <li @if(!isset($res['custreport/detail'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/detailindex')}}" data-title="销售上报加粉数据" href="javascript:void(0)">销售上报加粉数据</a></li>
                         <li @if(!isset($res['custreport/disCostList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/disCostList')}}" data-title="上报地域投入数据" href="javascript:void(0)">上报地域投入数据</a></li>
                         <li @if(!isset($res['admin/qrcode'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/uploadQrcodeEdit')}}" data-title="微信二维码上传" href="javascript:void(0)">微信二维码上传</a></li>
-                        <li @if(!isset($res['customer/vipList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/customer/vipList')}}" data-title="vip用户录入" href="javascript:void(0)">vip用户录入</a></li>
+                        <li @if(!isset($res['customer/vipList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/customer/vipList')}}" data-title="会员用户录入" href="javascript:void(0)">会员用户录入</a></li>
                     </ul>
                 </dd>
             </dl>

resources/views/customer/customerGiftAdd.blade.php

@@ -105,6 +105,13 @@
         });
 
         function add_goods(goods_id,sku_id,name,props_name,price,is_weigh){
+            //只可以选择一种商品
+            var length = $('#goods_o').children().length;
+            if(length > 0){
+                alert('只可以添加一个商品,请先移除现有商品');
+                return false;
+            }
+
             var gnum = $("#gnum"+sku_id).val();
             var weigh_unit = '数量';
             var weigh_note = '';

resources/views/customer/vipCustomerCreate.blade.php

@@ -35,6 +35,17 @@
                 </div>
             </div>
             <div class="row cl">
+                <label for="" class="form-label col-xs-4 col-sm-2">选择销售:</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <select style="text-align:center" id='admin_id' class="select-box" name="admin_id">
+                        <option value="0" selected class="select-option">-- 选择销售 --</option>
+                        @foreach($adminlist as $v)
+                            <option value="{{$v['id']}}" @if(old('admin_id')==$v['id']) selected @endif class="select-option">{{$v['realname']}}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+            <div class="row cl">
                 <div class="col-9 col-offset-2">
                     <button class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">&nbsp;&nbsp;提交&nbsp;&nbsp;</button>&nbsp;
                     <button class="btn btn-default" type="reset" onclick="return_index();">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;

resources/views/customer/vipCustomerEdit.blade.php

@@ -37,8 +37,6 @@
                         <input type="text" class="input-text" value="{{$info['name']}}" placeholder="请输入用户姓名" name="name">
                     </div>
                 </div>
-
-
                 <div class="row cl">
                     <label class="form-label col-xs-4 col-sm-2">
                         生日：</label>
@@ -47,6 +45,16 @@
                     </div>
                 </div>
             <div class="row cl">
+                <label for="" class="form-label col-xs-4 col-sm-2">选择销售:</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <select style="text-align:center" id='admin_id' class="select-box" name="admin_id">
+                        @foreach($adminlist as $v)
+                            <option value="{{$v['id']}}" @if($info['admin_id'] == $v['id']) selected @endif class="select-option">{{$v['realname']}}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+            <div class="row cl">
                 <div class="col-9 col-offset-2">
                     <button class="btn btn-primary radius" type="button" onclick="to_submit()" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">&nbsp;&nbsp;提交&nbsp;&nbsp;</button>&nbsp;
                     <button class="btn btn-default" type="reset" onclick="return_index();">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;