m

app/Http/Controllers/Admin/CustReportController.php

@@ -73,11 +73,12 @@ class custReportController extends Controller
         $this->validate($request, [
             'total_cost'           => 'required', 
             'total_fan_add'           => 'required',   
-            'dtime'           => 'required',   
+            'dtime'           => 'required|unique:cust_day_total,dtime,1,is_del',   
         ], [                  
             'total_cost.required'           => '总成本不能为空',                   
             'total_fan_add.required'           => '总加粉数不能为空',                                    
-            'dtime.required'           => '日期不能为空',                                    
+            'dtime.required'           => '日期不能为空',
+            'dtime.unique'           => '指定日期已经添加过',                                    
         ]);
         //数据库-新增数据
         $custreport = array();
@@ -112,17 +113,19 @@ class custReportController extends Controller
      * @return \Illuminate\Http\RedirectResponse
      */
     public function totalupdate(Request $request)
-    {            
+    {    
+        $id = (int)$request->input('id');        
         $this->validate($request, [
             'id'                  => 'required',
             'total_cost'          => 'required', 
             'total_fan_add'       => 'required',   
-            'dtime'               => 'required',   
+            'dtime'               => 'required|unique:cust_day_total,dtime,'.$id.',id,is_del,0',   
         ], [                  
             'id.required'              => 'id不能为空',                   
             'total_cost.required'      => '总成本不能为空',                   
             'total_fan_add.required'   => '总加粉数不能为空',                                    
-            'dtime.required'           => '日期不能为空',                                    
+            'dtime.required'           => '日期不能为空',
+            'dtime.unique'           => '指定日期已存在',                                    
         ]);
        
         $custreport = array();
@@ -130,7 +133,6 @@ class custReportController extends Controller
         $custreport['total_fan_add'] = $request->input('total_fan_add'); 
         $custreport['dtime'] = $request->input('dtime'); 
 
-        $id = (int)$request->input('id');
         $res = DB::table('cust_day_total')->where('id', $id)->update($custreport);        
         return redirect('/admin/custreport/totalindex')->with('info', '更新成功');         
     }
@@ -316,7 +318,11 @@ class custReportController extends Controller
      */
     public function detailcreate(Request $request)
     {
-        return view('custreport/detailcreate');
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+        $teamList = DB::table('teams')->select('id', 'name')->get();
+        $teamList = json_decode(json_encode($teamList), true);
+        return view('custreport/detailcreate',['adminlist'=>$adminList, 'teamlist'=>$teamList]);
     }
     /**
      * 分组管理-进行添加操作
@@ -325,16 +331,21 @@ class custReportController extends Controller
      */
     public function detailstore(Request $request)
     {       
+        $admin_id = (int)$request->input('admin_id');
+        if(!$admin_id){
+            $admin_id = session('admin_id');
+        }
         $this->validate($request, [
             'old_consult'           => 'required', 
             'new_consult'           => 'required', 
             'fan_add'           => 'required',   
-            'dtime'           => 'required',   
+            'dtime'           => 'required|unique:cust_day_detail,dtime,1,is_del,admin_id,'.$admin_id,   
         ], [                  
             'old_consult.required'           => '老粉咨询不能为空',                   
             'new_consult.required'           => '新粉咨询数不能为空',                                    
             'fan_add.required'           => '加粉数不能为空',                                    
             'dtime.required'           => '日期不能为空',                                    
+            'dtime.unique'           => '指定日期已经添加过',                                    
         ]);
         //数据库-新增数据
         $custreport = array();
@@ -342,10 +353,17 @@ class custReportController extends Controller
         $custreport['old_consult'] = $request->input('old_consult'); 
         $custreport['new_consult'] = $request->input('new_consult'); 
         $custreport['fan_add'] = $request->input('fan_add'); 
+        $custreport['new_reply'] = $request->input('new_reply'); 
         $custreport['dtime'] = $request->input('dtime'); 
-        $custreport['admin_id'] = session('admin_id'); 
-        $custreport['admin_name'] = session('real_name'); 
-                
+   
+        if($admin_id>0){
+            $admin_info = DB::table('admin')->select('realname', 'team_id')->where('id', $admin_id)->first();
+            $custreport['admin_id'] = $admin_id;
+            $custreport['admin_name'] = $admin_info->realname;
+        }else{
+            $custreport['admin_id'] = session('admin_id'); 
+            $custreport['admin_name'] = session('real_name'); 
+        }    
         $res = DB::table('cust_day_detail')->insert($custreport);            
         return redirect('/admin/custreport/detailindex')->with('info', '添加成功'); 
        
@@ -360,8 +378,14 @@ class custReportController extends Controller
     {
         
         $data = CustDetail::where('id', $id)->first();
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+        $teamList = DB::table('teams')->select('id', 'name')->get();
+        $teamList = json_decode(json_encode($teamList), true);
         return view('custreport/detailedit', [       
             'custreport' => $data,
+            'adminlist'  => $adminList,
+            'teamlist'  => $teamList,
         ]);
 
     }
@@ -373,27 +397,40 @@ class custReportController extends Controller
      */
     public function detailupdate(Request $request)
     {            
+        $id = (int)$request->input('id');
+        $admin_id = (int)$request->input('admin_id');
+        if(!$admin_id){
+            $admin_id = session('admin_id');
+        }
         $this->validate($request, [
             'id'           => 'required', 
             'old_consult'           => 'required', 
             'new_consult'           => 'required', 
             'fan_add'           => 'required',   
-            'dtime'           => 'required',   
+            'dtime'           => 'required|unique:cust_day_detail,dtime,'.$id.',id,admin_id,'.$admin_id,   
         ], [                  
             'id.required'           => 'id不能为空',                   
             'old_consult.required'           => '老粉咨询不能为空',                   
             'new_consult.required'           => '新粉咨询数不能为空',                                    
             'fan_add.required'           => '加粉数不能为空',                                    
-            'dtime.required'           => '日期不能为空',                                    
+            'dtime.required'           => '日期不能为空', 
+            'dtime.unique'           => '指定日期已经存在',                                   
         ]);
         //数据库-新增数据
         $custreport = array();       
         $custreport['old_consult'] = $request->input('old_consult'); 
         $custreport['new_consult'] = $request->input('new_consult'); 
         $custreport['fan_add'] = $request->input('fan_add'); 
-        $custreport['dtime'] = $request->input('dtime');  
+        $custreport['new_reply'] = $request->input('new_reply'); 
+        $custreport['dtime'] = $request->input('dtime'); 
+
+        $admin_id = (int)$request->input('admin_id');   
+        if($admin_id>0){
+            $admin_info = DB::table('admin')->select('realname', 'team_id')->where('id', $admin_id)->first();
+            $custreport['admin_id'] = $admin_id;
+            $custreport['admin_name'] = $admin_info->realname;
+        } 
 
-        $id = (int)$request->input('id');
         $res = DB::table('cust_day_detail')->where('id', $id)->update($custreport);        
         return redirect('/admin/custreport/detailindex')->with('info', '更新成功');         
     }

resources/views/custreport/detailcreate.blade.php

@@ -19,11 +19,18 @@
                     <input type="text" class="input-text" value="{{old('fan_add')}}" placeholder="请输入加粉数" name="fan_add">
                 </div>
             </div>
-            
+
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    新粉回复数：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{old('new_reply')}}" placeholder="" name="new_reply">
+                </div>
+            </div>            
             
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
-                    老粉咨询数：</label>
+                    老粉询价数：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="text" class="input-text" value="{{old('old_consult')}}" placeholder="" name="old_consult">
                 </div>
@@ -31,7 +38,7 @@
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
-                    新粉咨询数：</label>
+                    新粉询价数：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="text" class="input-text" value="{{old('new_consult')}}" placeholder="" name="new_consult">
                 </div>
@@ -44,6 +51,29 @@
                     <input id="dtime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:22%;text-align:center;" name="dtime" value="">                    
                 </div>
             </div>
+
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    选择销售员(不选默认当前用户)：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <span class="select-box">
+                        <select  size="1" name="team" id='team'>
+                            <option value="0" @if(old('team')=='') selected @endif>选择团队</option>
+                            @foreach($teamlist as $v)
+                                <option value="{{$v['id']}}" @if(old('team')==$v['id']) selected @endif>{{$v['name']}}</option>
+                            @endforeach
+                        </select>
+
+                        <select id='admins' size="1" name="admin_id">
+                            <option value="0" @if(old('admin_id')=='') selected @endif>-- 选择销售 --</option>
+                            @foreach($adminlist as $v)
+                                <option value="{{$v['id']}}" @if(old('admin_id')==$v['id']) selected @endif>{{$v['realname']}}</option>
+                            @endforeach
+                        </select>
+                        &nbsp;&nbsp;
+                    </span>
+                </div>
+            </div>
         
             <div class="row cl">
                 <div class="col-9 col-offset-2">
@@ -64,7 +94,27 @@
     <script type="text/javascript" src="/admin/lib/My97DatePicker/4.8/WdatePicker.js"></script>
     <script type="text/javascript">
         $(function(){
-            setTimeout("$('#error').hide()",3000);            
+            setTimeout("$('#error').hide()",3000); 
+
+            $('#team').change(function(){
+                team = $('#team').val();
+                if(team==''){
+                    return false;
+                }
+                $.ajax({
+                    'url':'/admin/order/teamAdmins/'+team,
+                    'type': 'get',
+                    'dataType':'json',
+                    'success' : function(data){
+                        str = '<option value=\'0\'>-- 选择销售 --<\/option>';
+                        $.each(data, function(i, va){
+                            str += '<option value="'+va.id+'">' + va.realname +'<\/option>';
+                        })
+                        
+                        $('#admins').html(str);
+                    }
+                });
+            })           
         });
         /*返回*/
         function return_index(){

resources/views/custreport/detailedit.blade.php

@@ -22,10 +22,17 @@
                 </div>
             </div>
             
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    新粉回复数：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{$custreport['new_reply']}}" placeholder="" name="new_reply">
+                </div>
+            </div>
             
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
-                    老粉咨询数：</label>
+                    老粉询价数：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="text" class="input-text" value="{{$custreport['old_consult']}}" placeholder="" name="old_consult">
                 </div>
@@ -33,7 +40,7 @@
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
-                    新粉咨询数：</label>
+                    新粉询价数：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="text" class="input-text" value="{{$custreport['new_consult']}}" placeholder="" name="new_consult">
                 </div>
@@ -46,6 +53,29 @@
                     <input id="dtime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:22%;text-align:center;" name="dtime" value="{{$custreport['dtime']}}">                    
                 </div>
             </div>
+
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    选择销售员(不选默认当前用户)：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <span class="select-box">
+                        <select  size="1" name="team" id='team'>
+                            <option value="0" @if($custreport['team_id']=='') selected @endif>选择团队</option>
+                            @foreach($teamlist as $v)
+                                <option value="{{$v['id']}}" @if($custreport['team_id']==$v['id']) selected @endif>{{$v['name']}}</option>
+                            @endforeach
+                        </select>
+
+                        <select id='admins' size="1" name="admin_id">
+                            <option value="0" @if($custreport['admin_id']=='') selected @endif>-- 选择销售 --</option>
+                            @foreach($adminlist as $v)
+                                <option value="{{$v['id']}}" @if($custreport['admin_id']==$v['id']) selected @endif>{{$v['realname']}}</option>
+                            @endforeach
+                        </select>
+                        &nbsp;&nbsp;
+                    </span>
+                </div>
+            </div>
                
             @endif
 
@@ -69,6 +99,26 @@
     <script type="text/javascript">
         $(function(){
             setTimeout("$('#error').hide()",3000);
+
+            $('#team').change(function(){
+                team = $('#team').val();
+                if(team==''){
+                    return false;
+                }
+                $.ajax({
+                    'url':'/admin/order/teamAdmins/'+team,
+                    'type': 'get',
+                    'dataType':'json',
+                    'success' : function(data){
+                        str = '<option value=\'0\'>-- 选择销售 --<\/option>';
+                        $.each(data, function(i, va){
+                            str += '<option value="'+va.id+'">' + va.realname +'<\/option>';
+                        })
+                        
+                        $('#admins').html(str);
+                    }
+                });
+            })
         });
         /*返回*/
         function return_index(){

resources/views/custreport/detaillist.blade.php

@@ -32,8 +32,9 @@
                 <tr class="text-c">
                     <th width="8%">日期</th>
                     <th width="8%">加粉数</th>
-                    <th width="8%">老粉咨询数</th>
-                    <th width="8%">新粉咨询数</th>
+                    <th width="8%">新粉回复数</th>
+                    <th width="8%">老粉询价数</th>
+                    <th width="8%">新粉询价数</th>
                     <th width="8%">所属销售</th>                                  
                     <th width="6%">操作</th>                  
                 </tr>
@@ -44,6 +45,7 @@
                         <tr class="text-c" style=" text-align:center;">                           
                             <td>{{$a['dtime']}}</td>                            
                             <td>{{$a['fan_add']}}</td>                            
+                            <td>{{$a['new_reply']}}</td>                            
                             <td>{{$a['old_consult']}}</td>                            
                             <td>{{$a['new_consult']}}</td>                            
                             <td>{{$a['admin_name']}}</td>