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

修复扩展页面

This commit is contained in:
Chengliang 2022-11-16 09:18:19 +08:00
parent aa77770e09
commit 5cce357d78
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/organization/components/resource/ResourceCard.js
View File

@ -241,7 +241,7 @@ export default class ResourceCard extends React.Component {
{ {
data.buttons.slice(0,3).map((item,index) => { data.buttons.slice(0,3).map((item,index) => {
return ( return (
<Button className='item' onClick={() => { window.location.href = item.url.replaceAll("${id}",data.user.id)}}>{item.name}</Button> <Button className='item' onClick={() => { window.open(item.url.replaceAll("${id}",data.user.id),"_self")}}>{item.name}</Button>
) )
}) })
} }

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

@ -79,7 +79,8 @@ export class CompanyExtendStore {
editResource = () => { editResource = () => {
let pDatas = this.form.getFormParams(); let pDatas = this.form.getFormParams();
Api.editResource({ ...{ Api.editResource({ ...{
id: this.id id: this.id,
viewCondition:this.selectedKey
}, },
...pDatas, ...pDatas,
...this.getTableEditParams() ...this.getTableEditParams()
@ -119,6 +120,7 @@ export class CompanyExtendStore {
getData = () => { getData = () => {
this.setLoading(true); this.setLoading(true);
this.form = new WeaForm();
let params = { let params = {
viewAttr: this.isEditor ? 2 : 1, viewAttr: this.isEditor ? 2 : 1,
id: this.id, id: this.id,

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

@ -78,7 +78,8 @@ export class DepartmentExtendStore {
editResource = () => { editResource = () => {
let pDatas = this.form.getFormParams(); let pDatas = this.form.getFormParams();
Api.editResource({ ...{ Api.editResource({ ...{
id: this.id id: this.id,
viewCondition:this.selectedKey
}, },
...pDatas, ...pDatas,
...this.getTableEditParams() ...this.getTableEditParams()
@ -118,6 +119,7 @@ export class DepartmentExtendStore {
getData = () => { getData = () => {
this.setLoading(true); this.setLoading(true);
this.form = new WeaForm();
let params = { let params = {
viewAttr: this.isEditor ? 2 : 1, viewAttr: this.isEditor ? 2 : 1,
id: this.id, id: this.id,

6
pc4mobx/organization/stores/jobextend.js
View File

@ -81,7 +81,8 @@ export class JobExtendStore {
let pDatas = this.form.getFormParams(); let pDatas = this.form.getFormParams();
Api.editResource({ Api.editResource({
...{ ...{
id: this.id id: this.id,
viewCondition:this.selectedKey
}, },
...pDatas, ...pDatas,
...this.getTableEditParams() ...this.getTableEditParams()
@ -121,10 +122,11 @@ export class JobExtendStore {
getData = () => { getData = () => {
this.setLoading(true); this.setLoading(true);
this.form = new WeaForm();
let params = { let params = {
viewAttr: this.isEditor ? 2 : 1, viewAttr: this.isEditor ? 2 : 1,
id: this.id, id: this.id,
viewCondition: this.selectedKey viewCondition: this.selectedKey,
} }
Api.getJobExtendForm(params).then((res) => { Api.getJobExtendForm(params).then((res) => {
if (res.code === 200) { if (res.code === 200) {

7
pc4mobx/organization/stores/resourceExtend.js
View File

@ -78,14 +78,16 @@ export class ResourceExtendStore {
editResource = () => { editResource = () => {
let pDatas = this.form.getFormParams(); let pDatas = this.form.getFormParams();
Api.editResource({ ...{ Api.editResource({ ...{
id: this.id id: this.id,
viewCondition:this.selectedKey
}, },
...pDatas, ...pDatas,
...this.getTableEditParams() ...this.getTableEditParams()
}).then(data => { }).then(data => {
if (data.code == 200) { if (data.code == 200) {
message.success(i18n.message.saveSuccess()); message.success(i18n.message.saveSuccess());
window.location.href = `/spa/organization/static/index.html#/main/organization/resourceCard/${this.id}`; this.selectedKey = '0';
window.open(`/spa/organization/static/index.html#/main/organization/resourceCard/${this.id}`,"_self");
// this.init(); // this.init();
// this.getData(); // this.getData();
// this.selectedRowKeys = []; // this.selectedRowKeys = [];
@ -119,6 +121,7 @@ export class ResourceExtendStore {
getData = () => { getData = () => {
this.setLoading(true); this.setLoading(true);
this.form = new WeaForm()
let params = { let params = {
viewAttr: this.isEditor ? 2 : 1, viewAttr: this.isEditor ? 2 : 1,
id: this.id, id: this.id,