Home Verkennen Help
Registreren Inloggen
swdz-WangHaijun
/
BaoMa
2
1
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

Swdz-WangHaiJun 4 jaren geleden
bovenliggende
d00e567026 4abde371b8
commit
63715cf55f
6 gewijzigde bestanden met toevoegingen van 92 en 57 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 51 0
      app/Admin/Actions/backstage/Notice/MassDistribution.php
  2. 4 0
      app/Admin/Controllers/CommunityNotice/CommunityNotices.php
  3. 1 0
      app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php
  4. 27 48
      app/Admin/Controllers/ServicePacksManagment/ServicePacksController.php
  5. 8 9
      app/Admin/Controllers/VaccinesManagement/VaccinesController.php
  6. 1 0
      app/Models/CommunityNotice.php

+ 51 - 0
app/Admin/Actions/backstage/Notice/MassDistribution.php
Bestand weergeven

xqd 
@@ -0,0 +1,51 @@
 
+<?php
 
+
 
+namespace App\Admin\Actions\backstage\Notice;
 
+
 
+use App\Models\CommunityNotice;
 
+use App\Models\Organization;
 
+use Encore\Admin\Actions\Action;
 
+use Encore\Admin\Form;
 
+use Illuminate\Http\Request;
 
+use Encore\Admin\Facades\Admin;
 
+
 
+class MassDistribution extends Action
 
+{
 
+    public $name = '群发社区通告';
 
+    protected $selector = '.mass-distribution';
 
+
 
+    public function handle(Request $request)
 
+    {
 
+        // $request ...
 
+        $title = request('title');
 
+        $organization_id = request('organization_id');
 
+        $type = request('type');
 
+        $content = request('content');
 
+        $admin_id = Admin::user()->id;
 
+        $arr = [
 
+            'title' =>$title,
 
+            'organization_id' =>0,
 
+            'type' =>$type,
 
+            'content' =>$content,
 
+            'admin_id' =>$admin_id,
 
+        ];
 
+        foreach ($organization_id as $value)
 
+        {
 
+            $arr['organization_id'] = $value;
 
+            CommunityNotice::create($arr);
 
+        }
 
+        return $this->response()->success('群发社区通告成功')->refresh();
 
+    }
 
+    public function form(){
 
+        $this->text('title','标题')->required();
 
+        $this->multipleSelect('organization_id','机构')->options(Organization::pluck('name','id')->toArray())->required();
 
+        $this->select('type','类型')->options([1=>'社区通告'])->required();
 
+        $this->textarea('content','内容')->required();
 
+    }
 
+    public function html()
 
+    {
 
+        return <<<HTML
 
+        <a class="btn btn-sm btn-default mass-distribution">群发社区通告</a>
 
+HTML;
 
+    }
 
+}

+ 4 - 0
app/Admin/Controllers/CommunityNotice/CommunityNotices.php
Bestand weergeven

xqd xqd 
@@ -2,6 +2,7 @@
 
 
 namespace App\Admin\Controllers\CommunityNotice;
 
 
+use App\Admin\Actions\backstage\Notice\MassDistribution;
 
 use App\Models\CommunityNotice;
 
 use App\Models\Organization;
 
 use Encore\Admin\Auth\Database\Administrator;
 
@@ -28,6 +29,9 @@ class CommunityNotices extends AdminController
 
     protected function grid()
 
     {
 
         $grid = new Grid(new CommunityNotice());
 
+        $grid->tools(function (Grid\Tools $tools) {
 
+            $tools->append(new MassDistribution());
 
+        });
 
         $grid->model()->orderBy('id','desc');
 
         $grid->column('id', __('Id'))->sortable();
 
         $grid->column('organization.name', __('发放社区'));

+ 1 - 0
app/Admin/Controllers/OrdersManagement/ServicePackOrderController.php
Bestand weergeven

xqd 
@@ -63,6 +63,7 @@ class ServicePackOrderController extends AdminController
 
         });
 
         $grid->model()->orderBy('id','desc');
 
         $grid->column('id', __('Id'))->sortable();
 
