From 8312b214ffcf0297cc2a3add98b6129132746f2c Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 11 Sep 2023 14:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/staff/Staff.js    |  2 +-
 .../components/staff/StaffWorkflowSet.js      |  3 ++-
 pc4mobx/organization/stores/staff.js          | 22 ++++++++++++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js
index be1605a..5988595 100644
--- a/pc4mobx/organization/components/staff/Staff.js
+++ b/pc4mobx/organization/components/staff/Staff.js
@@ -513,7 +513,7 @@ export default class Staff extends React.Component {
                     >
                         <WeaLeftRightLayout ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@7muhhb`} isNew={true} showLeft={true} leftCom={this.getTree()}>
 
-                            <WeaTab sytle={{}} ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
+                            <WeaTab  ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
                                 searchType={['base', 'advanced']}
                                 showSearchAd={isPanelShow}
                                 searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? staffName : form2.getFormParams().staffName}
diff --git a/pc4mobx/organization/components/staff/StaffWorkflowSet.js b/pc4mobx/organization/components/staff/StaffWorkflowSet.js
index 16874f5..35f4f9f 100644
--- a/pc4mobx/organization/components/staff/StaffWorkflowSet.js
+++ b/pc4mobx/organization/components/staff/StaffWorkflowSet.js
@@ -84,11 +84,12 @@ export default class StaffWorkflowSet extends React.Component {
         return (
             <div className='staff-workdlow-set'>
                 <WeaTop
-                    title={<span>编制流程设置说明（<span style={{"color":"red"}}>停用，新文档地址https://www.e-cology.com.cn/sp/file/filePreview/904610581855698951</span>）</span>}
+                    title={<span>编制流程设置说明（<span style={{"color":"red"}}>停用</span>）</span>}
                     icon={<i className="icon-portal-workflow" />}
                     iconBgcolor="#55D2D4"
                 />
                 <div className='content'>
+                <span style={{"color":"red","fontSize":"20px"}}>新文档地址:https://www.e-cology.com.cn/sp/file/filePreview/904610581855698951</span>
                     <p>
                         <strong>1、概述</strong>
                         <div>客户可自行通过编制流程配置Action接口完成编制方案数据的更新操作;</div>
diff --git a/pc4mobx/organization/stores/staff.js b/pc4mobx/organization/stores/staff.js
index 3bfa854..41441da 100644
--- a/pc4mobx/organization/stores/staff.js
+++ b/pc4mobx/organization/stores/staff.js
@@ -54,8 +54,7 @@ export class StaffStore {
     @observable selectTreeNodeInfo;
 
 
-    @action
-    getTableInfo(isOnChange = false) {
+    @action getTableInfo(isOnChange = false) {
         let params = {
             planId: this.planId,
             ...this.selectTreeNodeInfo,
@@ -157,8 +156,7 @@ export class StaffStore {
         });
     }
 
-    @action("leftTree事件")
-    doSearch(params) {
+    @action("leftTree事件") doSearch(params) {
         this.selectTreeNodeInfo = params;
         this.getTableInfo();
     }
@@ -185,6 +183,7 @@ export class StaffStore {
     }
 
     updateConditions(data) {
+        if(data.planId.value == '') return;
         this.form.updateFields({
             ecCompany: {
                 value: ''
@@ -201,16 +200,28 @@ export class StaffStore {
         switch(type) {
             case  '分部':
                 this.condition[0].items = this.condition[0].items.filter(item => {
+                    if(item.domkey[0] == 'ecCompany'){
+                        item.viewAttr = 3;
+                        item.rules = "required";
+                    }
                     return (item.domkey[0] != 'ecDepartment' && item.domkey[0] != 'jobId')
                 });
                 break;
             case '部门':
                 this.condition[0].items = this.condition[0].items.filter(item => {
+                    if(item.domkey[0] == 'ecDepartment'){
+                        item.viewAttr = 3;
+                        item.rules = "required";
+                    }
                     return  item.domkey[0] != 'ecCompany' && item.domkey[0] != 'jobId'
                 })
                 break;
             case '岗位':
                 this.condition[0].items = this.condition[0].items.filter(item => {
+                    if(item.domkey[0] == 'jobId'){
+                        item.viewAttr = 3;
+                        item.rules = "required";
+                    }
                     return  item.domkey[0] != 'ecCompany' && item.domkey[0] != 'ecDepartment'
                 })
             
@@ -235,8 +246,7 @@ export class StaffStore {
     }
 
 
-    @action
-    getHasRight() {
+    @action getHasRight() {
         Api.getHasRight().then(res => {
             if (res.code === 200) {
                 res.data.rightMenu && this.setRightMenu(res.data.rightMenu);