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

xiu fu

This commit is contained in:
Chengliang 2022-12-16 18:53:54 +08:00
parent 72263eb5f7
commit 39da6bcd15
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/organization/components/NewAndEditDialog.js
View File

@ -103,8 +103,8 @@ export default class NewAndEditDialog extends React.Component {
> >
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@5r6c5a@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} onChange={this.onChange} <WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@5r6c5a@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} onChange={this.onChange}
onBlur={this.onBlur} /> onBlur={this.onBlur} />
{field.domkey[0] == 'subcompanycode' && field.viewAttr != 1 && <AttachToNumberField field={field} form={form} isEdit={true}/>} {field.domkey[0] == 'subcompanycode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
{field.domkey[0] == 'departmentcode' && field.viewAttr != 1 && <AttachToNumberField field={field} form={form} isEdit={true}/>} {field.domkey[0] == 'departmentcode' && 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] == '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}/>} */} {field.domkey[0] == 'work_code' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>} */}

2
pc4mobx/organization/components/NewNumberField.js
View File

@ -31,7 +31,7 @@ export default class AttachToNumberField extends PureComponent {
this.typeMap = { this.typeMap = {
subcompanycode: "SUBCOMPANY", subcompanycode: "SUBCOMPANY",
departmentcode: "DEPARTMENT", departmentcode: "DEPARTMENT",
// job_no: "JOBTITLES", job_no: "JOBTITLES",
// work_code: "USER" // work_code: "USER"
}; };

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

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-05-18 14:52:39 * @Date: 2022-05-18 14:52:39
* @LastEditTime: 2022-12-15 19:29:14 * @LastEditTime: 2022-12-16 17:48:54
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
*/ */
@ -129,7 +129,7 @@ export default class CompanyExtend extends React.Component {
labelCol={{ span: `${field.labelcol}` }} labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}> wrapperCol={{ span: `${field.fieldcol}` }}>
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} /> <WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
{field.domkey[0] == 'comp_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true} />} {field.domkey[0] == 'subcompanycode' && <AttachToNumberField field={field} form={form} isEdit={true} />}
</WeaFormItem>), </WeaFormItem>),
colSpan: 1 colSpan: 1
}); });

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

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-05-18 16:23:32 * @Date: 2022-05-18 16:23:32
* @LastEditTime: 2022-12-16 15:45:59 * @LastEditTime: 2022-12-16 17:17:45
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
*/ */

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

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-06-02 09:19:37 * @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-12-16 15:45:48 * @LastEditTime: 2022-12-16 17:47:38
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/ */
@ -724,7 +724,7 @@ export default class Department extends React.Component {
isFormInit={form1.isFormInit} isFormInit={form1.isFormInit}
loading={confirmLoading} loading={confirmLoading}
height={100} height={100}
width={350} width={320}
isMerge={isMerge} isMerge={isMerge}
defaultValue={"0"} defaultValue={"0"}
save={() => this.PopconfirmSave()} save={() => this.PopconfirmSave()}

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

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-06-02 09:20:03 * @Date: 2022-06-02 09:20:03
* @LastEditTime: 2022-12-16 11:18:42 * @LastEditTime: 2022-12-16 16:35:02
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
*/ */
@ -139,7 +139,7 @@ export default class DepartmentExtendStore extends React.Component {
labelCol={{ span: `${field.labelcol}` }} labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}> wrapperCol={{ span: `${field.fieldcol}` }}>
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} /> <WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
{field.domkey[0] == 'dept_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>} {field.domkey[0] == 'departmentcode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
</WeaFormItem>), </WeaFormItem>),
colSpan: 1 colSpan: 1
}); });

4
pc4mobx/organization/components/job/Job.js
View File

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-05-26 14:05:59 * @Date: 2022-05-26 14:05:59
* @LastEditTime: 2022-12-15 17:09:27 * @LastEditTime: 2022-12-16 16:36:59
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/ */
@ -336,7 +336,7 @@ export default class Job extends React.Component {
return <Switch checked={record.forbiddenTag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} /> return <Switch checked={record.forbiddenTag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
} }
}; };
if (c.dataIndex == 'jobName') { if (c.dataIndex == 'jobTitleName') {
c.render = function (text, record) { c.render = function (text, record) {
return <a href='javascript:void(0);' onClick={() => { return <a href='javascript:void(0);' onClick={() => {
window.open(`/spa/organization/static/index.html#/main/organization/jobExtend/${record.id}`, "_blank") window.open(`/spa/organization/static/index.html#/main/organization/jobExtend/${record.id}`, "_blank")