liutk
/
djc-new
generated from liutk/owl-admin-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整死亡户主信息保留

main
vine_liutk 2024-02-23 21:53:14 +08:00
parent f8f2425062
commit c4af14dbb0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Admin/Controllers/PersonController.php
View File

@ -288,7 +288,7 @@ class PersonController extends AdminController
'visibleOn' => '${is_master > 0}',
'size' => 15
])
->api(admin_url('persons?_action=getData&master[name]=${master.name}'))
->api(admin_url('persons?_action=getData&state=1&master[name]=${master.name}'))
->columns([
amis()->TableColumn('name', __('admin.persons.name'))->copyable(),
amis()->TableColumn('master_connect', __('admin.persons.master_connect')),
@ -572,7 +572,7 @@ class PersonController extends AdminController
amis()->TableColumn('idcard', __('admin.persons.idcard')),
amis()->TableColumn('master_connect', __('admin.persons.master_connect'))->width('60px'),
amis()->RadioControl('is_new_master', '新户主')->disabledOn('is_master'),
amis()->TextControl('new_master_connect', '新关系')->disabledOn('is_master'),
amis()->TextControl('new_master_connect', '新关系'),
])->required()
)->visibleOn('${is_master}'),
amis()->Divider(),

13
app/Services/Admin/PersonService.php
View File

@ -556,14 +556,17 @@ class PersonService extends BaseService
]);
}
}
Person::where('id', $person->id)->update([
$personUpdate = [[
'domicile_code' => '99999999',
'is_master' => 0,
'master_id' => null,
'master_connect' => null,
'state' => 2,
]);
]];
if(isset($oldNewMaster)){
$personUpdate['master_id'] = $oldNewMaster['id'];
$personUpdate['master_connect'] = $oldNewMaster['new_master_connect'];
}
Person::where('id', $person->id)->update($personUpdate);
count($personChangeLogs) > 0 && PersonChange::insert($personChangeLogs);