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

Merge pull request 'bug修复' (#9) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/9
This commit is contained in:
liang.cheng 2022-10-24 19:29:17 +08:00
parent f4b11171b1 4d79c64bcd
commit 291015e859
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,35 +252,35 @@ export default class ResourceCard extends React.Component {
<img src="/hrm/hrm_e9/image/workflow.png" alt="" />
<div>
<p>流程总数</p>
<p onClick={() => { window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.id}`) }}>{data.statistical.workflowCount}</p>
<p onClick={() => { window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.ecId}`) }}>{data.statistical.workflowCount}</p>
</div>
</Col>
<Col className='ant-col' span={4}>
<img src="/hrm/hrm_e9/image/doc.png" alt="" />
<div>
<p>文档总数</p>
<p onClick={() => { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.id}`) }}>{data.statistical.docCount}</p>
<p onClick={() => { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.ecId}`) }}>{data.statistical.docCount}</p>
</div>
</Col>
<Col className='ant-col' span={4}>
<img src="/hrm/hrm_e9/image/custom.png" alt="" />
<div>
<p>我的客户</p>
<p onClick={() => { window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.id}`) }}>{data.statistical.cusCount}</p>
<p onClick={() => { window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.ecId}`) }}>{data.statistical.cusCount}</p>
</div>
</Col>
<Col className='ant-col' span={4}>
<img src="/hrm/hrm_e9/image/cowork.png" alt="" />
<div>
<p>我的协作</p>
<p onClick={() => { window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.id}`) }}>{data.statistical.collaborationCount}</p>
<p onClick={() => { window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.ecId}`) }}>{data.statistical.collaborationCount}</p>
</div>
</Col>
<Col className='ant-col' span={4}>
<img src="/hrm/hrm_e9/image/weibo.png" alt="" />
<div>
<p>微博总数</p>
<p onClick={() => { window.open(`/spa/blog/static/index.html#/user/${data.user.id}`) }}>{data.statistical.weiboCount}</p>
<p onClick={() => { window.open(`/spa/blog/static/index.html#/user/${data.user.ecId}`) }}>{data.statistical.weiboCount}</p>
</div>
</Col>
</Row>

2
pc4mobx/organization/stores/newImport.js
View File

@ -212,7 +212,7 @@ export class NewImportStore {
this.pvisable = true;
//导入文件提交
let params = {
keyField:this.keyField,
//keyField:this.keyField,
importType:this.importType,
operateType:this.operateType,
excelfile:this.excelfile,

2
pc4mobx/organization/stores/resource.js
View File

@ -59,7 +59,6 @@ const {
if (this.isEmptyObject(this.form2.getFormParams())) {
params = {
...this.selectTreeNodeInfo,
...this.form2.getFormParams(),
lastName: this.lastName
};
} else {
@ -70,7 +69,6 @@ const {
}
Api.getSearchList(params).then(res => {
if (res.code === 200) {
//this.setHasRight(res.data.hasRight);
res.data.datas && this.tableStore.getDatas(res.data.datas, 1);
} else {
message.warning(res.msg);