From 57b165f6d80bb903f9c2424f3ea94ad513afeb0f Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Tue, 6 Sep 2022 20:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/company/CompanyExtend.js    | 6 +++++-
 .../organization/components/department/departmentExtend.js  | 5 ++++-
 pc4mobx/organization/components/job/JobExtend.js            | 5 ++++-
 pc4mobx/organization/style/common.less                      | 4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/organization/components/company/CompanyExtend.js b/pc4mobx/organization/components/company/CompanyExtend.js
index 92b4901..ac76f0f 100644
--- a/pc4mobx/organization/components/company/CompanyExtend.js
+++ b/pc4mobx/organization/components/company/CompanyExtend.js
@@ -2,7 +2,7 @@
  * @Author: 程亮
  * @Date: 2022-05-18 14:52:39
  * @LastEditTime: 2022-06-22 16:37:43
- * @Description: 
+ * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
  */
 import { Button, Modal, message, Row, Col, Spin } from 'antd';
@@ -14,9 +14,11 @@ import { WeaSwitch } from 'comsMobx';
 import { inject, observer } from 'mobx-react';
 import * as mobx from 'mobx';
 import { i18n } from '../../public/i18n';
+import '../../style/common.less';
 
 const toJS = mobx.toJS;
 import '../../style/common.less';
+import AttachToNumberField from "../NewNumberField";
 
 
 @inject('companyExtend')
@@ -122,9 +124,11 @@ export default class CompanyExtend extends React.Component {
               label={`${field.label}`}
               error={form.getError(field)}
               tipPosition={tipPosition}
+              className={j === 1 && "minH5"}
               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}/>}
             </WeaFormItem>),
             colSpan: 1
           });
diff --git a/pc4mobx/organization/components/department/departmentExtend.js b/pc4mobx/organization/components/department/departmentExtend.js
index 33a6ee0..a310b69 100644
--- a/pc4mobx/organization/components/department/departmentExtend.js
+++ b/pc4mobx/organization/components/department/departmentExtend.js
@@ -2,7 +2,7 @@
  * @Author: 程亮
  * @Date: 2022-06-02 09:20:03
  * @LastEditTime: 2022-06-29 17:42:27
- * @Description: 
+ * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
  */
 
@@ -16,6 +16,7 @@ import { WeaSwitch } from 'comsMobx';
 import { inject, observer } from 'mobx-react';
 import * as mobx from 'mobx';
 import { i18n } from '../../public/i18n';
+import AttachToNumberField from "../NewNumberField";
 
 const toJS = mobx.toJS;
 import '../../style/common.less';
@@ -123,9 +124,11 @@ export default class DepartmentExtendStore extends React.Component {
               label={`${field.label}`}
               error={form.getError(field)}
               tipPosition={tipPosition}
+              className={j === 1 && "minH5"}
               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}/>}
             </WeaFormItem>),
             colSpan: 1
           });
diff --git a/pc4mobx/organization/components/job/JobExtend.js b/pc4mobx/organization/components/job/JobExtend.js
index 3338e57..e101ba9 100644
--- a/pc4mobx/organization/components/job/JobExtend.js
+++ b/pc4mobx/organization/components/job/JobExtend.js
@@ -2,7 +2,7 @@
  * @Author: 程亮
  * @Date: 2022-05-26 14:07:12
  * @LastEditTime: 2022-07-12 16:25:58
- * @Description: 
+ * @Description:
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/job/JobExtend.js
  */
 
@@ -18,6 +18,7 @@ import { i18n } from '../../public/i18n';
 
 const toJS = mobx.toJS;
 import '../../style/common.less';
+import AttachToNumberField from "../NewNumberField";
 
 
 @inject('jobExtend')
@@ -122,9 +123,11 @@ export default class JobExtend extends React.Component {
               label={`${field.label}`}
               error={form.getError(field)}
               tipPosition={tipPosition}
+              className={j === 1 && "minH5"}
               labelCol={{ span: `${field.labelcol}` }}
               wrapperCol={{ span: `${field.fieldcol}` }}>
               <WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} onChange={this.onChange} />
+              {field.domkey[0] == 'job_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
             </WeaFormItem>),
             colSpan: 1
           });
diff --git a/pc4mobx/organization/style/common.less b/pc4mobx/organization/style/common.less
index fc4cfca..4b5ad4b 100644
--- a/pc4mobx/organization/style/common.less
+++ b/pc4mobx/organization/style/common.less
@@ -76,3 +76,7 @@
     max-height: 350px!important;
   }
 }
+//编辑页面的表单项样式
+.minH5{
+  min-height: 50px!important;
+}