liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '页面优化需求' (#39) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/39
This commit is contained in:
liang.cheng 2023-07-26 19:11:43 +08:00
parent e37bc680bd 957c4d4774
commit 44d85c5497
5 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pc4mobx/organization/components/company/CompanyExtend.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 14:52:39
* @LastEditTime: 2022-12-16 17:48:54
* @LastEditTime: 2023-07-26 18:59:02
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
*/
@ -180,14 +180,15 @@ export default class CompanyExtend extends React.Component {
onClick: key => {
this.editCard();
}
}, {
icon: <i className='icon-coms-common' />,
content: i18n.button.version(),
key: 'view',
onClick: key => {
this.view();
}
}
//, {
// icon: <i className='icon-coms-common' />,
// content: i18n.button.version(),
// key: 'view',
// onClick: key => {
// this.view();
// }
// }
]
}
}
@ -212,7 +213,7 @@ export default class CompanyExtend extends React.Component {
} else {
if (buttons.hasEdit) {
btns.push(edit);
btns.push(view);
//btns.push(view);
}
}
} catch (e) { }

6
pc4mobx/organization/components/company/company.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 16:23:32
* @LastEditTime: 2022-12-16 17:17:45
* @LastEditTime: 2023-07-26 18:41:11
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
*/
@ -366,9 +366,9 @@ export default class Company extends React.Component {
<Menu.Item key="4">
<a href='javascript:void(0);' onClick={() => { _this.transfer(record.id) }}>转移</a>
</Menu.Item>
<Menu.Item key="5">
{/* <Menu.Item key="5">
<a href='javascript:void(0);' onClick={() => { _this.version(record) }}>另存为版本</a>
</Menu.Item>
</Menu.Item> */}
</Menu>
)
return <Dropdown overlay={menu}>

6
pc4mobx/organization/components/department/department.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-12-16 17:47:38
* @LastEditTime: 2023-07-26 18:46:24
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/
@ -401,9 +401,9 @@ export default class Department extends React.Component {
<Menu.Item key="5">
<a href='javascript:void(0);' onClick={() => { _this.copy(record.id) }}>复制</a>
</Menu.Item>
<Menu.Item key="6">
{/* <Menu.Item key="6">
<a href='javascript:void(0);' onClick={() => { _this.version(record) }}>另存为版本</a>
</Menu.Item>
</Menu.Item> */}
</Menu>
)
return <Dropdown overlay={menu}>

19
pc4mobx/organization/components/department/departmentExtend.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:20:03
* @LastEditTime: 2022-12-16 16:35:02
* @LastEditTime: 2023-07-26 18:59:14
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
*/
@ -190,14 +190,15 @@ export default class DepartmentExtendStore extends React.Component {
onClick: key => {
this.editCard();
}
}, {
icon: <i className='icon-coms-common' />,
content: i18n.button.version(),
key: 'view',
onClick: key => {
this.view();
}
}
// , {
// icon: <i className='icon-coms-common' />,
// content: i18n.button.version(),
// key: 'view',
// onClick: key => {
// this.view();
// }
// }
]
}
}
@ -223,7 +224,7 @@ export default class DepartmentExtendStore extends React.Component {
} else {
if (buttons.hasEdit) {
btns.push(edit);
btns.push(view);
//btns.push(view);
}
}
} catch (e) { }

4
pc4mobx/organization/stores/job.js
View File

@ -69,8 +69,8 @@ export class JobStore {
saveAndSetting = false;
@action initData() {
this.getTableInfo();
this.getHasRight();
this.refresh();
// this.getCopyForm();
// this.getMergeForm();
}
@ -159,7 +159,7 @@ export class JobStore {
Api.refresh().then(res => {
if (res.code === 200) {
this.getTableInfo();
message.success(res.msg);
message.success("数据刷新成功");
} else {
message.warning(res.msg);
}