diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js index ef92d79..2aba860 100644 --- a/pc4mobx/organization/components/NewAndEditDialog.js +++ b/pc4mobx/organization/components/NewAndEditDialog.js @@ -108,6 +108,8 @@ export default class NewAndEditDialog extends React.Component { {field.domkey[0] == 'comp_no' && field.viewAttr != '1' && } {field.domkey[0] == 'dept_no' && field.viewAttr != '1' && } {field.domkey[0] == 'job_no' && field.viewAttr != '1' && } + {field.domkey[0] == 'work_code' && field.viewAttr != '1' && } + ), colSpan: 1 diff --git a/pc4mobx/organization/components/NewNumberField.js b/pc4mobx/organization/components/NewNumberField.js index 91724ff..2d2cb08 100644 --- a/pc4mobx/organization/components/NewNumberField.js +++ b/pc4mobx/organization/components/NewNumberField.js @@ -32,7 +32,7 @@ export default class AttachToNumberField extends PureComponent { comp_no: "SUBCOMPANY", dept_no: "DEPARTMENT", job_no: "JOBTITLES", - workcode: "USER" + work_code: "USER" }; } diff --git a/pc4mobx/organization/components/department/NewPopconfirm.js b/pc4mobx/organization/components/department/NewPopconfirm.js index 43752a5..8a1eb31 100644 --- a/pc4mobx/organization/components/department/NewPopconfirm.js +++ b/pc4mobx/organization/components/department/NewPopconfirm.js @@ -92,7 +92,7 @@ export default class NewPopconfirm extends React.Component { } = this.props const buttons = [ - (), + (), () ]; diff --git a/pc4mobx/organization/components/resource/ResourceBasicInfo.js b/pc4mobx/organization/components/resource/ResourceBasicInfo.js index 7d62222..eb9fb07 100644 --- a/pc4mobx/organization/components/resource/ResourceBasicInfo.js +++ b/pc4mobx/organization/components/resource/ResourceBasicInfo.js @@ -137,8 +137,8 @@ export default class ResourceBasicInfo extends React.Component { const { resourceBasicInfo } = this.props; - resourceBasicInfo.setNeDialogTitle(i18n.label.newResourceBasicType()); + resourceBasicInfo.setIsNew(true); resourceBasicInfo.setVisible(true); resourceBasicInfo.setOperateType("2") resourceBasicInfo.getTypeForm(); @@ -148,8 +148,8 @@ export default class ResourceBasicInfo extends React.Component { const { resourceBasicInfo } = this.props; - resourceBasicInfo.setNeDialogTitle(i18n.label.editResourceBasicType()); + resourceBasicInfo.setIsNew(false); resourceBasicInfo.setVisible(true); resourceBasicInfo.setOperateType("4") resourceBasicInfo.getTypeForm(); diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js index ad4aecf..ca6bfe9 100644 --- a/pc4mobx/organization/components/resource/ResourceCard.js +++ b/pc4mobx/organization/components/resource/ResourceCard.js @@ -248,39 +248,39 @@ export default class ResourceCard extends React.Component {
- + { window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.ecId}`)}}>

流程总数

-

{ window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.ecId}`) }}>{data.statistical.workflowCount}

+

{data.statistical.workflowCount}

- + { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.ecId}`)}}> -
+

文档总数

-

{ window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.ecId}`) }}>{data.statistical.docCount}

+

{data.statistical.docCount}

- + { window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.ecId}`)}}>

我的客户

-

{ window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.ecId}`) }}>{data.statistical.cusCount}

+

{data.statistical.cusCount}

- + { window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.ecId}`) }}>

我的协作

-

{ window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.ecId}`) }}>{data.statistical.collaborationCount}

+

{data.statistical.collaborationCount}

- + { window.open(`/spa/blog/static/index.html#/user/${data.user.ecId}`) }}>

微博总数

-

{ window.open(`/spa/blog/static/index.html#/user/${data.user.ecId}`) }}>{data.statistical.weiboCount}

+

{data.statistical.weiboCount}

diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js index 627b8e6..646370a 100644 --- a/pc4mobx/organization/components/resource/resource.js +++ b/pc4mobx/organization/components/resource/resource.js @@ -395,7 +395,6 @@ export default class Resource extends React.Component { } - // 非空判断 isEmptyObject(obj) { for (let key in obj) { return false; diff --git a/pc4mobx/organization/stores/officeManage.js b/pc4mobx/organization/stores/officeManage.js index f880029..32bf8d7 100644 --- a/pc4mobx/organization/stores/officeManage.js +++ b/pc4mobx/organization/stores/officeManage.js @@ -28,7 +28,6 @@ export class OfficeManageStore { @observable officeVisible = {}; @observable visible = false; @observable dialogLoading = false; - @observable schemeId = ""; @observable date = ""; @observable hasRight = ''; @@ -87,14 +86,12 @@ export class OfficeManageStore { const {current} = this.tableStore; if (_.isEmpty(this.form2.getFormParams())) { params = { - ...this.form2.getFormParams(), postId, postInfoName: this.postInfoName }; } else { params = { ...this.form2.getFormParams(), - postId }; } API.getPostInfoTable(params).then(res => { diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js index e99ba24..90c45af 100644 --- a/pc4mobx/organization/stores/resource.js +++ b/pc4mobx/organization/stores/resource.js @@ -43,7 +43,7 @@ const { @observable nEdialogTitle = ''; @observable visible = false; @observable dialogLoading = true; - @observable schemeId = ''; + @observable userId = ''; @observable date = ''; @observable defaultShowLeft = true; @@ -111,7 +111,7 @@ const { getForm() { let params = this.isNew ? {} : { - id: this.schemeId + id: this.userId } this.setDialogLoadingStatus(true); @@ -241,8 +241,8 @@ const { this.condition = condition; } - setSchemeId(schemeId) { - this.schemeId = schemeId; + setUserId(userId) { + this.userId = userId; } setDate(date) { diff --git a/pc4mobx/organization/style/card.less b/pc4mobx/organization/style/card.less index 4a0d3ce..564a2e7 100644 --- a/pc4mobx/organization/style/card.less +++ b/pc4mobx/organization/style/card.less @@ -82,6 +82,7 @@ -moz-box-shadow: #eeeeee 0px 0px 10px; box-shadow: #eeeeee 0px 0px 10px; padding: 0 10px; + cursor: pointer; img{ margin-top: 20px } @@ -96,7 +97,6 @@ float: right; font-weight: 800; font-size: 16px; - cursor: pointer; } }