+        $grid->column('order_sn', __('订单编号'));
 
         $grid->column('user.nickname', __('用户姓名'));
 
         $grid->column('orderPatient.name', __('患者姓名'));
 
         $grid->column('orderPatient.patient_id', __('患者id'))->hide();

+ 27 - 48
app/Admin/Controllers/ServicePacksManagment/ServicePacksController.php
Bestand weergeven

xqd 
@@ -99,54 +99,33 @@ class ServicePacksController extends AdminController
 
         $form->radio('is_need_insure', __('服务包是否包含保险'))->options([
 
             0=>'否',
 
             1=>'是'
 
-        ])->rules('required',['required'=>'请选择是否包含保险']);;
 
-        $form->radio('has_team','是否包含团队')->options([
 
-           0=>'否',
 
-           1=>'是'
 
-        ])->when(0,function (Form $form){
 
-            $form->checkbox('label','服务类型')
 
-                ->options([
 
-                    1 => '图文',
 
-                    2 => '电话',
 
-                    3 => '门诊',
 
-                    4 => '计免',
 
-                    5 => '儿保'
 
-                ])->when('has',1,function (Form $form){
 
-                    $form->number('chat_num', __('图文次数'))->default(0);
 
-                })->when('has',2,function (Form $form){
 
-                    $form->number('phone_minutes', __('电话次数'))->default(0);
 
-                })->when('has',3,function (Form $form){
 
-                    $form->number('appoint_num', __('门诊次数'))->default(0);
 
-                })->when('has',4,function (Form $form){
 
-                    $form->number('vaccine_limit_amount', __('计免次数'))->default(0);
 
-                })->when('has',5,function (Form $form){
 
-                    //暂未完成，这里展示所有的自费的儿保项目
 
-                    $form->select('product', __('儿保项目'))->options(Nurse::where('type',2)->pluck('name','id'));
 
-                })->rules('required',['required'=>'请选择服务类型']);
 
-        })->when(1,function (Form $form)
 
-        {
 
-            $form->multipleSelect('team_id', __('团队选择'))->options(Team::all()->pluck('name','id'));
 
-            $form->checkbox('label','服务类型')
 
-                ->options([
 
-                    1 => '图文',
 
-                    2 => '电话',
 
-                    3 => '门诊',
 
-                    4 => '计免',
 
-                    5 => '儿保'
 
-                ])->when('has',1,function (Form $form){
 
-                    $form->number('chat_num', __('图文次数'))->default(0);
 
-                })->when('has',2,function (Form $form){
 
-                    $form->number('phone_minutes', __('电话次数'))->default(0);
 
-                })->when('has',3,function (Form $form){
 
-                    $form->number('appoint_num', __('门诊次数'))->default(0);
 
-                })->when('has',4,function (Form $form){
 
-                    $form->number('vaccine_limit_amount', __('计免次数'))->default(0);
 
-                })->when('has',5,function (Form $form){
 
-                    $form->select('product', __('儿保项目'))->options(Nurse::where('type',$form->team_id)->pluck('name','id'));
 
-                })->rules('required',['required'=>'请选择服务类型']);
 
-
 
-        })->rules('required',['required'=>'请选择是否包含团队']);;
 
-        $form->ignore('has_team');
 
+        ])->rules('required',['required'=>'请选择是否包含保险']);
 
+        $form->radio('is_need_team', __('是否包含团队'))->options([
 
+            0=>'否',
 
+            1=>'是'
 
+        ])->when(1,function (Form $form){
 
+            $form->multipleSelect('team_id', __('团队选择'))->options(Team::all()->pluck('name','id'))->rules('required',['required'=>'请选择团队']);;
 
+        })->rules('required',['required'=>'请选择是否包含团队']);
 
