From 28cbe4d7e15cf2fa9a1a0614be72431dfc69ad58 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 17 Nov 2022 11:34:05 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/ImportDialog.js        |  2 +-
 pc4mobx/organization/components/NewAndEditDialog.js    |  2 +-
 pc4mobx/organization/components/columnSetting/index.js |  2 +-
 .../organization/components/newImport/stepDialog.js    |  2 +-
 pc4mobx/organization/components/staff/Staff.js         |  2 +-
 pc4mobx/organization/public/i18n.js                    |  2 +-
 pc4mobx/organization/stores/columnSetting.js           |  4 ++--
 pc4mobx/organization/stores/staff.js                   | 10 ++++++----
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/organization/components/ImportDialog.js b/pc4mobx/organization/components/ImportDialog.js
index 6f11810..e233189 100644
--- a/pc4mobx/organization/components/ImportDialog.js
+++ b/pc4mobx/organization/components/ImportDialog.js
@@ -150,7 +150,7 @@ export default class ImportDialog extends React.Component {
         } = this.state;
 
         const buttons = [
-            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '导入完成' : '开始导入'}</Button>),
+            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '关闭' : '开始导入'}</Button>),
         ];
 
 
diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js
index d0b166a..2308825 100644
--- a/pc4mobx/organization/components/NewAndEditDialog.js
+++ b/pc4mobx/organization/components/NewAndEditDialog.js
@@ -47,7 +47,7 @@ export default class NewAndEditDialog extends React.Component {
                     error={form.getError(field)}
                     tipPosition="bottom"
                     wrapperCol={{ span: `${field.fieldcol}` }}>
-                    {<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@7vxyfr@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} />}
+                    {<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@7vxyfr@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} onChange={this.onChange} />}
                 </WeaFormItem>)
             })
         })
diff --git a/pc4mobx/organization/components/columnSetting/index.js b/pc4mobx/organization/components/columnSetting/index.js
index ae70eaa..e60639e 100644
--- a/pc4mobx/organization/components/columnSetting/index.js
+++ b/pc4mobx/organization/components/columnSetting/index.js
@@ -62,7 +62,7 @@ class ColumnSetting extends Component {
       return renderNoright();
     }
     return (
-      <div style={{ height: "100%" }}>
+      authorized && <div style={{ height: "100%" }}>
         <WeaRightMenu
           ecId={`${this && this.props && this.props.ecId || ""}_WeaRightMenu@k6oc4u`}
           datas={[{
diff --git a/pc4mobx/organization/components/newImport/stepDialog.js b/pc4mobx/organization/components/newImport/stepDialog.js
index b59f128..7302c94 100644
--- a/pc4mobx/organization/components/newImport/stepDialog.js
+++ b/pc4mobx/organization/components/newImport/stepDialog.js
@@ -67,7 +67,7 @@ export default class StepDialog extends React.Component {
         } = this.state;
 
         const buttons = [
-            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '导入完成' : i18n.button.nextStep()}</Button>),
+            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => this.next()}>{current === steps.length - 1 ? '关闭' : i18n.button.nextStep()}</Button>),
         ];
 
         return (
diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js
index c1ce46e..928feb8 100644
--- a/pc4mobx/organization/components/staff/Staff.js
+++ b/pc4mobx/organization/components/staff/Staff.js
@@ -533,7 +533,7 @@ export default class Staff extends React.Component {
                     loading={dialogLoading}
                     isEdit={isEdit}
                     height={350}
-                    conditionLen={1}
+                    conditionLen={2}
                     save={() => this.handleSave()}
                     onCancel={() => staff.setVisible(false)}
                     moduleName={"staff"}
diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js
index ad482c6..f7c6c57 100644
--- a/pc4mobx/organization/public/i18n.js
+++ b/pc4mobx/organization/public/i18n.js
@@ -158,7 +158,7 @@ export const i18n = {
 		typeName: () => getLabel(129927, '类型名称'),
 		ResourceName: () => getLabel(385936, '人员'),
 		newPeople: () => getLabel(386246, '新建人员'),
-		resourceMange: () => getLabel(386246, '人员管理'),
+		resourceMange: () => getLabel(386246, '花名册'),
 		resourceBasicInfo: () => getLabel(386246, '人员信息'),
 		newResourceBasicInfo: () => getLabel(386246, '新建人员资料'),
 		newResourceBasicType: () => getLabel(386246, '新建人员资料类型'),
diff --git a/pc4mobx/organization/stores/columnSetting.js b/pc4mobx/organization/stores/columnSetting.js
index a52a72f..9596f17 100644
--- a/pc4mobx/organization/stores/columnSetting.js
+++ b/pc4mobx/organization/stores/columnSetting.js
@@ -19,7 +19,7 @@ export class ColumnSetting {
   @observable tableStore = new TableStore();
   @observable columnsPermissionData = [];
   @observable selectedKey = "0";
-  @observable authorized = true;
+  @observable authorized = '';
   @observable loading = true;
   @observable tabOneRelatedData = {
     datas: [], //datas受控
@@ -186,7 +186,7 @@ export class ColumnSetting {
                       ecId={`${this && this.props && this.props.ecId || ""}_WeaHelpfulTip@4vdvfp@${index}`}
                       title="页面链接地址可以为外网地址，如：http://www.baidu.com
                       也可以是内部地址，如：/test.jsp，可以带上参数传参，像这样：/test.jsp?a=1&b=2
-                      也可以写占位符{#id}传人员id，像这样：/test.jsp?a=1&b={#id}&mypara2={#id}"/>
+                      也可以写占位符${id}传人员id，像这样：/test.jsp?a=1&b=${id}&mypara2=${id}"/>
                   </span>
               </span>;
               }
diff --git a/pc4mobx/organization/stores/staff.js b/pc4mobx/organization/stores/staff.js
index 8f133c0..3bfa854 100644
--- a/pc4mobx/organization/stores/staff.js
+++ b/pc4mobx/organization/stores/staff.js
@@ -186,10 +186,10 @@ export class StaffStore {
 
     updateConditions(data) {
         this.form.updateFields({
-            compId: {
+            ecCompany: {
                 value: ''
             },
-            deptId: {
+            ecDepartment: {
               value: ''
             },
             jobId: {
@@ -206,11 +206,13 @@ export class StaffStore {
                 break;
             case '部门':
                 this.condition[0].items = this.condition[0].items.filter(item => {
-                    return  item.domkey[0] != 'jobId'
+                    return  item.domkey[0] != 'ecCompany' && item.domkey[0] != 'jobId'
                 })
                 break;
             case '岗位':
-                break;
+                this.condition[0].items = this.condition[0].items.filter(item => {
+                    return  item.domkey[0] != 'ecCompany' && item.domkey[0] != 'ecDepartment'
+                })
             
         }
         this.setCondition(this.condition);