fnvtk/ckb-SuperAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

超管后台 - 新增多功能账号显示账号类型

Browse Source
This commit is contained in:
柳清爽
2025-04-25 15:15:56 +08:00
parent 561db965a1
commit 2e0efa227d
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Server/application/superadmin/controller/company/CreateCompanyController.php
View File

@@ -158,7 +158,7 @@ class CreateCompanyController extends BaseController
]; ];
foreach ($seedCols as $seeds) { 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)); $this->ckbCreateUser(array_merge($params, $seeds));
} }
} }
@@ -172,7 +172,7 @@ class CreateCompanyController extends BaseController
*/ */
protected function ckbCreateUser(array $params): void 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, [ $params = array_merge($params, [
'passwordLocal' => localEncrypt($params['password']), 'passwordLocal' => localEncrypt($params['password']),

16
SuperAdmin/app/dashboard/projects/[id]/edit/page.tsx
View File

@@ -275,20 +275,20 @@ export default function EditProjectPage({ params }: { params: { id: string } })
<table className="w-full table-fixed"> <table className="w-full table-fixed">
<thead className="bg-muted" style={{ fontFamily: "'Microsoft YaHei', sans-serif" }}> <thead className="bg-muted" style={{ fontFamily: "'Microsoft YaHei', sans-serif" }}>
<tr> <tr>
<th className="text-left p-2 w-[14%]">设备名称</th> <th className="text-left p-2 w-[12%]">设备名称</th>
<th className="text-left p-2 w-[14%]">IMEI</th> <th className="text-left p-2 w-[22%]">IMEI</th>
<th className="text-left p-2 w-[14%]">手机号</th> <th className="text-left p-2 w-[15%]">手机号</th>
<th className="text-left p-2 w-[14%]">型号</th> <th className="text-left p-2 w-[12%]">型号</th>
<th className="text-left p-2 w-[14%]">品牌</th> <th className="text-left p-2 w-[10%]">品牌</th>
<th className="text-left p-2 w-[14%]">状态</th> <th className="text-left p-2 w-[8%]">状态</th>
<th className="text-left p-2 w-[14%]">添加时间</th> <th className="text-left p-2 w-[13%]">添加时间</th>
</tr> </tr>
</thead> </thead>
<tbody className="text-sm" style={{ fontFamily: "'Microsoft YaHei', sans-serif" }}> <tbody className="text-sm" style={{ fontFamily: "'Microsoft YaHei', sans-serif" }}>
{project.devices.map((device) => ( {project.devices.map((device) => (
<tr key={device.id} className="border-t"> <tr key={device.id} className="border-t">
<td className="p-2 truncate" title={device.memo}>{device.memo}</td> <td className="p-2 truncate" title={device.memo}>{device.memo}</td>
<td className="p-2 truncate" title={device.imei || '-'}>{device.imei || '-'}</td> <td className="p-2" title={device.imei || '-'}>{device.imei || '-'}</td>
<td className="p-2 truncate" title={device.phone || '-'}>{device.phone || '-'}</td> <td className="p-2 truncate" title={device.phone || '-'}>{device.phone || '-'}</td>
<td className="p-2 truncate" title={device.model || '-'}>{device.model || '-'}</td> <td className="p-2 truncate" title={device.model || '-'}>{device.model || '-'}</td>
<td className="p-2 truncate" title={device.brand || '-'}>{device.brand || '-'}</td> <td className="p-2 truncate" title={device.brand || '-'}>{device.brand || '-'}</td>

8
SuperAdmin/app/dashboard/projects/[id]/page.tsx
View File

@@ -342,7 +342,13 @@ export default function ProjectDetailPage({ params }: ProjectDetailPageProps) {
{user.status === 1 ? "启用" : "禁用"} {user.status === 1 ? "启用" : "禁用"}
</Badge> </Badge>
</TableCell> </TableCell>
<TableCell>{user.typeId === 1 ? "操盘手" : "门店顾问"}</TableCell> <TableCell>
{user.typeId === -1
? "系统账号"
: user.typeId === 1
? "操盘手"
: "门店顾问"}
</TableCell>
<TableCell className="text-right">{user.createTime}</TableCell> <TableCell className="text-right">{user.createTime}</TableCell>
</TableRow> </TableRow>
))} ))}

8
SuperAdmin/components/projects/project-detail.tsx
View File

@@ -329,7 +329,13 @@ export default function ProjectDetail({ projectId, onEdit }: ProjectDetailProps)
{user.status === 1 ? "启用" : "禁用"} {user.status === 1 ? "启用" : "禁用"}
</Badge> </Badge>
</TableCell> </TableCell>
<TableCell>{user.typeId === 1 ? "操盘手" : "门店顾问"}</TableCell> <TableCell>
{user.typeId === -1
? "系统账号"
: user.typeId === 1
? "操盘手"
: "门店顾问"}
</TableCell>
<TableCell className="text-right">{user.createTime}</TableCell> <TableCell className="text-right">{user.createTime}</TableCell>
</TableRow> </TableRow>
))} ))}