bug封版修复

pc4mobx/organization/components/NewAndEditDialog.js

@@ -108,6 +108,8 @@ export default class NewAndEditDialog extends React.Component {
                             {field.domkey[0] == 'comp_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
                             {field.domkey[0] == 'dept_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
                             {field.domkey[0] == 'job_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
+                            {field.domkey[0] == 'work_code' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
+                            
                         </WeaFormItem>
                     ),
                     colSpan: 1

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"
     };
 
   }

pc4mobx/organization/components/department/NewPopconfirm.js

@@ -92,7 +92,7 @@ export default class NewPopconfirm extends React.Component {
         } = this.props
 
         const buttons = [
-            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => save()} disabled={loading}>{i18n.button.ok()}</Button>),
+            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {save();this.setState({value:"0"})}} disabled={loading}>{i18n.button.ok()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {this.setState({value:"0"});onCancel()}} disabled={loading}>{i18n.button.cancel()}</Button>)
         ];
 

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();

pc4mobx/organization/components/resource/ResourceCard.js

@@ -248,39 +248,39 @@ export default class ResourceCard extends React.Component {
                             </div>
                             <div className='data'>
                                 <Row type="flex" justify="space-between" style={{ height: '100%' }}>
-                                    <Col className='ant-col' span={4}>
+                                    <Col className='ant-col' span={4} onClick={() => { window.open(`/spa/workflow/static/index.html#/main/workflow/listDoing?resourceid=${data.user.ecId}`)}}>
                                         <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.ecId}`) }}>{data.statistical.workflowCount}</p>
+                                            <p>{data.statistical.workflowCount}</p>
                                         </div>
                                     </Col>
-                                    <Col className='ant-col' span={4}>
+                                    <Col className='ant-col' span={4} onClick={() => { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.ecId}`)}}>
                                         <img src="/hrm/hrm_e9/image/doc.png" alt="" />
-                                        <div>
+                                        <div >
                                             <p>文档总数</p>
-                                            <p onClick={() => { window.open(`/spa/document/static/index.html#/main/document/search?viewcondition=2&doccreaterid=${data.user.ecId}`) }}>{data.statistical.docCount}</p>
+                                            <p>{data.statistical.docCount}</p>
                                         </div>
                                     </Col>
-                                    <Col className='ant-col' span={4}>
+                                    <Col className='ant-col' span={4} onClick={() => { window.open(`/spa/crm/static/index.html#/main/crm/customer/hrmView?searchHrmId=${data.user.ecId}`)}}>
                                         <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.ecId}`) }}>{data.statistical.cusCount}</p>
+                                            <p>{data.statistical.cusCount}</p>
                                         </div>
                                     </Col>
-                                    <Col className='ant-col' span={4}>
+                                    <Col className='ant-col' span={4} onClick={() => { window.open(`/spa/cowork/static/index.html#/main/cowork/hrmview?searchHrmid=${data.user.ecId}`) }}>
                                         <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.ecId}`) }}>{data.statistical.collaborationCount}</p>
+                                            <p>{data.statistical.collaborationCount}</p>
                                         </div>
                                     </Col>
-                                    <Col className='ant-col' span={4}>
+                                    <Col className='ant-col' span={4} onClick={() => { window.open(`/spa/blog/static/index.html#/user/${data.user.ecId}`) }}>
                                         <img src="/hrm/hrm_e9/image/weibo.png" alt="" />
                                         <div>
                                             <p>微博总数</p>
-                                            <p onClick={() => { window.open(`/spa/blog/static/index.html#/user/${data.user.ecId}`) }}>{data.statistical.weiboCount}</p>
+                                            <p>{data.statistical.weiboCount}</p>
                                         </div>
                                     </Col>
                                 </Row>

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;

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 => {

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) {

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;
             }
           }