generated from liutk/owl-admin-base
修改人口新增bug
parent
c1cc36d27a
commit
764ce7b300
|
|
@ -51,6 +51,14 @@ class PersonController extends AdminController
|
||||||
amis()->DateRangeControl()->label(__('admin.persons.birthday'))->name('birthday')->valueFormat('YYYY-MM-DD')->columnRatio(6),
|
amis()->DateRangeControl()->label(__('admin.persons.birthday'))->name('birthday')->valueFormat('YYYY-MM-DD')->columnRatio(6),
|
||||||
]),
|
]),
|
||||||
]))
|
]))
|
||||||
|
->itemBadge([//行角标
|
||||||
|
'text' => __('admin.persons.master'),
|
||||||
|
'mode' => 'ribbon',
|
||||||
|
'position' => 'top-left',
|
||||||
|
'badgeLevel' => 'danger',
|
||||||
|
'visibleOn' => '${is_master > 0}',
|
||||||
|
'size' => 15
|
||||||
|
])
|
||||||
->columns([
|
->columns([
|
||||||
amis()->TableColumn('domicile_code', __('admin.persons.domicile_code'))->width('100px'),
|
amis()->TableColumn('domicile_code', __('admin.persons.domicile_code'))->width('100px'),
|
||||||
amis()->TableColumn('name', __('admin.persons.name'))->width('100px')->copyable()->searchable(),
|
amis()->TableColumn('name', __('admin.persons.name'))->width('100px')->copyable()->searchable(),
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,14 @@ class Person extends Model
|
||||||
protected static function boot()
|
protected static function boot()
|
||||||
{
|
{
|
||||||
parent::boot();
|
parent::boot();
|
||||||
// 监听 oldman 的创建事件,用于初始化 位置信息
|
// 监听 人口 的创建事件,用于初始化 位置信息
|
||||||
|
static::created(function ($person) {
|
||||||
|
if(empty($person->master_id) && $person->master_connect){
|
||||||
|
$person->master_id = $person->id;
|
||||||
|
$person->is_master = 1;
|
||||||
|
$person->save();
|
||||||
|
}
|
||||||
|
});
|
||||||
static::saving(function ($person) {
|
static::saving(function ($person) {
|
||||||
if($person->origin_city_code){
|
if($person->origin_city_code){
|
||||||
list($originProvince, $originCity, $originArea) = Zone::codeToZone($person->origin_city_code);
|
list($originProvince, $originCity, $originArea) = Zone::codeToZone($person->origin_city_code);
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,11 @@ class PersonService extends BaseService
|
||||||
|
|
||||||
$data['avatar'] = $this->saveImage('avatar', 'persons/avatar')[0] ?? '';
|
$data['avatar'] = $this->saveImage('avatar', 'persons/avatar')[0] ?? '';
|
||||||
|
|
||||||
|
if(isset($data['master'])){
|
||||||
|
$data['master_id'] = $data['master'];
|
||||||
|
unset($data['master']);
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($data as $k => $v) {
|
foreach ($data as $k => $v) {
|
||||||
if (!in_array($k, $columns)) {
|
if (!in_array($k, $columns)) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue