Commit fc773c95 by lizhilin

更新

parent 78f7c207
...@@ -42,7 +42,7 @@ protected function grid() ...@@ -42,7 +42,7 @@ protected function grid()
// 按钮 // 按钮
->button('<button class="btn btn-primary"><i class="feather icon-plus"></i> 新增</button>') ->button('<button class="btn btn-primary"><i class="feather icon-plus"></i> 新增</button>')
// 弹窗内容 // 弹窗内容
->body(CovenantInvoiceForm::make()->payload(['id' => $cid]))); ->body(CovenantInvoiceForm::make()->payload(['cid' => $cid])));
}); });
} }
$grid->model()->where('lawyer_id', $lawyer_id)->where('rtype', 2)->orderBy("id", "desc"); $grid->model()->where('lawyer_id', $lawyer_id)->where('rtype', 2)->orderBy("id", "desc");
...@@ -59,8 +59,7 @@ protected function grid() ...@@ -59,8 +59,7 @@ protected function grid()
$principal = $number = ''; $principal = $number = '';
if ($cid) { if ($cid) {
$cobj = ModelsCovenant::find($cid); $cobj = ModelsCovenant::find($cid);
$pObj = ModelsPrincipal::find($cobj->principal_id); $principal = $cobj->principal;
$principal = $pObj->name;
$number = $cobj->number; $number = $cobj->number;
} }
$card_info = "&nbsp;&nbsp;合同编号:{$number}&nbsp;&nbsp;&nbsp;委托人:{$principal}"; $card_info = "&nbsp;&nbsp;合同编号:{$number}&nbsp;&nbsp;&nbsp;委托人:{$principal}";
......
...@@ -45,7 +45,7 @@ protected function grid() ...@@ -45,7 +45,7 @@ protected function grid()
// 按钮 // 按钮
->button('<button class="btn btn-primary"><i class="feather icon-plus"></i> 新增</button>') ->button('<button class="btn btn-primary"><i class="feather icon-plus"></i> 新增</button>')
// 弹窗内容 // 弹窗内容
->body(CovenantReceiveForm::make()->payload(['id' => $cid]))); ->body(CovenantReceiveForm::make()->payload(['cid' => $cid])));
} }
}); });
...@@ -70,8 +70,7 @@ protected function grid() ...@@ -70,8 +70,7 @@ protected function grid()
$invoiced_money = $received_money = $received_noinvoiced = $invoiced_noreceived = 0; $invoiced_money = $received_money = $received_noinvoiced = $invoiced_noreceived = 0;
if ($cid) { if ($cid) {
$cobj = ModelsCovenant::find($cid); $cobj = ModelsCovenant::find($cid);
$pObj = ModelsPrincipal::find($cobj->principal_id); $principal = $cobj->principal;
$principal = $pObj->name;
$cnumber = $cobj->number; $cnumber = $cobj->number;
$lobj = ModelsLawyer::find($cobj->lawyer_id); $lobj = ModelsLawyer::find($cobj->lawyer_id);
$lnumber = $lobj->number; $lnumber = $lobj->number;
......
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