Merge branch 'master' of http://git.9026.com/richod/dcj

app/Http/Controllers/Admin/Controller.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use Illuminate\Routing\Controller as BaseController;
-use Request,Auth;
+use Request,Auth,Response;
 /**
  * 父控制类类
  *
@@ -22,6 +22,10 @@ abstract class Controller extends BaseController
         });
     }
 
+    public function api($data) {
+        return Response::json($data);
+    }
+
     public function formatUrl($url){
         // echo substr($url, 0, 7);
         //dd($url);

app/Http/Controllers/Admin/Medical/OrderController.php

@@ -102,6 +102,7 @@ class OrderController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
+
         return view('admin.medical.order.edit',compact('data'));
     }
 
@@ -152,27 +153,15 @@ class OrderController extends Controller
     public function upload(Request $request)
     {
         if($request->method() == 'POST') {
-            $data = $request->all();
-            $file=$request->file('pdf');
-            if ( $file->isValid()) { //判断文件是否有效
-                //$filename = $file->getClientOriginalName(); //文件原名称
-                $extension = $file->getClientOriginalExtension(); //扩展名
-                $filename = time() . "." . $extension;    //重命名
-              //  echo public_path().'\upload\pdf';die;
-                $res =$file->move(public_path().'/upload/pdf', $filename); //移动至指定目录
-                if($res){
-                    $url = '/upload/pdf/'.$filename;
-                    $update['pdf'] = $this->formatUrl($url);
-                    $res = MedicalOrderModel::where('id',$data['id'])->update($update);
-                    $check = MedicalOrderModel::find($data['id']);
-                    $this->getCode($check->mobile);
-                    return $this->showMessage('操作成功');
-                }else{
-                    return $this->showWarning('操作失败');
-                }
+            $data = $request->input();
+            $url = str_replace(env('APP_URL'),public_path(),$data['file']);
+            $ok = unlink($url);
+            if($ok) {
+                $data['status'] = 1;
+            }else{
+                $data['status'] = 0;
             }
-
-
+            return $this->api($data);
         }
     }
 
@@ -240,6 +229,8 @@ class OrderController extends Controller
         $data = (array) request('data');
         $data['pdf'] = $this->formatUrl($data['pdf']);
         $ok = $this->repository->update(request('id'),$data);
+        $check = MedicalOrderModel::find(request('id'));
+        $this->getCode($check->mobile);
         if($ok) {
             $url[] = array('url'=>U( 'Medical/Order/index'),'title'=>'返回列表');
             return $this->showMessage('操作成功',urldecode(request('_referer')));

app/Services/Base/Attachment.php

@@ -142,7 +142,7 @@ class Attachment
      */
 
 
