diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php index c6a1cd8a..2c623a4a 100644 --- a/Server/application/superadmin/controller/company/CreateCompanyController.php +++ b/Server/application/superadmin/controller/company/CreateCompanyController.php @@ -158,7 +158,7 @@ class CreateCompanyController extends BaseController ]; foreach ($seedCols as $seeds) { - $this->s2CreateUser(array_merge($params, ArrHelper::getValue('account,username', $seeds))); + $this->s2CreateUser (array_merge($params, ArrHelper::getValue('account,username', $seeds))); $this->ckbCreateUser(array_merge($params, $seeds)); } } @@ -172,7 +172,7 @@ class CreateCompanyController extends BaseController */ protected function ckbCreateUser(array $params): void { - $params = ArrHelper::getValue('username,account,password,companyId,s2_accountId,status,phone', $params); + $params = ArrHelper::getValue('username,account,password,companyId,s2_accountId,status,phone,isAdmin,typeId', $params); $params = array_merge($params, [ 'passwordLocal' => localEncrypt($params['password']), diff --git a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx index 88efa33a..b1413ab7 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx @@ -275,20 +275,20 @@ export default function EditProjectPage({ params }: { params: { id: string } }) - - - - - - - + + + + + + + {project.devices.map((device) => ( - + diff --git a/SuperAdmin/app/dashboard/projects/[id]/page.tsx b/SuperAdmin/app/dashboard/projects/[id]/page.tsx index d0ac9f7c..28470f1e 100644 --- a/SuperAdmin/app/dashboard/projects/[id]/page.tsx +++ b/SuperAdmin/app/dashboard/projects/[id]/page.tsx @@ -342,7 +342,13 @@ export default function ProjectDetailPage({ params }: ProjectDetailPageProps) { {user.status === 1 ? "启用" : "禁用"} - {user.typeId === 1 ? "操盘手" : "门店顾问"} + + {user.typeId === -1 + ? "系统账号" + : user.typeId === 1 + ? "操盘手" + : "门店顾问"} + {user.createTime} ))} diff --git a/SuperAdmin/components/projects/project-detail.tsx b/SuperAdmin/components/projects/project-detail.tsx index dc3d5b10..65444fe5 100644 --- a/SuperAdmin/components/projects/project-detail.tsx +++ b/SuperAdmin/components/projects/project-detail.tsx @@ -329,7 +329,13 @@ export default function ProjectDetail({ projectId, onEdit }: ProjectDetailProps) {user.status === 1 ? "启用" : "禁用"} - {user.typeId === 1 ? "操盘手" : "门店顾问"} + + {user.typeId === -1 + ? "系统账号" + : user.typeId === 1 + ? "操盘手" + : "门店顾问"} + {user.createTime} ))}
设备名称IMEI手机号型号品牌状态添加时间设备名称IMEI手机号型号品牌状态添加时间
{device.memo}{device.imei || '-'}{device.imei || '-'} {device.phone || '-'} {device.model || '-'} {device.brand || '-'}