Skip to content

L
lvsuo-pc
Commit 71524c25 by lizhilin
Options

更新

parent 06965fe7
Showing with 45 additions and 17 deletions
app/Admin/Actions/CovenantReturn.php
...@@ -27,7 +27,7 @@ public function __construct($title = '', $cid = 0) ...@@ -27,7 +27,7 @@ public function __construct($title = '', $cid = 0)
/** /**
* @return string * @return string
*/ */
protected $title = '<i class="feather icon-circle"> 已退还 </i>'; protected $title = '<i class="feather icon-circle"> 已退案 </i>';
/** /**
* 按钮文本 * 按钮文本
* *
...@@ -61,7 +61,7 @@ public function render() ...@@ -61,7 +61,7 @@ public function render()
// 这里直接创建一个modal框 model的内容由工具表单提供，这里也需要创建一个工具表单才行 // 这里直接创建一个modal框 model的内容由工具表单提供，这里也需要创建一个工具表单才行
return Modal::make() return Modal::make()
->lg() ->lg()
->title('已退还') ->title('已退案')
->button($this->title) ->button($this->title)
->body(CovenantReturnForm::make()->payload(['cid' => $this->cid])); ->body(CovenantReturnForm::make()->payload(['cid' => $this->cid]));
//->button("<button class='btn btn-sm btn-primary'>$this->title</button>"); // 这个button就是对应上面的按钮 //->button("<button class='btn btn-sm btn-primary'>$this->title</button>"); // 这个button就是对应上面的按钮
......
app/Admin/Controllers/CovenantController.php
...@@ -45,7 +45,7 @@ protected function grid() ...@@ -45,7 +45,7 @@ protected function grid()
return $val ? '已结案' : '未结案'; return $val ? '已结案' : '未结案';
}); });
$grid->column('is_return', '退还状态')->display(function ($val) { $grid->column('is_return', '退还状态')->display(function ($val) {
return $val ? '已退还' : '未退还'; return $val ? '已退案' : '未退案';
}); });
$grid->column('return_fee', '退还结案费'); $grid->column('return_fee', '退还结案费');
// $grid->column('created_at'); // $grid->column('created_at');
......
app/Admin/Controllers/LawyerCostController.php
...@@ -227,7 +227,7 @@ protected function form() ...@@ -227,7 +227,7 @@ protected function form()
$form->text('office_rental_fee')->readOnly(); $form->text('office_rental_fee')->readOnly();
$form->text('noticket_cost')->readOnly(); $form->text('noticket_cost')->readOnly();
$form->text('advance_fee')->readOnly(); $form->text('advance_fee')->readOnly();
$form->text('personal_income_tax')->readOnly(); $form->text('personal_income_tax')->required();
} else { } else {
$form->text('year')->default(date('Y'))->readOnly(); $form->text('year')->default(date('Y'))->readOnly();
$form->select('month')->options(ModelLawyerCost::MONTH)->readOnly(); $form->select('month')->options(ModelLawyerCost::MONTH)->readOnly();
...@@ -248,7 +248,7 @@ protected function form() ...@@ -248,7 +248,7 @@ protected function form()
$form->text('office_rental_fee')->required(); $form->text('office_rental_fee')->required();
$form->text('noticket_cost')->readOnly(); $form->text('noticket_cost')->readOnly();
$form->text('advance_fee'); $form->text('advance_fee');
$form->text('personal_income_tax')->required(); $form->text('personal_income_tax')->readOnly();
} }
$form->disableCreatingCheck(); $form->disableCreatingCheck();
......
app/Admin/Controllers/LawyerCostListController.php
...@@ -157,7 +157,7 @@ protected function form() ...@@ -157,7 +157,7 @@ protected function form()
$form->text('office_rental_fee')->readOnly(); $form->text('office_rental_fee')->readOnly();
$form->text('noticket_cost')->readOnly(); $form->text('noticket_cost')->readOnly();
$form->text('advance_fee')->readOnly(); $form->text('advance_fee')->readOnly();
$form->text('personal_income_tax')->readOnly(); $form->text('personal_income_tax')->required();
} else { } else {
$form->text('year')->default(date('Y'))->readOnly(); $form->text('year')->default(date('Y'))->readOnly();
//$form->select('month')->options(ModelLawyerCost::MONTH)->disable(); //$form->select('month')->options(ModelLawyerCost::MONTH)->disable();
...@@ -187,7 +187,7 @@ protected function form() ...@@ -187,7 +187,7 @@ protected function form()
$form->text('office_rental_fee')->required(); $form->text('office_rental_fee')->required();
$form->text('noticket_cost')->readOnly(); $form->text('noticket_cost')->readOnly();
$form->text('advance_fee'); $form->text('advance_fee');
$form->text('personal_income_tax')->required(); $form->text('personal_income_tax')->readOnly();
} }
$form->disableCreatingCheck(); $form->disableCreatingCheck();
$form->disableEditingCheck(); $form->disableEditingCheck();
......
app/Admin/Controllers/PrincipalController.php
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Dcat\Admin\Admin; use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Card;
class PrincipalController extends AdminController class PrincipalController extends AdminController
{ {
...@@ -22,23 +23,50 @@ class PrincipalController extends AdminController ...@@ -22,23 +23,50 @@ class PrincipalController extends AdminController
protected function grid() protected function grid()
{ {
return Grid::make(new Principal(), function (Grid $grid) { return Grid::make(new Principal(), function (Grid $grid) {
$ptype = $grid->model()->filter()->input('wtype') ?? 1; $ptype = $grid->model()->filter()->input('wtype') ?? 0;
$grid->model()->where('wtype', $ptype)->orderBy("id", "desc"); $where = $ptype ? ['wtype' => $ptype] : [];
$grid->model()->where($where)->orderBy("id", "desc");
//$grid->column('id')->sortable(); //$grid->column('id')->sortable();
$grid->column('number'); $grid->column('number');
if ($ptype == 1) { $grid->column('wtype', '类型')->display(function ($val) {
return $val == 1 ? '单位' : '个人';
})->width(50);
//if ($ptype == 1) {
$grid->column('company'); $grid->column('company');
$grid->column('tax_number'); $grid->column('tax_number');
$grid->column('address'); $grid->column('address');
$grid->column('tel'); $grid->column('tel');
$grid->column('bank_name'); $grid->column('bank_name', '开户银行');
$grid->column('bank_account'); $grid->column('bank_account')->width(90)->if(function ($column) {
$grid->column('contacts'); return $column->getValue();
} else { })->display('查看')->modal(function ($modal) {
$modal->title('开户账号');
$content = $this->bank_account;
$card = new Card(null, $content);
return "<div style='padding:10px 10px 0;width:100%;'>$card</div>";
})->else(function ($column) {
return '';
});
$grid->column('contacts')->width(90);
//} else {
$grid->column('name'); $grid->column('name');
$grid->column('identity_card'); //$grid->column('identity_card');
$grid->column('identity_card')->width(90)->if(function ($column) {
return $column->getValue();
})->display('查看')->modal(function ($modal) {
$modal->title('身份信息');
$content = $this->identity_card;
$card = new Card(null, $content);
return "<div style='padding:10px 10px 0;width:100%;'>$card</div>";
})->else(function ($column) {
return '';
});
$grid->column('address', '联系地址'); $grid->column('address', '联系地址');
} //}
$grid->column('phone'); $grid->column('phone');
// $grid->column('created_at'); // $grid->column('created_at');
// $grid->column('updated_at')->sortable(); // $grid->column('updated_at')->sortable();
...@@ -56,7 +84,7 @@ protected function grid() ...@@ -56,7 +84,7 @@ protected function grid()
$filter->like('tax_number')->width(3); $filter->like('tax_number')->width(3);
$filter->like('name')->width(3); $filter->like('name')->width(3);
$filter->like('identity_card')->width(3); $filter->like('identity_card')->width(3);
$filter->equal('wtype', '类型')->select([1 => '单位', 2 => '个人'])->width(3)->default(1); $filter->equal('wtype', '类型')->select([1 => '单位', 2 => '个人'])->width(3);
}); });
$grid->actions(function (Grid\Displayers\Actions $actions) { $grid->actions(function (Grid\Displayers\Actions $actions) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment