Browse Source

🐞 fix(修改bug): 修改bug

修改bug

修改bug
tags/小炒逻辑变更前
txb 2 years ago
parent
commit
e0506a6b8b
4 changed files with 13 additions and 28 deletions
  1. +10
    -7
      src/pages/sys/roles/index.jsx
  2. +1
    -1
      src/pages/sys/roles/service.js
  3. +1
    -19
      src/pages/sys/sysSettings/components/EnterpriseLog.jsx
  4. +1
    -1
      src/pages/sys/user/components/CreateForm.jsx

+ 10
- 7
src/pages/sys/roles/index.jsx View File

@@ -55,13 +55,14 @@ const handleUpdate = async (fields) => {
* 删除节点
* @param selectedRows
*/
const handleRemove = async (selectedRows) => {
const handleRemove = async (record) => {
const hide = message.loading('正在删除');
if (!selectedRows) return true;
if (!record) return true;
try {
await removeRole(selectedRows.map((row) => row.id));
await removeRole([record.id]).then(r => {
message.success(r.data);
})
hide();
message.success('删除成功,即将刷新');
return true;
} catch (error) {
hide();
@@ -160,9 +161,11 @@ const roleManager = () => {
disabled={record.code == 'sys_manager_role'}
style={{ pointerEvents: record.code == 'sys_manager_role' ? 'none' : 'auto' }}
onClick={() => {
removeRole([record.id]).then(r => {
actionRef.current.reload();
})
handleRemove(record);
// removeRole([record.id]).then(r => {
// message.success(r);
// actionRef.current.reload();
// })
}}
>
删除


+ 1
- 1
src/pages/sys/roles/service.js View File

@@ -28,7 +28,7 @@ export async function add(params) {
}
//修改
export async function edit(params) {
return request('/kitchen/api/role/update', {
return request('/kitchen/api/role/update', {
method: 'POST',
data: {
...params,


+ 1
- 19
src/pages/sys/sysSettings/components/EnterpriseLog.jsx View File

@@ -88,31 +88,13 @@ const EnterpriseLog = () => {
};
},
};

const getAvatarURL = () => {
if (CompanyInfo) {
if (CompanyInfo.logo) {
console.log(url);
setUrl(CompanyInfo.logo);
return CompanyInfo.logo;
}
setUrl('https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png');
const url1 = 'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png';

return url1;
}
setUrl('');
return '';
};

return (
<div className={styles.baseView}>
{loading ? null : (
<>
<div className={styles.right}>
<AvatarView
avatar={getAvatarURL}
url={url ? url : CompanyInfo.logo}
url={CompanyInfo.logo ? CompanyInfo.logo:'https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png' }
uploadProp={uploadProps}
/>
</div>


+ 1
- 1
src/pages/sys/user/components/CreateForm.jsx View File

@@ -40,7 +40,7 @@ const CreateForm = (props) => {
<Input />
</Form.Item>
<Form.Item name="account" label="用户账户" rules={[{ required: true, max: 255 }]}>
<Input placeholder="请输入用户账户" />
<Input placeholder="请输入用户账户" disabled={props.values.id?true:false} />
</Form.Item>
<Form.Item name="name" label="用户姓名" rules={[{ required: true, max: 255 }]}>
<Input placeholder="请输入用户姓名" />


Loading…
Cancel
Save