!70 fixed

Merge pull request !70 from reset/feature/cl

pc4mobx/organization/components/company/company.js

@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 16:23:32
- * @LastEditTime: 2022-07-06 10:48:30
+ * @LastEditTime: 2022-09-05 17:46:05
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
  */
@@ -140,7 +140,7 @@ export default class Company extends React.Component {
         const {
             company
         } = this.props;
-        company.setNeDialogTitle(i18n.label.companyName());
+        company.setNeDialogTitle(i18n.label.selectDept());
         company.setVisible(true);
         company.setDialogLoadingStatus(true);
         company.getDeptTable(id);

pc4mobx/organization/components/staff/Staff.js

@@ -254,11 +254,20 @@ export default class Staff extends React.Component {
                 inputLeftDom={`<b>${i18n.label.organization()}</b>`}
                 treeNodeClick={this.treeNodeClick}
                 expandAllChildrenOnSearch={true}
+                renderNode={item => this.renderNode(item)}
             />
         )
         return tree;
     }
 
+    renderNode(item) {
+        return <div className='text-elli' title={item.name}>
+            <i className={item.icon} style={{ marginRight: '5px' }}></i>
+            {item.name}
+            {item.canceled && <span style={{ color: 'red' }}>({i18n.label.forbidden()})</span>}
+        </div>
+    }
+
     treeNodeClick = (event, ids, nodeids, nodes) => {
         const {
             staff
@@ -513,7 +522,7 @@ export default class Staff extends React.Component {
                     isFormInit={form.isFormInit}
                     loading={dialogLoading}
                     isEdit={isEdit}
-                    height={250}
+                    height={400}
                     conditionLen={3}
                     save={() => this.handleSave()}
                     onCancel={() => staff.setVisible(false)}

pc4mobx/organization/components/staff/StaffScheme.js

@@ -429,7 +429,7 @@ export default class StaffScheme extends React.Component {
                     isFormInit={form.isFormInit}
                     loading={dialogLoading}
                     isEdit={isEdit}
-                    height={250}
+                    height={450}
                     conditionLen={3}
                     save={() => this.handleSave()}
                     onCancel={() => staffScheme.setVisible(false)}

pc4mobx/organization/public/i18n.js

@@ -152,6 +152,7 @@ export const i18n = {
 		newDept: () => getLabel(386246, '新增部门'),
 		mergeDept:()=> getLabel(386246, '合并部门'),
 		transferDept:()=> getLabel(386246, '转移部门'),
+		selectDept:()=> getLabel(386246, '联查部门'),
 		editDept:()=> getLabel(386246, '修改部门信息'),
 		typeName: () => getLabel(129927, '类型名称'),
 		ResourceName: () => getLabel(385936, '人员'),

pc4mobx/organization/stores/jobextend.js

@@ -139,7 +139,7 @@ export class JobExtendStore {
           const index1 = findIndex(conditions[1].items, { label }); 
           label = "职等"
           const index2 = findIndex(conditions[1].items, { label });
-          let schemeId = conditions[1].items[1].browserConditionParam.replaceDatas[0].id;
+          let schemeId = conditions[1].items[1].browserConditionParam.replaceDatas.length > 0 && conditions[1].items[1].browserConditionParam.replaceDatas[0].id;
           let levelIds = res.data.levelIds;
           this.rangeLimit(key0,schemeId,index1,currenttime,conditions);
           this.rangeLimitLevel(key1,key2,index2,levelIds,currenttime,conditions)