{
window.open(`/spa/organization/static/index.html#/main/organization/departmentExtend/${record.id}`, "_blank")
diff --git a/pc4mobx/organization/components/fieldDefinedSet/FieldDef.js b/pc4mobx/organization/components/fieldDefinedSet/FieldDef.js
index 5a01160..53040f8 100644
--- a/pc4mobx/organization/components/fieldDefinedSet/FieldDef.js
+++ b/pc4mobx/organization/components/fieldDefinedSet/FieldDef.js
@@ -103,9 +103,7 @@ export default class FieldDef extends Component {
// }
// }
}
-
const rMenu = [...rightMenu, ...store.getBasicMenus(this.props.logSmallType, this.props.targetId)]
-
return (
{ this.tabDom = dom }}>
diff --git a/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js b/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
index 32b0d26..6a6e26c 100644
--- a/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
+++ b/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js
@@ -137,13 +137,6 @@ export default class FieldDefined extends Component {
dropMenuDatas: menus
};
let logType;
- if (selectedTreeNodeInfo) {
- if (selectedTreeNodeInfo.viewAttr == 1) {
- logType = 'HRM_ENGINE_RESOURCEFIELDDEFINED';
- } else {
- logType = 'HRM_ENGINE_RESOURCEFIELDDEFINED_DETAIL';
- }
- }
let children = [];
if (hasRight === false) {
diff --git a/pc4mobx/organization/components/newImport/index.js b/pc4mobx/organization/components/newImport/index.js
index 8ce9ed4..396402c 100644
--- a/pc4mobx/organization/components/newImport/index.js
+++ b/pc4mobx/organization/components/newImport/index.js
@@ -31,7 +31,7 @@ export default class newImport extends React.Component {
constructor(props) {
super(props);
this.state = ({
- title: '基础数据导入',
+ title: '数据导入',
})
}
diff --git a/pc4mobx/organization/stores/fieldDefined.js b/pc4mobx/organization/stores/fieldDefined.js
index d67de8a..0aa675f 100644
--- a/pc4mobx/organization/stores/fieldDefined.js
+++ b/pc4mobx/organization/stores/fieldDefined.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-09 10:16:00
- * @LastEditTime: 2022-09-16 11:49:18
+ * @LastEditTime: 2022-11-08 16:43:10
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/stores/fieldDefined.js
*/
@@ -300,19 +300,16 @@ export class FieldDefinedStore extends HrmBaseStore {
}];
//人员卡片字段定义-添加【允许个人修改】列
- // if (this.moduleName === 'resourcefielddefined') {
- // if (this.isJobTreeNode) {//【工作信息】列表不添加【允许个人修改】列
- // } else {
- // columns.push({
- // title: getLabel(510359, '允许个人修改'),
- // dataIndex: 'isModify',
- // key: 'isModify',
- // checkType: 'checkbox',
- // colSpan: 1,
- // width: '11%'
- // });
- // }
- // }
+ if (this.moduleName === 'resourcefielddefined') {
+ columns.push({
+ title: getLabel(510359, '允许个人修改'),
+ dataIndex: 'isModify',
+ key: 'isModify',
+ checkType: 'checkbox',
+ colSpan: 1,
+ width: '11%'
+ });
+ }
// this.encryptEnable && columns.push({
// title: getLabel('526997', '加密设置'),
// dataIndex: 'canEncrypt',
diff --git a/pc4mobx/organization/style/common.less b/pc4mobx/organization/style/common.less
index 9574fd8..0b7049a 100644
--- a/pc4mobx/organization/style/common.less
+++ b/pc4mobx/organization/style/common.less
@@ -89,3 +89,9 @@
}
}
+ //表格列省略样式
+ .wea-table-indent {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;overflow: hidden;
+ }