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

bug

This commit is contained in:
Chengliang 2022-12-14 16:17:15 +08:00
parent a709470921
commit 1d1d974e8d
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 16:23:32
* @LastEditTime: 2022-12-09 11:36:44
* @LastEditTime: 2022-12-14 13:54:24
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
*/
@ -184,7 +184,7 @@ export default class Company extends React.Component {
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
company.version(record);
company.version(record.id);
},
onCancel() {
return false;
@ -615,8 +615,8 @@ export default class Company extends React.Component {
isFormInit={form1.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={340}
conditionLen={2}
height={380}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => company.setNewVisible(false)}
saveAndSetting = {() => this.handleSaveAndSetting()}

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

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-12-13 16:00:41
* @LastEditTime: 2022-12-14 14:03:50
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/
@ -348,7 +348,7 @@ export default class Department extends React.Component {
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
department.version(record);
department.version(record.id);
},
onCancel() {
return false;
@ -708,7 +708,7 @@ export default class Department extends React.Component {
loading={dialogLoading}
isEdit={isEdit}
height={400}
conditionLen={2}
conditionLen={1}
save={() => this.handleSave()}
onCancel={() => department.setNewVisible(false)}
saveAndSetting={() => this.handleSaveAndSetting()}

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

@ -124,7 +124,7 @@ export default class FormItem extends React.Component {
<span>{subItem.fieldId}</span>
{subItem.fieldValue.length > 10 ? <Tooltip placement="topLeft" title={subItem.fieldValue}>
<span>{subItem.fieldValue}</span>
</Tooltip> : <span>{subItem.fieldValue}</span>}
</Tooltip> : <span dangerouslySetInnerHTML={subItem.fieldValue}></span>}
</div>

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

@ -352,7 +352,7 @@ export default class Resource extends React.Component {
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
resource.version(record);
resource.version(record.id);
},
onCancel() {
return false;

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

@ -265,8 +265,8 @@ export class CompanyStore {
})
}
@action("另存为版本") version(record) {
Api.version(record).then(res => {
@action("另存为版本") version(id) {
Api.version({id:id}).then(res => {
if (res.code === 200) {
message.success(res.msg);
} else {

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

@ -374,8 +374,8 @@ export class DepartmentStore {
})
}
@action("另存为版本") version(record) {
Api.version(record).then(res => {
@action("另存为版本") version(id) {
Api.version({id:id}).then(res => {
if (res.code === 200) {
message.success(res.msg);
} else {

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

@ -167,8 +167,8 @@ const {
this.tableStore.selectedRowKeys = [];
}
@action("另存为版本") version(record) {
Api.version(record).then(res => {
@action("另存为版本") version(id) {
Api.version({id:id}).then(res => {
if (res.code === 200) {
message.success(res.msg);
} else {