-    public function localUpload($field, $request, $tag = 'files', $size = 20 * 1024 * 1024, array $mimeType = ['image/jpeg', 'image/png', 'image/gif','video/mp4','application/pdf'])
+    public function localUpload($field, $request, $tag = 'files', $size = 30 * 1024 * 1024, array $mimeType = ['image/jpeg', 'image/png', 'image/gif','video/mp4','application/pdf'])
     {
 
         $tag = $request['folder'];

app/Widget/Tools/FileUpload.php

@@ -33,6 +33,7 @@ class FileUpload {
         }
 
         $token = csrf_token();
+
         $html = <<<EOF
          <link href="/base/webuploader/webuploader.css" rel="stylesheet">
                         <script src="/base/webuploader/webuploader.min.js"></script>
@@ -42,6 +43,11 @@ class FileUpload {
                         <input type="text" class="form-control input-uploadfile" id="pdfUpload" value="{$file}" name="{$name}" placeholder="{$option['placeholder']}" readonly>
                         <div class="input-group-btn">
                             <div id="{$id}" class="btn-xs {$option['button_class']}">上传文件</div>
+                            
+                        </div>
+                         <div class="input-group-btn">
+                      
+                            <input type="button" class="btn btn-danger" onclick="del('{$file}')" style="margin-right:20px;" value="删除">
                         </div>
                     </div>
                 </div>
@@ -62,8 +68,8 @@ class FileUpload {
                         swf: "/base/webuploader/uploader.swf",
                         server: "/admin/Base/Attachment/webupload",
                         fileNumLimit: 300,
-                        fileSizeLimit: 20 * 1024 * 1024,
-                        fileSingleSizeLimit: 20 * 1024 * 1024,
+                        fileSizeLimit: 30 * 1024 * 1024,
+                        fileSingleSizeLimit: 30 * 1024 * 1024,
                     });
                     uploader.option("formData", {
                         $extParam
@@ -76,7 +82,7 @@ class FileUpload {
                     });
                     uploader.on("error",function(type){
                         if(type=='F_EXCEED_SIZE'){
-                            layer.msg("上传的文件不大于20MB", {icon: 2});
+                            layer.msg("上传的文件不大于30MB", {icon: 2});
                             return false;
                         }else if(type=="Q_TYPE_DENIED"){
                             layer.msg("请上传格式正确的文件", {icon: 2});
@@ -108,7 +114,7 @@ class FileUpload {
                 }
                 webUpload{$id}();
                 
-                
+               
                
             </script>
 EOF;

resources/views/admin/medical/order/edit.blade.php

@@ -154,6 +154,7 @@
                                     <div class="col-sm-9">
                                         {{--{!!  widget('Tools.ImgUpload')->single2('/upload/attr','attr',"attr",  isset($data['attr'])? $data['attr'] : '',array("sizex"=>1920,"sizey"=>1080)) !!}--}}
                                         {!!  widget('Tools.FileUpload')->single('/upload/pdf','pdf',"data[pdf]",  isset($data['pdf'])? $data['pdf'] : '') !!}
+
                                     </div>
                                 </div>
                                 
@@ -176,5 +177,27 @@
 			</div>
 		</div>
 	</div>
+    <script>
+
+        function del(file){
+            var url = "{{ url('/admin/Medical/Order/upload') }}";
+            $.ajax({
+                headers: {
+                    'X-CSRF-TOKEN': "{{ csrf_token() }}"
+                },
+                type: 'POST',
+                url: url,
+                data: {
+                    file: file
+                },
+                dataType: 'json',
+                success: function (data) {
+                    if(data.status==1){
+                        $("#pdfUpload").val('');
+                    }
+                }
 
+            });
+        }
+    </script>
 @endsection

resources/views/admin/medical/order/index.blade.php

@@ -82,8 +82,7 @@
 											<li class="divider"></li>
 											<li><a href="{{ U('Medical/Order/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
 											@endif
-                                                <li class="divider"></li>
-                                                <li><a href="javascript:open({{$item->id}});">上传</a></li>
+
 										</ul>
 									</div>
 								@if(role('Medical/Order/view'))
@@ -114,62 +113,5 @@
 
 
 	</div>
-    <div id="modelss" style="width: 100%; height: 100%; background:rgba(0,0,0,0.6); z-index: 10;position: fixed;top:0;display: none">
-        <div class="inmodal" id="myModal2" tabindex="1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content animated flipInY">
-                    <div class="modal-header">
-                        <button type="button" class="close" onclick="javascript:
-                                        $('#modelss').css('display','none');"><span >×</span><span class="sr-only">Close</span></button>
-                        <h4 class="modal-title">上传pdf</h4></div><small class="font-bold">
-                        <div class="modal-body">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-content">
-
-                                    <form name="form_product" id="form-validation" action="upload" class="form-horizontal form-validation" enctype="multipart/form-data" accept-charset="UTF-8" method="post">
-                                        {{ csrf_field() }}
-                                        <div class="form-group">
-                                            <label class="control-label col-sm-3">pdf</label>
-
-                                            <div class="col-sm-9">
-                                                <input type="file" name="pdf" id="pdf" class="form-control">
-                                            </div>
-                                        </div>
-
-
-
-
-                                        <div class="form-group">
-                                            <label class="control-label col-sm-3">&nbsp;</label>
-                                            <div class="col-sm-9">
-                                                <input type="hidden" class="update_id" name="id" value="">
-                                                <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
-                                                <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
-                                                <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                                <input type="reset" class="btn btn-default" >
-                                            </div>
-                                        </div>
-
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="button" id="close" class="btn btn-white" onclick="javascript:
-                                        $('#modelss').css('display','none');">关闭</button>
-                        </div>
-                    </small></div><small class="font-bold">
-                </small></div><small class="font-bold">
-            </small>
-        </div>
-    </div>
-    <script>
-
-        $('#close').click();
-        function open(id) {
-            $('.update_id').val(id);
-            $('#modelss').css('display','block');
-        }
 
-    </script>
 @endsection