diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js
index 73dfe84..6b6ab4e 100644
--- a/pc4mobx/organization/components/NewAndEditDialog.js
+++ b/pc4mobx/organization/components/NewAndEditDialog.js
@@ -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>
                     ),
diff --git a/pc4mobx/organization/components/NewNumberField.js b/pc4mobx/organization/components/NewNumberField.js
index 648f22f..bc5d043 100644
--- a/pc4mobx/organization/components/NewNumberField.js
+++ b/pc4mobx/organization/components/NewNumberField.js
@@ -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"
     };
 
   }
diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index 9736dd3..5206db1 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-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()}
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index 341678b..a40e10e 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-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()}
diff --git a/pc4mobx/organization/components/resource/FormItem.js b/pc4mobx/organization/components/resource/FormItem.js
index e52ca52..3cd945c 100644
--- a/pc4mobx/organization/components/resource/FormItem.js
+++ b/pc4mobx/organization/components/resource/FormItem.js
@@ -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>
 
diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index fffa35a..78be5e6 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -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;
diff --git a/pc4mobx/organization/stores/company.js b/pc4mobx/organization/stores/company.js
index 077cc2c..9796de3 100644
--- a/pc4mobx/organization/stores/company.js
+++ b/pc4mobx/organization/stores/company.js
@@ -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 {
diff --git a/pc4mobx/organization/stores/department.js b/pc4mobx/organization/stores/department.js
index b3808b1..39fb412 100644
--- a/pc4mobx/organization/stores/department.js
+++ b/pc4mobx/organization/stores/department.js
@@ -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 {
diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js
index 0b0dc6f..9dfa973 100644
--- a/pc4mobx/organization/stores/resource.js
+++ b/pc4mobx/organization/stores/resource.js
@@ -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 {