From 39da6bcd15ba9dccc78b37e745d09ba2079cf761 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Fri, 16 Dec 2022 18:53:54 +0800
Subject: [PATCH] xiu fu

---
 pc4mobx/organization/components/NewAndEditDialog.js           | 4 ++--
 pc4mobx/organization/components/NewNumberField.js             | 2 +-
 pc4mobx/organization/components/company/CompanyExtend.js      | 4 ++--
 pc4mobx/organization/components/company/company.js            | 2 +-
 pc4mobx/organization/components/department/department.js      | 4 ++--
 .../organization/components/department/departmentExtend.js    | 4 ++--
 pc4mobx/organization/components/job/Job.js                    | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js
index 6b6ab4e..c9e24d6 100644
--- a/pc4mobx/organization/components/NewAndEditDialog.js
+++ b/pc4mobx/organization/components/NewAndEditDialog.js
@@ -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}
                                 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] == '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}/>} */}
                             
diff --git a/pc4mobx/organization/components/NewNumberField.js b/pc4mobx/organization/components/NewNumberField.js
index bc5d043..9d6e40c 100644
--- a/pc4mobx/organization/components/NewNumberField.js
+++ b/pc4mobx/organization/components/NewNumberField.js
@@ -31,7 +31,7 @@ export default class AttachToNumberField extends PureComponent {
     this.typeMap = {
       subcompanycode: "SUBCOMPANY",
       departmentcode: "DEPARTMENT",
-      // job_no: "JOBTITLES",
+      job_no: "JOBTITLES",
       // work_code: "USER"
     };
 
diff --git a/pc4mobx/organization/components/company/CompanyExtend.js b/pc4mobx/organization/components/company/CompanyExtend.js
index 6dbd8c4..d71d440 100644
--- a/pc4mobx/organization/components/company/CompanyExtend.js
+++ b/pc4mobx/organization/components/company/CompanyExtend.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 14:52:39
- * @LastEditTime: 2022-12-15 19:29:14
+ * @LastEditTime: 2022-12-16 17:48:54
  * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
  */
@@ -129,7 +129,7 @@ export default class CompanyExtend extends React.Component {
               labelCol={{ span: `${field.labelcol}` }}
               wrapperCol={{ span: `${field.fieldcol}` }}>
               <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>),
             colSpan: 1
           });
diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index e34e2c7..64fd9f2 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 16:23:32
- * @LastEditTime: 2022-12-16 15:45:59
+ * @LastEditTime: 2022-12-16 17:17:45
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
  */
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index b54d10a..538f594 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-02 09:19:37
- * @LastEditTime: 2022-12-16 15:45:48
+ * @LastEditTime: 2022-12-16 17:47:38
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
  */
@@ -724,7 +724,7 @@ export default class Department extends React.Component {
                     isFormInit={form1.isFormInit}
                     loading={confirmLoading}
                     height={100}
-                    width={350}
+                    width={320}
                     isMerge={isMerge}
                     defaultValue={"0"}
                     save={() => this.PopconfirmSave()}
diff --git a/pc4mobx/organization/components/department/departmentExtend.js b/pc4mobx/organization/components/department/departmentExtend.js
index 49ada80..bbdfe06 100644
--- a/pc4mobx/organization/components/department/departmentExtend.js
+++ b/pc4mobx/organization/components/department/departmentExtend.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-06-02 09:20:03
- * @LastEditTime: 2022-12-16 11:18:42
+ * @LastEditTime: 2022-12-16 16:35:02
  * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
  */
@@ -139,7 +139,7 @@ export default class DepartmentExtendStore extends React.Component {
               labelCol={{ span: `${field.labelcol}` }}
               wrapperCol={{ span: `${field.fieldcol}` }}>
               <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>),
             colSpan: 1
           });
diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js
index d9d7e4b..cc52470 100644
--- a/pc4mobx/organization/components/job/Job.js
+++ b/pc4mobx/organization/components/job/Job.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-26 14:05:59
- * @LastEditTime: 2022-12-15 17:09:27
+ * @LastEditTime: 2022-12-16 16:36:59
  * @Description: 
  * @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)} />
                 }
             };
-            if (c.dataIndex == 'jobName') {
+            if (c.dataIndex == 'jobTitleName') {
                 c.render = function (text, record) {
                     return <a href='javascript:void(0);' onClick={() => {
                         window.open(`/spa/organization/static/index.html#/main/organization/jobExtend/${record.id}`, "_blank")