mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-15 17:19:31 +08:00
parent a694128c0c
commit fc59ecf522
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/user/UserLists.php
View File

@ -54,7 +54,9 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
->limit($this->limitOffset, $this->limitLength)
->field($field)
->order('id desc')
->select()->toArray();
->select()->each(function($data){
$data['sex_text'] = $data->sex_text;
})->toArray();
foreach ($lists as &$item) {
$item['channel'] = UserTerminalEnum::getTermInalDesc($item['channel']);
}

6
app/admin/validate/user/UserValidate.php
View File

@ -26,7 +26,7 @@ class UserValidate extends BaseValidate
'password' => 'require',
'mobile' => 'require|mobile',
'is_disable' => 'in:0,1',
'sex' => 'in:i,2',
'sex' => 'in:1,2',
'user_money' => 'float'
];
@ -56,7 +56,7 @@ class UserValidate extends BaseValidate
*/
public function sceneAdd()
{
return $this->only(['real_name','nickname','account','password','mobile']);
return $this->remove('id',true);
}
@ -68,7 +68,7 @@ class UserValidate extends BaseValidate
*/
public function sceneEdit()
{
return $this->only(['id','real_name','nickname','account','password','mobile'])->remove('password','require');
return $this->only(['id','avatar','real_name','nickname','account','password','mobile','is_disable','sex','user_money'])->remove('password','require');
}

6
app/api/lists/operation/OpurchaseGoodsOfferList.php
View File

@ -55,8 +55,10 @@ class OpurchaseGoodsOfferList extends BaseAdminDataLists implements ListsSearchI
->order(['id' => 'desc'])
->select()->each(function($data){
$data['is_adopt_text'] = $data->is_adopt_text;
$unit = Unit::where('id',$data['goods']['unit'])->findOrEmpty();
$data['goods']['unit_name'] = !$unit->isEmpty() ? $unit->name : '';
if(!empty($data['goods'])){
$unit = Unit::where('id',$data['goods']['unit'])->findOrEmpty();
$data['goods']['unit_name'] = !$unit->isEmpty() ? $unit['name'] : '';
}
})
->toArray();
}

4
app/common/model/user/User.php
View File

@ -120,9 +120,9 @@ class User extends BaseModel
* @author 乔峰
* @date 2022/9/7 15:15
*/
public function getSexAttr($value, $data)
public function getSexTextAttr($value, $data)
{
return UserEnum::getSexDesc($value);
return UserEnum::getSexDesc($data['sex']);
}