+        $form->checkbox('label','服务类型')
 
+            ->options([
 
+                1 => '图文',
 
+                2 => '电话',
 
+                3 => '门诊',
 
+                4 => '计免',
 
+                5 => '儿保'
 
+            ])->when('has',1,function (Form $form){
 
+                $form->number('chat_num', __('图文次数'))->default(0);
 
+            })->when('has',2,function (Form $form){
 
+                $form->number('phone_minutes', __('电话次数'))->default(0);
 
+            })->when('has',3,function (Form $form){
 
+                $form->number('appoint_num', __('门诊次数'))->default(0);
 
+            })->when('has',4,function (Form $form){
 
+                $form->number('vaccine_limit_amount', __('儿保金额'))->default(0);
 
+            })->when('has',5,function (Form $form){
 
+                //暂未完成，这里展示所有的自费的儿保项目
 
+                $form->number('nurses_limit_amount', __('计免金额'))->default(0);
 
+//                $form->select('product', __('儿保项目'))->options(Nurse::where('type',2)->pluck('name','id'));
 
+            })->rules('required',['required'=>'请选择服务类型']);
 
         $form->text('effective_days', __('服务时长（天）'))->default(0);
 
         $form->saving(function (Form $form){
 
             $form->price = $form->price*100;

+ 8 - 9
app/Admin/Controllers/VaccinesManagement/VaccinesController.php
Bestand weergeven

xqd xqd xqd xqd 
@@ -54,7 +54,6 @@ class VaccinesController extends AdminController
 
         });
 
 
         $grid->column('kc','库存');
 
-        $grid->column('states','状态')->switch($states);
 
         $grid->column('updated_at', __('更新时间'));
 
 
         $grid->filter(function($filter){
 
@@ -66,10 +65,10 @@ class VaccinesController extends AdminController
 
             // 在这里添加字段过滤器
 
             $filter->column(1/2, function ($filter) {
 
                 $filter->equal('type', '类型')->select(Vaccines::$_post_type);
 
-                $filter->equal('supplier','厂家');
 
+//                $filter->equal('supplier','厂家');
 
             });
 
             $filter->column(1/2, function ($filter) {
 
-               $filter->equal('name','疫苗名称');
 
+               $filter->like('name','疫苗名称');
 
                 $filter->equal('organizationvaccines.org_id','机构')->select(Organization::pluck('name','id'));
 
             });
 
         });
 
@@ -82,7 +81,7 @@ class VaccinesController extends AdminController
 
                     ->orwhere('supplier','like',"%{$query}%")
 
                     ->orwhere('remark','like',"{$query}");
 
             //});
 
-        })->placeholder('请输入疫苗id/名称/厂家/备注');
 
+        })->placeholder('请输入疫苗id/名称');
 
 
         $grid->export(function ($export) {
 
             //文件名
 
@@ -140,11 +139,11 @@ class VaccinesController extends AdminController
 
 //        $form->text('price', __('价格'));
 
 //        $form->text('remark', __('备注'));
 
 //        $form->text('supplier', __('厂家'))->rules('required',['required'=>'请填写厂家！']);
 
-        $states = [
 
-            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
 
-            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
 
-        ];
 
-        $form->switch('states','状态')->states($states)->default(1);
 
+//        $states = [
 
+//            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
 
+//            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
 
+//        ];
 
+//        $form->switch('states','状态')->states($states)->default(1);
 
         $form->saving(function ($f){
 
             $f->price *=100;
 
         });

+ 1 - 0
app/Models/CommunityNotice.php
Bestand weergeven

xqd 
@@ -8,6 +8,7 @@ class CommunityNotice extends Model
 
 {
 
     //
 
     protected $table = 'community_notice';
 
+    protected $fillable = ['title','organization_id','type','content','admin_id'];
 
     public function organization(){
 
         return $this->hasOne(Organization::class,'id','organization_id');
 
     }