浏览代码

Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

Mike 4 年之前
父节点
当前提交
7071fa61f7

+ 0 - 19
app/Admin/Actions/backstage/Orders/PdfAction.php

xqd
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Admin\Actions\backstage\Orders;
-
-use Encore\Admin\Actions\RowAction;
-use Illuminate\Database\Eloquent\Model;
-
-class PdfAction extends RowAction
-{
-    public $name = '查看保单';
-
-    public function handle(Model $model)
-    {
-        // $model ...
-
-        return $this->response()->success('查看保单成功')->refresh();
-    }
-
-}

+ 16 - 7
app/Admin/Controllers/OrdersManagement/InsuranceListController.php

xqd xqd xqd
@@ -2,7 +2,6 @@
 
 namespace App\Admin\Controllers\OrdersManagement;
 
-use App\Admin\Actions\backstage\Orders\PdfAction;
 use App\Models\Order;
 use App\Models\OrderPack;
 use Encore\Admin\Controllers\AdminController;
@@ -30,15 +29,12 @@ class InsuranceListController extends AdminController
         $grid->actions(function ($actions){
            $actions->disableView();
            $actions->disableDelete();
-           if ($actions->row->payment_status != 2)
+           $need = OrderPack::where('order_id',$actions->row->id)->value('is_need_insurance');
+//           dd($need);
+           if ($actions->row->payment_status != 2 || $need == 0 )
            {
                $actions->disableEdit();
            }
-           $has_pdf = OrderPack::where('order_id',$actions->row->id)->value('insurance_img_url');
-           if (!empty($has_pdf))
-           {
-               $actions->add(new PdfAction());
-           }
         });
         $grid->disableCreateButton();
         $grid->model()->wherein('product_type',[6]);
@@ -56,6 +52,19 @@ class InsuranceListController extends AdminController
         $grid->column('orderPatient.birthday', __('出生日期'));
         $grid->column('orderPatient.card_type', __('证件类型'))->using([1=>'身份证',2=>'护照']);
         $grid->column('orderPatient.card_number', __('证件号码'));
+        $grid->column('orderPack.insurance_img_url', __('保单'))->link()->display(function ($url){
+            $img = OrderPack::where('order_id',$this->id)->value('insurance_img_url');
+            if (empty($img))
+            {
+                return '';
+            }
+            else
+            {
+                $herf = '../upload/'.$img;
+                $url = "<a href=$herf target='_blank'>保单查看</a>";
+                return $url;
+            }
+        });
         $grid->column('orderPatient.social_card_number', __('社保卡号'));
         $grid->column('order_status', __('订单状态'))->using([1=>'未支付',2=>'待接单',3=>'进行中',4=>'已完成',5=>'已取消']);
         $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);

+ 3 - 0
app/Models/DocterTimes.php

xqd
@@ -10,5 +10,8 @@ namespace App\Models;
 
 class DocterTimes extends BaseModel
 {
+  	public function docter(){
+        return $this->hasOne(Docter::class,'id','docter_id');
+    }
 
 }

+ 1 - 1
resources/views/cdms/schedule.blade.php

xqd
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>scheduling</title><link href="static/css/app.b0dfcc84.css" rel="preload" as="style"><link href="static/css/chunk-vendors.767f701c.css" rel="preload" as="style"><link href="static/js/app.6e846b17.js" rel="preload" as="script"><link href="static/js/chunk-vendors.feab90c7.js" rel="preload" as="script"><link href="static/css/chunk-vendors.767f701c.css" rel="stylesheet"><link href="static/css/app.b0dfcc84.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but scheduling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.feab90c7.js"></script><script src="static/js/app.6e846b17.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>scheduling</title><link href="static/css/app.b0dfcc84.css" rel="preload" as="style"><link href="static/css/chunk-vendors.767f701c.css" rel="preload" as="style"><link href="static/js/app.d9e22020.js" rel="preload" as="script"><link href="static/js/chunk-vendors.feab90c7.js" rel="preload" as="script"><link href="static/css/chunk-vendors.767f701c.css" rel="stylesheet"><link href="static/css/app.b0dfcc84.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but scheduling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.feab90c7.js"></script><script src="static/js/app.d9e22020.js"></script></body></html>