Swdz-WangHaiJun hace 4 años
padre
commit
68a17530e9

+ 10 - 2
app/Admin/Controllers/VaccinesManagement/VaccinesController.php

xqd xqd xqd
@@ -33,7 +33,9 @@ class VaccinesController extends AdminController
         $grid->column('type', '类型')->using([1=>'Ⅰ类疫苗',2=>'Ⅱ类疫苗']);
         $grid->column('name', __('名称'));
 //        $grid->column('introduction','简介');
-        $grid->column('price', __('价钱'));
+        $grid->column('price', __('价钱'))->display(function ($v){
+            return round($v/100,4).'元';
+        });
         $grid->column('remark', __('备注'));
         $grid->column('supplier', __('厂家'));
         $states = [
@@ -135,10 +137,13 @@ class VaccinesController extends AdminController
     {
         $form = new Form(new Vaccines());
 
+        $form->editing(function ($f){
+            $f->model()->price /= 100;
+        });
         $form->select('type', __('分类'))->options(Vaccines::$_post_type)->default('1');
         $form->text('name', __('名称'))->rules('required|min:3|max:255',['required'=>'请填写名称','min'=>'名称不能少于3个字符!','max'=>'名称长度过长!']);
 //        $form->text('introduction','简介')->rules('required',['require'=>'请填写疫苗简介!' ]);
-        $form->currency('price', __('价格'))->symbol('分');
+        $form->text('price', __('价格'));
         $form->text('remark', __('备注'))->rules('required',['required'=>'请填写备注!']);;
         $form->text('supplier', __('厂家'))->rules('required',['required'=>'请填写厂家!']);
         $form->number('stock','库存');
@@ -147,6 +152,9 @@ class VaccinesController extends AdminController
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
         ];
         $form->switch('states','状态')->states($states);
+        $form->saving(function ($f){
+            $f->price *=100;
+        });
 
         return $form;
     }

+ 9 - 0
app/Community/Controllers/Vaccine/OrganizationVaccineController.php

xqd xqd
@@ -35,6 +35,13 @@ class OrganizationVaccineController extends AdminController
         }
         $grid->disableCreateButton(false);
 
+
+        $grid->filter(function ($fliter){
+            $fliter->equal('organization.name','机构')->select(Organization::pluck('name','id'));
+            $fliter->euqal('vaccine.name','疫苗')->select(Vaccine::pluck('name','id'));
+        });
+
+
         $grid->column('id', __('Id'));
         $grid->column('organization.name', __('机构'));
         $grid->column('vaccine.name', __('疫苗'));
@@ -91,6 +98,8 @@ class OrganizationVaccineController extends AdminController
             $form->hidden('org_id')->value(Admin::user()->org_id);
         }
         $form->text('stock', __('库存'))->rules('required',['required'=>'请输入库存']);
+        $form->datetime('updated_at', __('更新时间'));
+        $form->datetime('created_at', __('创建时间'));
 
         return $form;
     }

+ 13 - 4
app/Community/Controllers/VaccineController.php

xqd xqd
@@ -49,13 +49,16 @@ class VaccineController extends AdminController
                 $query->where('vaccine_id',$this->id);
             })->count();
         });;
-        $grid->column('price', __('价格'))->editable();
+        $grid->column('price', __('价格'))->display(function ($v){
+            return round($v/100,4).'元';
+        })->editable();
         $grid->column('remark', __('备注'))->editable('textarea');
         $grid->column('supplier', __('厂家'));
 //        $grid->column('created_at', __('Created at'));
 //        $grid->column('updated_at', __('Updated at'));
         $grid->filter(function ($fliter){
             $fliter->equal('type','类别')->select([1=>'一类',2=>'二类']);
+            $fliter->like('name','疫苗');
         });
         $grid->actions(function ($actions) {
 
@@ -104,13 +107,19 @@ class VaccineController extends AdminController
         if($org_id){
             $orglist = Organization::where(['id'=>$org_id])->pluck('name','id');
         }
+        $form->editing(function ($f){
+            $f->model()->price /= 100;
+        });
         $form->select('type', __('类型'))->options([1=>'一类',2=>'二类'])->default(1);
-        $form->select('org_id','机构')->options($orglist)->rules('required',['requried'=>'请选择机构']);
+//        $form->select('org_id','机构')->options($orglist)->rules('required',['requried'=>'请选择机构']);
         $form->text('name', __('疫苗名称'))->rules('required',['requried'=>'请填写疫苗名称']);
         $form->text('supplier', __('厂家'))->rules('required',['requried'=>'请填写厂家信息']);
-        $form->number('price', __('价格'))->rules('required',['requried'=>'请填写价格']);
-        $form->number('stock', __('库存'))->rules('required',['requried'=>'请填写库存']);
+        $form->text('price', __('价格'))->rules('required',['requried'=>'请填写价格']);
+//        $form->text('stock', __('库存'))->rules('required',['requried'=>'请填写库存']);
         $form->textarea('remark', __('备注'));
+        $form->saving(function ($form){
+           $form->price = $form->price*100;
+        });
 
         return $form;
     }