+
@@ -1106,18 +1159,17 @@ export class HrmShiftManager extends HrmBaseStore {
}
];
},
- isresttimeopen: () => {
+ isresttimeopen: () => {
const formParams = this.formTarget.baseForm.getFormParams();
const { fieldMap } = this.formTarget.baseForm;
if (formParams.isresttimeopen != "1") {
return [];
}
const coms = [];
- this.toJS(this.restTimeCollection).forEach((d, index) => {
- console.debug(d)
+ this.restTimeCollection.forEach((d, index) => {
const {record, start, end} = d;
- const {time: sTime = '12:00', accross: sAccross} = start || {};
- const {time: eTime, accross: eAccross} = end || {};
+ const {time: sTime = '12:00', accross: sAccross = '0'} = start || {};
+ const {time: eTime, accross: eAccross = '0'} = end || {};
coms.push(
{i18n.label["125810"]()}
{i18n.label["388785"]()}
+ {i18n.label["388785"]()}
)}
{formParams.punchsettings === "1" && (
)}
+
+
+
+
+ (this.worktimes[i - 1].end.clockinnot = (v || 1))
+ }
+ />
+
+ {getLabel('540846','无需打卡')}
+
+
+ );
+ }
+ }
+ }
+
+ get provinceDialogButtons() {
+ return (
+ [
+ ,
+ ,
+
+ ]
+ )
+ }
+
+ @observable selectedRowKeys = [];
+
+ @observable dataSource = [];
+ provinceInfo = [];
+ provinceOp = 'add';
+
+ onSelectChange = (selectedRowKeys) => {
+ this.selectedRowKeys = selectedRowKeys;
+ }
+
+ addProvince = () => {
+ const {
+ setDialogConfig,
+ openDialog,
+ } = this.provinceDialogStore;
+
+ this.provinceOp = 'add';
+ this.provinceFormStore.form.resetForm();
+ this.provinceFormStore.conditions[0].items[0].viewAttr = 3;
+ setDialogConfig(this.provinceDialogNewConfig);
+ openDialog();
+ }
+
+ @action batchDeleteProvinces = () => {
+ this.dataSource = this.dataSource.filter((data,index) => !this.selectedRowKeys.includes(index));
+ this.selectedRowKeys = [];
+ }
+
+ editProvince = (record) => {
+ return ()=>{
+ const {
+ setDialogConfig,
+ openDialog,
+ } = this.provinceDialogStore;
+
+ setDialogConfig(this.provinceDialogEditDialogConfig);
+ openDialog();
+
+ this.provinceOp = 'edit';
+ this.fetchRowDataAndUpdateForm(record);
+ }
+
+ }
+
+ fetchRowDataAndUpdateForm = (record) => {
+ //1、获取当前行数据
+ const { id, yearsOld, amount } = record;
+
+ //2、更新表单
+ this.provinceFormStore.form.updateFields({
+ multiselectprovinceValue: id,
+ yearsOld:{
+ value: yearsOld
+ },
+ amount:{
+ value: amount
+ }
+ });
+
+ //3、省份只读
+ this.provinceFormStore.conditions[0].items[0].viewAttr = 1;
+
+ }
+
+ @action deleteProvince = (record) => {
+ return () => {
+ this.dataSource = this.dataSource.filter(data => data.id !== record.id);
+ }
+ }
+
+ getProvinceForm = (id) => {
+ const {
+ setFormConfig,
+ fetchForm,
+ } = this.provinceFormStore;
+
+ const params = {
+ typeId: id
+ };
+ setFormConfig({isCustomRender: true});
+ fetchForm(params,this.getProvinceInfo);
+ }
+
+ getProvinceInfo = (data) => {
+ this.provinceInfo = data.condition[0].items[0].options;
+ }
+
+ logicallyAddNewProvince = () => {
+ // 1、校验
+ const {
+ form,
+ validateForm,
+ } = this.provinceFormStore;
+ validateForm(form).then(() => {
+ if(this.provinceOp == 'add'){
+ // 2、将表单数据转换成table需要的数据
+ this.convertFormDataToTableData();
+ }else{
+ this.updateTableData();
+ }
+ this.closeProvincDialog();
+ })
+
+ }
+
+ @action convertFormDataToTableData = () => {
+ const {
+ form,
+ } = this.provinceFormStore;
+ const { multiselectprovinceValue, yearsOld, amount } = form.getFormParams();
+ const newData = multiselectprovinceValue.split(',').map(val => {
+ const provincename = this.provinceInfo.find(info => info.key === val).showname;
+ return {
+ id: val,
+ provincename,
+ yearsOld,
+ amount,
+ }
+ })
+ this.dataSource = unionBy(newData, toJS(this.dataSource), 'id');
+ }
+
+ @action updateTableData = () => {
+ const {
+ form,
+ } = this.provinceFormStore;
+ const { multiselectprovinceValue, yearsOld, amount } = form.getFormParams();
+
+ this.dataSource = this.dataSource.map(data => {
+ if( data.id === multiselectprovinceValue){
+ data.yearsOld = yearsOld;
+ data.amount = amount;
+ }
+ return data;
+ })
+
+ }
+
+ closeProvincDialog = () => {
+ const {
+ closeDialog
+ } = this.provinceDialogStore;
+ closeDialog();
+ }
+
+ @action closeDialog = () => {
+ this.selectedRowKeys = [];
+ this.dataSource = [];
+ }
+
+
get newDialogConfig() {
return {
title: getLabel(505562, '新建假期规则'),
@@ -365,9 +708,32 @@ class VacationRuleStore {
}
}
+ get provinceDialogNewConfig() {
+ return {
+ title: getLabel(546862,'新增规则') ,
+ dialogMark:'province',
+ style: {
+ width: 550,
+ height: 300
+ }
+ }
+ }
+
+ get provinceDialogEditDialogConfig() {
+ return {
+ title: getLabel(546863,'编辑规则'),
+ dialogMark:'province',
+ style: {
+ width: 550,
+ height: 300
+ }
+ }
+ }
+
+
//自定义渲染表单元素的key值
get customRenderKeyList() {
- return ['extendedDays', 'expirationDay']
+ return ['extendedDays', 'expirationDay','yearsOld']
}
//根据customRenderKeyList得出item的集合
@@ -439,6 +805,8 @@ class VacationRuleStore {
openDialog();
this.getForm();
+
+
}
resetDistributeModeRule = () => {
@@ -526,12 +894,14 @@ class VacationRuleStore {
form,
validateForm,
} = this.formStore, {
- distributionMode
+ distributionMode,
+ isprovince,
} = form.getFormParams();
this.setHideFormFieldKeys();
validateForm(form).then(() => {
+ if(!this.validateHolidayDaysSettings())return;
this.isNameRepeat().then(() => {
const params = form.getFormParams();
@@ -549,6 +919,17 @@ class VacationRuleStore {
})
}
+ if(distributionMode === '8' && isprovince === '2'){
+ Object.assign(params, {
+ detailRule: JSON.stringify(cloneDeep(toJS(this.dataSource)).map(data => {
+ data.provinceid = data.id;
+ delete data.id;
+ delete data.provincename;
+ return data
+ })),
+ })
+ }
+
if (this.dialogType === 'edit') {
Object.assign(params, {
ruleId: this.ruleId
@@ -561,11 +942,13 @@ class VacationRuleStore {
api[apiName](params).then(datas => {
const {
- sign
+ sign,
+ api_status,
+ status,
} = datas;
- if (sign === '1') {
- message.success(datas.message);
+ if ( api_status && status !== '-1') {
+ message.success(datas.message || i18n.message.saveSuccess());
this.handleSearch();
this.dialogStore.closeDialog();
} else {
@@ -580,6 +963,31 @@ class VacationRuleStore {
}
+ validateHolidayDaysSettings = () => {
+ const {
+ form,
+ } = this.formStore, {
+ distributionMode,
+ isprovince,
+ yearsOld,
+ annualAmount,
+ } = form.getFormParams();
+
+ if(distributionMode == '8' && isprovince == '1'){
+ if(!yearsOld && yearsOld !== 0){
+ message.warning(getLabel(546860,'请填写孩子周岁') );
+ return false
+ }
+
+ if(!annualAmount && annualAmount !== 0){
+ message.warning(getLabel(546861,'请填写发放固定小时数') );
+ return false
+ }
+ }
+
+ return true
+ }
+
setHideFormFieldKeys = () => {
const {
form,
@@ -590,6 +998,7 @@ class VacationRuleStore {
distributionMode, //余额发放方式
extensionEnable, //允许延长有效期
validityRule, //有效期规则
+ carryOver,
} = form.getFormParams();
//默认两项：假期类型、规则名称
@@ -611,6 +1020,10 @@ class VacationRuleStore {
needValidation.push('effectiveMonths');
}
+ if(['1','2','3','4','6','7'].includes(distributionMode) && carryOver === '1'){
+ needValidation.push('carryOverDays');
+ }
+
window.e9HideFormFieldKeys = collectHideFormFieldKeys(needValidation);
}
@@ -660,6 +1073,7 @@ class VacationRuleStore {
} = typeId;
this.getUnitName(value);
+ this.getProvinceForm(value);
}
if (distributionMode) { //切换余额发放方式
@@ -955,10 +1369,14 @@ class VacationRuleStore {
fetchForm(params, this.exportFormDatas, this.afterFormInit);
}
- exportFormDatas = (datas) => {
+ @action exportFormDatas = (datas) => {
['distributionMode', 'calcMethod', 'convertModeTips', 'isEnable', 'detailRule', 'unitName', 'legalRule', 'welfareRule', 'legalKey', 'welfareKey'].forEach(val => {
this[val] = datas[val];
});
+
+ if(datas.detailRule && datas.detailRule.length > 0 && datas.detailRule[0].provincename !== undefined){
+ this.dataSource = datas.detailRule.map(data => ({ ...data, id: data.provinceid+'' }));
+ }
}
afterFormInit = () => {
@@ -966,14 +1384,19 @@ class VacationRuleStore {
const {
distributionMode,
calcMethod,
+ typeId
} = this.formStore.form.getFormParams();
this.setValidityRuleDisabled(distributionMode);
this.setConvertModeDisabled(calcMethod);
this.lastDistributionMode = distributionMode;
+
+ this.getProvinceForm(typeId);
}
+
+
//法定年假、福利年假规则选择框事件回调
@action handleRuleSelectChange = (key, type) => {
if (type === 'legal') {
diff --git a/pc4backstage/hrmAttendance/stores/vacationType.js b/pc4backstage/hrmAttendance/stores/vacationType.js
old mode 100644
new mode 100755
index 0ca271e..44149c5
--- a/pc4backstage/hrmAttendance/stores/vacationType.js
+++ b/pc4backstage/hrmAttendance/stores/vacationType.js
@@ -87,6 +87,16 @@ class VacationTypeStore {
activeKey: 'scopeType',
showValue: '1'
},
+ {
+ passiveKey: 'scopeValueDepartment',
+ activeKey: 'scopeType',
+ showValue: '2'
+ },
+ {
+ passiveKey: 'scopeValueMember',
+ activeKey: 'scopeType',
+ showValue: '3'
+ },
//计算请假时长方式
{
passiveKey: 'hoursToDay', //日折算时长
@@ -109,6 +119,11 @@ class VacationTypeStore {
activeKey: 'minimumUnit',
showValue: '5,6',
},
+ {
+ passiveKey: 'schevacation',
+ activeKey: 'schevacationON',
+ showValue: '1',
+ },
]
}
@@ -403,6 +418,12 @@ class VacationTypeStore {
if (scopeType === '1') { //分部
needValidation.push('scopeValue');
}
+ if (scopeType === '2') {
+ needValidation.push('scopeValueDepartment');
+ }
+ if (scopeType === '3') { //分部
+ needValidation.push('scopeValueMember');
+ }
if (computingMode === '2') { //按自然日计算请假时长
needValidation.push('hoursToDay');
}
diff --git a/pc4backstage/hrmAttendance/stores/workflowSetting.js b/pc4backstage/hrmAttendance/stores/workflowSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/applicationSettings.less b/pc4backstage/hrmAttendance/style/applicationSettings.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/attendanceSynSetting.less b/pc4backstage/hrmAttendance/style/attendanceSynSetting.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/common.css b/pc4backstage/hrmAttendance/style/common.css
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/common.less b/pc4backstage/hrmAttendance/style/common.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/groupSetting.css b/pc4backstage/hrmAttendance/style/groupSetting.css
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/groupSetting.less b/pc4backstage/hrmAttendance/style/groupSetting.less
old mode 100644
new mode 100755
index 74859b3..f0000de
--- a/pc4backstage/hrmAttendance/style/groupSetting.less
+++ b/pc4backstage/hrmAttendance/style/groupSetting.less
@@ -81,6 +81,26 @@
background: #A7CC62;
}
}
+
+ .overtime_type{
+ display: flex;
+
+ .wea-browser{
+ margin-left: 16px;
+ min-width: 120px;
+ }
+
+ .wea-helpful-tip {
+ margin-left: 8px;
+ }
+
+ .ant-select-selection__choice__content{
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ width: 175px;
+ }
+ }
}
.basicSetting{
@@ -457,3 +477,19 @@
table-layout: fixed;
}
}
+
+.effectiveWrap{
+ height: 100%;
+
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .wea-form-item{
+ width: 70%;
+ }
+
+ .tips{
+ margin-left: 8px;
+ }
+}
diff --git a/pc4backstage/hrmAttendance/style/holidaySetting.css b/pc4backstage/hrmAttendance/style/holidaySetting.css
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/icon.less b/pc4backstage/hrmAttendance/style/icon.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/import.css b/pc4backstage/hrmAttendance/style/import.css
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/index.js b/pc4backstage/hrmAttendance/style/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/init.less b/pc4backstage/hrmAttendance/style/init.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/kqMonthReportSetting.less b/pc4backstage/hrmAttendance/style/kqMonthReportSetting.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/overtimeRule.less b/pc4backstage/hrmAttendance/style/overtimeRule.less
old mode 100644
new mode 100755
index 4abcb23..083f78c
--- a/pc4backstage/hrmAttendance/style/overtimeRule.less
+++ b/pc4backstage/hrmAttendance/style/overtimeRule.less
@@ -122,6 +122,11 @@
.required:after {
right: -10px;
}
+
+ .wea-select{
+ margin-left: 6px;
+ }
+
}
.overtime {
diff --git a/pc4backstage/hrmAttendance/style/scheduleSetting.less b/pc4backstage/hrmAttendance/style/scheduleSetting.less
old mode 100644
new mode 100755
index 6556e0a..10d3bbb
--- a/pc4backstage/hrmAttendance/style/scheduleSetting.less
+++ b/pc4backstage/hrmAttendance/style/scheduleSetting.less
@@ -137,7 +137,7 @@
.cell{
cursor: pointer;
width: 100%;
- height: 100%;
+ height: 30px;
&-disabled{
cursor: not-allowed;
}
@@ -164,6 +164,10 @@
margin-bottom: 5px;
border-radius: 5px;
}
+
+ .ant-table-fixed-left .ant-table-body-inner{
+ border: 1px solid #e9e9e9;
+ }
}
}
@@ -215,6 +219,25 @@
}
}
}
+
+ .sticky {
+ position: fixed;
+ top: 52px;
+ z-index: 1;
+ }
+
+ .index0{
+ z-index: 0;
+ }
+
+ .increase-content-height{
+ padding-bottom: 65px;
+ }
+
+ .cell-disabled{
+ cursor: not-allowed;
+ background-color: rgba(0, 0, 0, 0.0588235294117647);
+ }
}
.scheduleSetting-auth{
diff --git a/pc4backstage/hrmAttendance/style/shiftManager.css b/pc4backstage/hrmAttendance/style/shiftManager.css
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/shiftManager.less b/pc4backstage/hrmAttendance/style/shiftManager.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/test.less b/pc4backstage/hrmAttendance/style/test.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/upgrade.less b/pc4backstage/hrmAttendance/style/upgrade.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/vacationRemain.less b/pc4backstage/hrmAttendance/style/vacationRemain.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/vacationRule.less b/pc4backstage/hrmAttendance/style/vacationRule.less
old mode 100644
new mode 100755
index 9c48c68..26f539f
--- a/pc4backstage/hrmAttendance/style/vacationRule.less
+++ b/pc4backstage/hrmAttendance/style/vacationRule.less
@@ -127,4 +127,44 @@
}
}
}
+ .isprovince{
+ .wea-input-number ,
+ .wea-field-readonly {
+ margin: 0 6px;
+ }
+ }
+
+ .isprovince-table{
+ .wea-new-table{
+ margin-top: 8px;
+ border: 1px solid #d9d9d9;
+ border-bottom: 0;
+ }
+ }
+
+ .carryOverDays{
+ .wea-input-number{
+ width: 80px;
+ }
+ }
+}
+
+.hrm-vacation-province-form{
+ padding: 16px 30px;
+
+ .wea-form-item {
+ min-height: 30px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ box-sizing: content-box;
+ }
+}
+
+.hrm-vacation-province-dialog{
+ .wea-select .wea-select-input span{
+ white-space: initial;
+ }
+ .wea-select .wea-select-input{
+ white-space: initial;
+ }
}
\ No newline at end of file
diff --git a/pc4backstage/hrmAttendance/style/vacationType.less b/pc4backstage/hrmAttendance/style/vacationType.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/style/workflowSetting.less b/pc4backstage/hrmAttendance/style/workflowSetting.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/util/index.js b/pc4backstage/hrmAttendance/util/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/util/pulic-func.js b/pc4backstage/hrmAttendance/util/pulic-func.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/util/pure-util.js b/pc4backstage/hrmAttendance/util/pure-util.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/util/save-time-util.js b/pc4backstage/hrmAttendance/util/save-time-util.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmAttendance/util/sticky.js b/pc4backstage/hrmAttendance/util/sticky.js
new file mode 100755
index 0000000..929c806
--- /dev/null
+++ b/pc4backstage/hrmAttendance/util/sticky.js
@@ -0,0 +1,168 @@
+// 创建一个水平滚动跟随函数
+const createHorizontalScrollFollow = () => {
+ // 获取表格相关元素
+ const tableBody = document.querySelector('.ant-table-scroll .ant-table-body');
+ const tableHeader = document.querySelector('.ant-table-scroll thead');
+ const table = document.querySelector('.ant-table-scroll table');
+
+ const width = table.offsetWidth - 2;
+
+ // 滚动事件处理函数
+ const scrollHandler = () => {
+ const scrollLeft = -tableBody.scrollLeft;
+ tableHeader.style.transform = `translateX(${scrollLeft}px)`;
+ }
+
+ // 绑定滚动事件
+ const bindScroll = () => {
+ tableBody.addEventListener('scroll', scrollHandler);
+ const scrollLeft = -tableBody.scrollLeft;
+ tableHeader.style.transform = `translateX(${scrollLeft}px)`;
+ // 设置表头宽度与表格一致
+ tableHeader.style.width = `${width}px`;
+ }
+
+ // 取消绑定滚动事件
+ const unbindScroll = () => {
+ tableBody.removeEventListener('scroll', scrollHandler);
+ tableHeader.style.transform = 'initial';
+ tableHeader.style.width = 'initial';
+ }
+
+ // 返回绑定和取消绑定滚动事件的方法
+ return {
+ bindScroll,
+ unbindScroll,
+ width,
+ }
+};
+
+// 创建一个设置表头宽度的辅助函数
+const createHeaderWidthSetter = (tableWidth) => {
+ // 获取所有表头元素
+ const headers = document.querySelectorAll('.header')&&document.querySelectorAll('.header');
+
+ const cellWidth = document.querySelectorAll('.bodyCell')[0]&& document.querySelectorAll('.bodyCell')[0].getBoundingClientRect().width;
+
+ // 设置表头宽度
+ const setWidth = () => {
+ for (let i = 0; i < headers.length; i++) {
+ const header = headers[i];
+ header.style.width = `${cellWidth}px`;
+ }
+ }
+
+ // 清除表头宽度
+ const clearWidth = () => {
+ for (let i = 0; i < headers.length; i++) {
+ const header = headers[i];
+ header.style.width = 'initial';
+ }
+ }
+
+ // 返回设置和清除表头宽度的方法
+ return {
+ setWidth,
+ clearWidth,
+ }
+}
+
+/**
+ * 创建表格外层容器的边距设置器
+ * @returns {Object} 边距设置器对象，包含设置边距和清除边距的方法
+ */
+const createTableContainerMarginSetter = () => {
+ const tableContainerNode = document.querySelector('.table');
+ const style = tableContainerNode.style;
+
+ /**
+ * 设置表格外层容器的边距
+ */
+ const setMargin = () => {
+ style.marginLeft = '-10px';
+ style.marginRight = '-10px';
+ }
+
+ /**
+ * 清除表格外层容器的边距
+ */
+ const clearMargin = () => {
+ style.marginLeft = 'initial';
+ style.marginRight = 'initial';
+ }
+
+ return {
+ setMargin,
+ clearMargin,
+ }
+}
+
+function throttle(func, delay) {
+ let lastCall = 0;
+ return function(...args) {
+ const now = new Date().getTime();
+ if (now - lastCall < delay) {
+ return;
+ }
+ lastCall = now;
+ return func.apply(this, args);
+ };
+}
+
+/**
+* 监听滚动事件，为指定元素的表头添加 sticky 类
+* @param {string} element - 要监听滚动事件的元素选择器
+*/
+const sticky = (element) => {
+ const scrollHelper = createHorizontalScrollFollow();
+ const headerWidthSetter = createHeaderWidthSetter(scrollHelper.width);
+ const tableWpMarginSetter = createTableContainerMarginSetter();
+ const topComponentHeight = 52.36;
+
+ //是否添加了sticky
+ let isSticky = false;
+
+ // 监听滚动事件
+ document.querySelector(element).addEventListener('scroll', throttle(function (arg) {
+ const tables = document.querySelectorAll('table'); // 获取页面中所有的表格
+ const tableWp = document.querySelectorAll('.table')[0];
+
+ const { scrollHeight, clientHeight, scrollTop } = arg.srcElement;
+ const scrollDistanceFromBottom = scrollHeight - clientHeight - scrollTop;
+
+ const rect = tables[0].getBoundingClientRect(); // 获取第一个表格的位置信息
+ for (let i = 0; i < tables.length; i++) {
+ const table = tables[i];
+ const thead = table.querySelector('thead'); // 获取表格的表头元素
+ if (rect.top <= topComponentHeight && rect.bottom >= thead.offsetHeight) {
+ if (isSticky) return;
+ // 当第一个表格的顶部超出视口顶部且底部超出表头高度时，为表头添加 sticky 类
+ thead.classList.add('sticky');
+ if (i == 1) {
+ thead.classList.add('index0');
+ isSticky = true;
+ }
+ if(scrollDistanceFromBottom < 30){
+ tableWp.classList.add('increase-content-height');
+ }
+ scrollHelper.bindScroll();
+ headerWidthSetter.setWidth();
+ tableWpMarginSetter.setMargin();
+ } else {
+ if (!isSticky) return;
+ // 否则移除 sticky 类
+ thead.classList.remove('sticky');
+ tableWp.classList.remove('increase-content-height');
+ if (i == 1) {
+ thead.classList.remove('index0');
+ isSticky = false;
+ }
+ scrollHelper.unbindScroll();
+ headerWidthSetter.clearWidth();
+ tableWpMarginSetter.clearMargin();
+ }
+ }
+ },0));
+}
+
+export default sticky;
\ No newline at end of file
diff --git a/pc4backstage/hrmComsPublic/apis/common.js b/pc4backstage/hrmComsPublic/apis/common.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/components/AdvanceSearchFormInfo.js b/pc4backstage/hrmComsPublic/components/AdvanceSearchFormInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/components/Calendar.js b/pc4backstage/hrmComsPublic/components/Calendar.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/components/FormInfo.js b/pc4backstage/hrmComsPublic/components/FormInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/components/OrganizationTree.js b/pc4backstage/hrmComsPublic/components/OrganizationTree.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/components/Tabs.js b/pc4backstage/hrmComsPublic/components/Tabs.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/components/index.js b/pc4backstage/hrmComsPublic/components/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/index.js b/pc4backstage/hrmComsPublic/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/public/i18n.js b/pc4backstage/hrmComsPublic/public/i18n.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/public/logType.js b/pc4backstage/hrmComsPublic/public/logType.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/stores/baseStore.js b/pc4backstage/hrmComsPublic/stores/baseStore.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmComsPublic/style/calendar.less b/pc4backstage/hrmComsPublic/style/calendar.less
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/adareaset.js b/pc4backstage/hrmengine/apis/adareaset.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/adminAreaDisplaySetting.js b/pc4backstage/hrmengine/apis/adminAreaDisplaySetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/adminDecentralization.js b/pc4backstage/hrmengine/apis/adminDecentralization.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/annual.js b/pc4backstage/hrmengine/apis/annual.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/appDetach.js b/pc4backstage/hrmengine/apis/appDetach.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/archiveLogView.js b/pc4backstage/hrmengine/apis/archiveLogView.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/assImple.js b/pc4backstage/hrmengine/apis/assImple.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/assItem.js b/pc4backstage/hrmengine/apis/assItem.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/assType.js b/pc4backstage/hrmengine/apis/assType.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/attendance.js b/pc4backstage/hrmengine/apis/attendance.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/attendanceSetting.js b/pc4backstage/hrmengine/apis/attendanceSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/authAdjust.js b/pc4backstage/hrmengine/apis/authAdjust.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/authSearch.js b/pc4backstage/hrmengine/apis/authSearch.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/authorizationSetting.js b/pc4backstage/hrmengine/apis/authorizationSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/avatarSetting.js b/pc4backstage/hrmengine/apis/avatarSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/basicImport.js b/pc4backstage/hrmengine/apis/basicImport.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/batchAdjust.js b/pc4backstage/hrmengine/apis/batchAdjust.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/batchEdit.js b/pc4backstage/hrmengine/apis/batchEdit.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/batchMaintenance.js b/pc4backstage/hrmengine/apis/batchMaintenance.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/batchUpload.js b/pc4backstage/hrmengine/apis/batchUpload.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/birthdayRemind.js b/pc4backstage/hrmengine/apis/birthdayRemind.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/browserDisplayField.js b/pc4backstage/hrmengine/apis/browserDisplayField.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/cardItemSet.js b/pc4backstage/hrmengine/apis/cardItemSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/city.js b/pc4backstage/hrmengine/apis/city.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/common.js b/pc4backstage/hrmengine/apis/common.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/contractExpireWarning.js b/pc4backstage/hrmengine/apis/contractExpireWarning.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/contractMaintain.js b/pc4backstage/hrmengine/apis/contractMaintain.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/contractTemplate.js b/pc4backstage/hrmengine/apis/contractTemplate.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/contractType.js b/pc4backstage/hrmengine/apis/contractType.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/country.js b/pc4backstage/hrmengine/apis/country.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/county.js b/pc4backstage/hrmengine/apis/county.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/decentralizationAdminSet.js b/pc4backstage/hrmengine/apis/decentralizationAdminSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/dismiss.js b/pc4backstage/hrmengine/apis/dismiss.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/duty.js b/pc4backstage/hrmengine/apis/duty.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/dutyType.js b/pc4backstage/hrmengine/apis/dutyType.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/edu.js b/pc4backstage/hrmengine/apis/edu.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/education.js b/pc4backstage/hrmengine/apis/education.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/edulevel.js b/pc4backstage/hrmengine/apis/edulevel.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/elseSetting.js b/pc4backstage/hrmengine/apis/elseSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/employDemand.js b/pc4backstage/hrmengine/apis/employDemand.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/enginegroup.js b/pc4backstage/hrmengine/apis/enginegroup.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/entryMaintenance.js b/pc4backstage/hrmengine/apis/entryMaintenance.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/formal.js b/pc4backstage/hrmengine/apis/formal.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/funcManageDecent.js b/pc4backstage/hrmengine/apis/funcManageDecent.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/importorg.js b/pc4backstage/hrmengine/apis/importorg.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/importresource.js b/pc4backstage/hrmengine/apis/importresource.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/leaveType.js b/pc4backstage/hrmengine/apis/leaveType.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/levelProtection.js b/pc4backstage/hrmengine/apis/levelProtection.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/limitedAnalysis.js b/pc4backstage/hrmengine/apis/limitedAnalysis.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/loginFailLog.js b/pc4backstage/hrmengine/apis/loginFailLog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/loginLog.js b/pc4backstage/hrmengine/apis/loginLog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/majorset.js b/pc4backstage/hrmengine/apis/majorset.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/matrix.js b/pc4backstage/hrmengine/apis/matrix.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/moduleManage.js b/pc4backstage/hrmengine/apis/moduleManage.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/normalLog.js b/pc4backstage/hrmengine/apis/normalLog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/officeLocation.js b/pc4backstage/hrmengine/apis/officeLocation.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/officeaddress.js b/pc4backstage/hrmengine/apis/officeaddress.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/onlineAnalysis.js b/pc4backstage/hrmengine/apis/onlineAnalysis.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/onlineAttendance.js b/pc4backstage/hrmengine/apis/onlineAttendance.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/orgChart.js b/pc4backstage/hrmengine/apis/orgChart.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/orgFieldDisplaySetting.js b/pc4backstage/hrmengine/apis/orgFieldDisplaySetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/organization.js b/pc4backstage/hrmengine/apis/organization.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/organizationvirtual.js b/pc4backstage/hrmengine/apis/organizationvirtual.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/otherSetting.js b/pc4backstage/hrmengine/apis/otherSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/paidLeave.js b/pc4backstage/hrmengine/apis/paidLeave.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/paidLeaveManager.js b/pc4backstage/hrmengine/apis/paidLeaveManager.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/payrollManagement.js b/pc4backstage/hrmengine/apis/payrollManagement.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/payrollSending.js b/pc4backstage/hrmengine/apis/payrollSending.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/personalSalaryAdjustment.js b/pc4backstage/hrmengine/apis/personalSalaryAdjustment.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/post.js b/pc4backstage/hrmengine/apis/post.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/posts.js b/pc4backstage/hrmengine/apis/posts.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/privacySetting.js b/pc4backstage/hrmengine/apis/privacySetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/province.js b/pc4backstage/hrmengine/apis/province.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/quit.js b/pc4backstage/hrmengine/apis/quit.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/recruitInfo.js b/pc4backstage/hrmengine/apis/recruitInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/recruitLibrary.js b/pc4backstage/hrmengine/apis/recruitLibrary.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/recruitPlan.js b/pc4backstage/hrmengine/apis/recruitPlan.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/rehire.js b/pc4backstage/hrmengine/apis/rehire.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/renew.js b/pc4backstage/hrmengine/apis/renew.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/resourceIndex.js b/pc4backstage/hrmengine/apis/resourceIndex.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/retire.js b/pc4backstage/hrmengine/apis/retire.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/roleSetting.js b/pc4backstage/hrmengine/apis/roleSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/rpManage.js b/pc4backstage/hrmengine/apis/rpManage.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/rpType.js b/pc4backstage/hrmengine/apis/rpType.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/salaryApplySet.js b/pc4backstage/hrmengine/apis/salaryApplySet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/salaryBank.js b/pc4backstage/hrmengine/apis/salaryBank.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/salaryIndexMaintenance.js b/pc4backstage/hrmengine/apis/salaryIndexMaintenance.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/salaryIndexSetting.js b/pc4backstage/hrmengine/apis/salaryIndexSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/salaryItemsSet.js b/pc4backstage/hrmengine/apis/salaryItemsSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/sanyuan.js b/pc4backstage/hrmengine/apis/sanyuan.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/schedule.js b/pc4backstage/hrmengine/apis/schedule.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/secAdminLog.js b/pc4backstage/hrmengine/apis/secAdminLog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/secAuditorLog.js b/pc4backstage/hrmengine/apis/secAuditorLog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/securitySetting.js b/pc4backstage/hrmengine/apis/securitySetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/sensitiveWord.js b/pc4backstage/hrmengine/apis/sensitiveWord.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/serialNumber.js b/pc4backstage/hrmengine/apis/serialNumber.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/signatureManagement.js b/pc4backstage/hrmengine/apis/signatureManagement.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/singleEducation.js b/pc4backstage/hrmengine/apis/singleEducation.js
new file mode 100755
index 0000000..25bc3e4
--- /dev/null
+++ b/pc4backstage/hrmengine/apis/singleEducation.js
@@ -0,0 +1,15 @@
+import {
+ WeaTools
+} from 'ecCom'
+
+export const getRight = (params) => {
+ return WeaTools.callApi('/api/hrm/edulevel/getHasRight', 'GET', params);
+}
+
+export const getEducationForm = (params) => {
+ return WeaTools.callApi('/api/hrm/edulevel/getEduForm?is_multilang_set=true', 'GET', params);
+}
+
+export const saveEducationForm = (params) => {
+ return WeaTools.callApi('/api/hrm/edulevel/edit', 'POST', params);
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/apis/singleJob.js b/pc4backstage/hrmengine/apis/singleJob.js
new file mode 100755
index 0000000..c3e6778
--- /dev/null
+++ b/pc4backstage/hrmengine/apis/singleJob.js
@@ -0,0 +1,23 @@
+import {
+ WeaTools
+} from 'ecCom'
+
+export const getRight = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getHasRight', 'GET', params);
+}
+
+export const getJobForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getJobActivityForm?is_multilang_set=true', 'GET', params);
+}
+
+export const getJobGroupForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getJobGroupForm?is_multilang_set=true', 'GET', params);
+}
+
+export const saveJobForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/editeJobActivity', 'POST', params);
+}
+
+export const saveJobGroupForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/addJobGroup', 'POST', params);
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/apis/singleMajor.js b/pc4backstage/hrmengine/apis/singleMajor.js
new file mode 100755
index 0000000..1296560
--- /dev/null
+++ b/pc4backstage/hrmengine/apis/singleMajor.js
@@ -0,0 +1,15 @@
+import {
+ WeaTools
+} from 'ecCom'
+
+export const getRight = (params) => {
+ return WeaTools.callApi('/api/hrm/speciality/getHasRight', 'GET', params);
+}
+
+export const getMajorForm = (params) => {
+ return WeaTools.callApi('/api/hrm/speciality/getSpecialityForm?is_multilang_set=true', 'GET', params);
+}
+
+export const saveMajorForm = (params) => {
+ return WeaTools.callApi('/api/hrm/speciality/edit', 'POST', params);
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/apis/singlePost.js b/pc4backstage/hrmengine/apis/singlePost.js
new file mode 100755
index 0000000..0b35a0a
--- /dev/null
+++ b/pc4backstage/hrmengine/apis/singlePost.js
@@ -0,0 +1,31 @@
+import {
+ WeaTools
+} from 'ecCom'
+
+export const getRight = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getHasRight', 'GET', params);
+}
+
+export const getJobGroupForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getJobGroupForm?is_multilang_set=true', 'GET', params);
+}
+
+export const getJobForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getJobActivityForm?is_multilang_set=true', 'GET', params);
+}
+
+export const getPostForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/getJobTitleForm?is_multilang_set=true', 'GET', params);
+}
+
+export const savePostForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/addJobTitle', 'POST', params);
+}
+
+export const saveJobForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/addJobActivity', 'POST', params);
+}
+
+export const saveJobGroupForm = (params) => {
+ return WeaTools.callApi('/api/hrm/job/addJobGroup', 'POST', params);
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/apis/singleWorkNature.js b/pc4backstage/hrmengine/apis/singleWorkNature.js
new file mode 100755
index 0000000..e684710
--- /dev/null
+++ b/pc4backstage/hrmengine/apis/singleWorkNature.js
@@ -0,0 +1,15 @@
+import {
+ WeaTools
+} from 'ecCom'
+
+export const getRight = (params) => {
+ return WeaTools.callApi('/api/hrm/usekind/getHasRight', 'GET', params);
+}
+
+export const getWorkNatureForm = (params) => {
+ return WeaTools.callApi('/api/hrm/usekind/getUseKindForm?is_multilang_set=true', 'GET', params);
+}
+
+export const saveWorkNatureForm = (params) => {
+ return WeaTools.callApi('/api/hrm/usekind/edit', 'POST', params);
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/apis/specialty.js b/pc4backstage/hrmengine/apis/specialty.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/staffCareReminder.js b/pc4backstage/hrmengine/apis/staffCareReminder.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/subCompanyFieldDef.js b/pc4backstage/hrmengine/apis/subCompanyFieldDef.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/systemAdminLog.js b/pc4backstage/hrmengine/apis/systemAdminLog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/test.js b/pc4backstage/hrmengine/apis/test.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/title.js b/pc4backstage/hrmengine/apis/title.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/titleset.js b/pc4backstage/hrmengine/apis/titleset.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/trainActivity.js b/pc4backstage/hrmengine/apis/trainActivity.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/trainArrange.js b/pc4backstage/hrmengine/apis/trainArrange.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/trainPlan.js b/pc4backstage/hrmengine/apis/trainPlan.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/trainResource.js b/pc4backstage/hrmengine/apis/trainResource.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/trainTypes.js b/pc4backstage/hrmengine/apis/trainTypes.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/transfer.js b/pc4backstage/hrmengine/apis/transfer.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/trial.js b/pc4backstage/hrmengine/apis/trial.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/unitSet.js b/pc4backstage/hrmengine/apis/unitSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/workHour.js b/pc4backstage/hrmengine/apis/workHour.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/workNatureExcerpt.js b/pc4backstage/hrmengine/apis/workNatureExcerpt.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/workflow.js b/pc4backstage/hrmengine/apis/workflow.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/workingDayAdjust.js b/pc4backstage/hrmengine/apis/workingDayAdjust.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/apis/worknature.js b/pc4backstage/hrmengine/apis/worknature.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/EduLevel.js b/pc4backstage/hrmengine/components/EduLevel.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/Home.js b/pc4backstage/hrmengine/components/Home.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/HrmTest.js b/pc4backstage/hrmengine/components/HrmTest.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/ResourceIndex.js b/pc4backstage/hrmengine/components/ResourceIndex.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/adminAreaDisplaySetting/index.js b/pc4backstage/hrmengine/components/adminAreaDisplaySetting/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/adminDecentralization/index.js b/pc4backstage/hrmengine/components/adminDecentralization/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/period/DataList.js b/pc4backstage/hrmengine/components/annualLeave/period/DataList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/period/index.js b/pc4backstage/hrmengine/components/annualLeave/period/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/rule/DataList.js b/pc4backstage/hrmengine/components/annualLeave/rule/DataList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/rule/index.js b/pc4backstage/hrmengine/components/annualLeave/rule/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/setting/DataList.js b/pc4backstage/hrmengine/components/annualLeave/setting/DataList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/setting/Import.js b/pc4backstage/hrmengine/components/annualLeave/setting/Import.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/setting/TabPane.js b/pc4backstage/hrmengine/components/annualLeave/setting/TabPane.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/annualLeave/setting/index.js b/pc4backstage/hrmengine/components/annualLeave/setting/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/appDetach/DetachEdit.js b/pc4backstage/hrmengine/components/appDetach/DetachEdit.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/appDetach/DetachList.js b/pc4backstage/hrmengine/components/appDetach/DetachList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/appDetach/GlobalSetting.js b/pc4backstage/hrmengine/components/appDetach/GlobalSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/appDetach/index.js b/pc4backstage/hrmengine/components/appDetach/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/archiveLogView/index.js b/pc4backstage/hrmengine/components/archiveLogView/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/area/Area.js b/pc4backstage/hrmengine/components/area/Area.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/area/AreaTable.js b/pc4backstage/hrmengine/components/area/AreaTable.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/area/BriefInfo.js b/pc4backstage/hrmengine/components/area/BriefInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/area/Import.js b/pc4backstage/hrmengine/components/area/Import.js
new file mode 100755
index 0000000..677372a
--- /dev/null
+++ b/pc4backstage/hrmengine/components/area/Import.js
@@ -0,0 +1,222 @@
+import {
+ WeaUpload,
+ WeaDialog,
+ WeaSearchGroup,
+ WeaMoreButton,
+ WeaFormItem,
+} from 'ecCom'
+
+import {
+ Row,
+ Col,
+ Button,
+} from 'antd'
+
+import {
+ WeaSwitch
+} from 'comsMobx'
+
+import {
+ IEVersion
+} from '../../public/pulic-func'
+
+import {
+ i18n
+} from '../../public/i18n';
+
+export default class Import extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ width: 880,
+ height: 510,
+ isPanelShow: false,
+ list: [],
+ upStatus: '',
+ }
+ }
+
+ setPanelStatus(bool) {
+ this.setState({
+ isPanelShow: bool,
+ list: []
+ });
+ }
+
+
+ getForm() {
+ const {
+ condition
+ } = this.props;
+ let _arr = [];
+
+ condition.map((c, i) => {
+ let arr = [];
+ if (i == 0) { //基本信息
+ c.items.map((field, index) => {
+ arr.push({
+ com: (
+
+ form.updateFields({ isprovince: { value: e.target.value } })} value={formParams.isprovince}>
+ {
+ field.options.map((option, index) => {
+ return (
+
+
+ {(option.key == '1') ? (
+
+ {getLabel('546843','孩子')}
+ {
+ form.updateFields(v)
+ }
+ }
+ />
+ {getLabel('546846','周岁前，')}
+ {getLabel('546975','发放固定{param}数').replace('{param}',this.unitName || getLabel('391',"小时"))}
+ {
+ form.updateFields(v)
+ }
+ }
+ />
+ {this.unitName || getLabel('391',"小时")}
+
+ ) : option.showname}
+
+
+ )
+ })
+ }
+
+ {formParams.isprovince == '2' && (
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ ),
+ colSpan: 1,
+ })
+ })
+ }
+ if (i == 1) { //导入说明
+ c.items.map((field, index) => {
+ arr.push({
+ com: (
+
+
+
+
+
+ {index + 1}
+
+
+ {this.getDom(field.domkey, field.value)}
+
+
+
+
+
+
+
+ ),
+ colSpan: 1
+ })
+ })
+ }
+ _arr.push(
+
+
+ {index + 1}
+
+
)
+ }
+ return dom;
+ }
+
+ getIllustration(val, url, index) {
+ const {
+ templetName
+ } = this.props;
+ let p;
+ if (index == 0) {
+ p = (
+ {this.setList(l); setExcelFile(id)}}
+ onUploading={s => this.onUploading(s)}
+ >
+
+
+
+
+ { list.length == 0 ?
+ {i18n.label.noFileSelected()}
: list.map(file =>{file.filename}
) } +{i18n.label.downloadTemplateFirst()}{templetName}
); + } else { + p = ({val}
); + } + return p; + } + + onUploading(s) { + const { + list + } = this.state; + + this.setUpStatus(s); + if (s == 'uploading') { + this.setList([]); + } else { + this.setList(list); + } + } + + setList(list) { + this.setState({ + list: list + }); + } + + setUpStatus(upStatus) { + this.setState({ + upStatus: upStatus + }); + } + + render() { + const { + title, + visible, + submit, + importHistoryQuery, + onCancel + } = this.props; + const { + width + } = this.state; + + const buttons = [ + (), + (), + (
+
+ {
+
+
+ )
+ })
+ })
+
+ return
+
+
+
+
+ {datas.sessionkey ?
+
: ''}
+
+ {datas.resultHint}
+
+
+ index}
+ getColumns={c => this.reRenderColumns(c)}
+ />
+
+
+
: ''
+ }
+
+
+
+
+ {datas.failHint}
+
+
+
+ }
+
+
+ selectedAllFormFields('resourceForm', v)}/>
+
+ {
+ resourceForm != null
+ &&
+
+ {selectedOrg}
+
+ {arr}
+ }
+
+ handleChange = (cb) => {}
+
+ getDropMenuDatas = () => {
+ const {
+ hrmConExWarning
+ } = this.props, {
+ subForm
+ } = hrmConExWarning, {
+ loading
+ } = subForm;
+
+ const menu = [{
+ key: '0',
+ icon: ,
+ content: i18n.button.save(),
+ disabled: loading,
+ }];
+
+ return menu
+ }
+
+ handleMenuClick = (key) => {
+ const {
+ hrmConExWarning,
+ } = this.props, {
+ save,
+ } = hrmConExWarning;
+
+ key == '0' && save();
+ }
+
+ render() {
+ const {
+ hrmConExWarning,
+ } = this.props, {
+ subForm,
+ } = hrmConExWarning, {
+ date,
+ loading,
+ } = subForm;
+
+ return (
+ {loading ? this.handleMenuClick(key)}>
+
+ }
+
)
+ }
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/components/contractExpireWarning/Table.js b/pc4backstage/hrmengine/components/contractExpireWarning/Table.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractExpireWarning/index.js b/pc4backstage/hrmengine/components/contractExpireWarning/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/DialogContent.js b/pc4backstage/hrmengine/components/contractMaintain/DialogContent.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/FormInfo.js b/pc4backstage/hrmengine/components/contractMaintain/FormInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/Header.js b/pc4backstage/hrmengine/components/contractMaintain/Header.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/LeftTree.js b/pc4backstage/hrmengine/components/contractMaintain/LeftTree.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/MainDialog.js b/pc4backstage/hrmengine/components/contractMaintain/MainDialog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/MainTable.js b/pc4backstage/hrmengine/components/contractMaintain/MainTable.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/RichText.js b/pc4backstage/hrmengine/components/contractMaintain/RichText.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/Tab.js b/pc4backstage/hrmengine/components/contractMaintain/Tab.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractMaintain/index.js b/pc4backstage/hrmengine/components/contractMaintain/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractTemplate/Header.js b/pc4backstage/hrmengine/components/contractTemplate/Header.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractTemplate/LeftTree.js b/pc4backstage/hrmengine/components/contractTemplate/LeftTree.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractTemplate/MainDialog.js b/pc4backstage/hrmengine/components/contractTemplate/MainDialog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractTemplate/MainTable.js b/pc4backstage/hrmengine/components/contractTemplate/MainTable.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractTemplate/Tab.js b/pc4backstage/hrmengine/components/contractTemplate/Tab.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractTemplate/index.js b/pc4backstage/hrmengine/components/contractTemplate/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/FormInfo.js b/pc4backstage/hrmengine/components/contractType/FormInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/Header.js b/pc4backstage/hrmengine/components/contractType/Header.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/LeftTree.js b/pc4backstage/hrmengine/components/contractType/LeftTree.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/MainDialog.js b/pc4backstage/hrmengine/components/contractType/MainDialog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/MainTable.js b/pc4backstage/hrmengine/components/contractType/MainTable.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/Tab.js b/pc4backstage/hrmengine/components/contractType/Tab.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/contractType/index.js b/pc4backstage/hrmengine/components/contractType/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/decentralizationAdminSet/HocFactory.js b/pc4backstage/hrmengine/components/decentralizationAdminSet/HocFactory.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/decentralizationAdminSet/SecuritySet.js b/pc4backstage/hrmengine/components/decentralizationAdminSet/SecuritySet.js
old mode 100644
new mode 100755
index 9bde092..ab4c5a5
--- a/pc4backstage/hrmengine/components/decentralizationAdminSet/SecuritySet.js
+++ b/pc4backstage/hrmengine/components/decentralizationAdminSet/SecuritySet.js
@@ -64,17 +64,30 @@ export default class SecuritySet extends React.Component {
checkboxValue,
} = this.props;
- const {userUsbType} = form.getFormParams();
+ const {userUsbType,usbstate,needauto} = form.getFormParams();
let arr = [];
isFormInit && condition.map(c => {
c.items.map((field, index) => {
let key = field.domkey[0];
+
+
if (userUsbType == '6' && !['userUsbType','usbstate'].includes(key)) {
return
}
- if(userUsbType === '7' && ['needauto', 'enableDate', 'enableUsbType', 'mobile', 'tokenKey', 'serial', 'selectdateselect'].includes(key)) return;
+ if (userUsbType == '901' && usbstate=='0' &&['selectdateselect' ].includes(key)) return;
+
+ if (needauto=='0' &&['selectdateselect' ].includes(key)) return;
+
+
+ if (userUsbType == '901' && [ 'enableDate', 'enableUsbType', 'mobile', 'tokenKey', 'serial'].includes(key)) return;
+
+
+ if(userUsbType === '7' && [ 'enableDate', 'enableUsbType', 'mobile', 'tokenKey', 'serial'].includes(key)) return;
+
+ if(userUsbType === '7' && [ 'enableDate', 'enableUsbType', 'mobile', 'tokenKey', 'serial'].includes(key)) return;
+
if (!verifyTypeSelectedValue && key !== 'userUsbType') {
return;
@@ -106,6 +119,19 @@ export default class SecuritySet extends React.Component {
if (verifyTypeSelectedValue == '3' && useTypeSelectedValue == '1' && checkboxValue == '1' && (key !== 'userUsbType' && key !== 'usbstate' && key !== 'tokenKey' && key !== 'needauto' && key !== 'selectdate' && key !== 'enableUsbType')) {
return;
}
+ if (verifyTypeSelectedValue == '901' && checkboxValue == '0' && (key !== 'userUsbType' && key !== 'usbstate' && key !== 'needauto' && key !== 'enableUsbType')) {
+ return;
+ }
+ if (verifyTypeSelectedValue == '901' && useTypeSelectedValue == '0' &&key == 'needauto' ) {
+ return;
+ }
+ if (verifyTypeSelectedValue == '901'&& useTypeSelectedValue == '0' && key=='selectdate' && (key !== 'userUsbType' && key !== 'usbstate' && key !== 'needauto' && key !== 'enableUsbType')) {
+ return;
+ }
+ if(key == 'usbstate'){
+ if(verifyTypeSelectedValue=='901'){
+ field.options.splice(2,1)
+ }}
arr.push(
+
+ :
+ {this.getForm()}
+
+
+
+
+
+ ),
+ colSpan: 1,
+ })
+ })
+ }
+ if (i == 1) { //导入说明
+ c.items.map((field, index) => {
+ arr.push({
+ com: (
+
+
+
+
+
+ {index + 1}
+
+
+ {this.getDom(field.domkey, field.value)}
+
+
+
+
+
+
+
+ ),
+ colSpan: 1
+ })
+ })
+ }
+ _arr.push(
+
+
+ {index + 1}
+
+
)
+ }
+ return dom;
+ }
+
+ getIllustration(val, url, index) {
+ const {
+ templetName
+ } = this.props;
+
+ let p;
+ if (index == 0) {
+ p = (
+ {this.setList(l); setExcelFileNo(id)}}
+ onUploading={s => this.onUploading(s)}
+ >
+
+
+
+
+ { list.length == 0 ?
+ {i18n.label.noFileSelected()}
: list.map(file =>{file.filename}
) } +{i18n.label.downloadTemplateFirst()}{templetName}
); + } else { + p = ({val}
); + } + return p; + } + + onUploading(s) { + const { + list + } = this.state; + + this.setUpStatus(s); + if (s == 'uploading') { + this.setList([]); + } else { + this.setList(list); + } + } + + setList(list) { + this.setState({ + list: list + }); + } + + setUpStatus(upStatus) { + this.setState({ + upStatus: upStatus + }); + } + + getButtons() { + const { + submit, + importHistoryQuery + } = this.props; + + return [ + (), + (), + (
+
+ :
+ {this.getForm()}
+
+ }
+
+
+ {
+
+
+ )
+ })
+ })
+
+ if (loading) {
+ return (
+
+
+ )
+ } else {
+ return
+
+
+
+
+ {datas.sessionkey ?
+
: ''}
+
+ {datas.resultHint}
+
+
+ index}
+ getColumns={c => this.reRenderColumns(c)}
+ />
+
+
+
: ''
+ }
+
+
+
+
+ {datas.failHint}
+
+
+
+
+ ),
+ colSpan: 1,
+ })
+ })
+ }
+ if (i == 1) { //导入说明
+ c.items.map((field, index) => {
+ arr.push({
+ com: (
+
+
+
+
+
+ {index + 1}
+
+
+ {this.getDom(field.domkey, field.value)}
+
+
+
+
+
+
+
+ ),
+ colSpan: 1
+ })
+ })
+ }
+ _arr.push(
+
+
+ {index + 1}
+
+
)
+ }
+ return dom;
+ }
+
+ getIllustration(val, url, index) {
+ const {
+ templetName
+ } = this.props;
+
+ let p;
+ if (index == 0) {
+ p = (
+ {this.setList(l); setExcelFileNo(id)}}
+ onUploading={s => this.onUploading(s)}
+ >
+
+
+
+
+ { list.length == 0 ?
+ {i18n.label.noFileSelected()}
: list.map(file =>{file.filename}
) } +{i18n.label.downloadTemplateFirst()}{templetName}
); + } else { + p = ({val}
); + } + return p; + } + + onUploading(s) { + const { + list + } = this.state; + + this.setUpStatus(s); + if (s == 'uploading') { + this.setList([]); + } else { + this.setList(list); + } + } + + setList(list) { + this.setState({ + list: list + }); + } + + setUpStatus(upStatus) { + this.setState({ + upStatus: upStatus + }); + } + + getButtons() { + const { + submit, + importHistoryQuery + } = this.props; + + return [ + (), + (), + (
+
+ : this.getForm()
+ }
+
+
+ {
+
+
+ )
+ })
+ })
+
+ if (loading) {
+ return (
+
+
+ )
+ } else {
+ return
+
+
+
+
+ {datas.sessionkey ?
+
: ''}
+
+ {datas.resultHint}
+
+
+ index}
+ getColumns={c => this.reRenderColumns(c)}
+ />
+
+
+
: ''
+ }
+
+
+
+
+ {datas.failHint}
+
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/FormInfo.js b/pc4backstage/hrmengine/components/salaryItemsSet/FormInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/FormulaSet.js b/pc4backstage/hrmengine/components/salaryItemsSet/FormulaSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/Header.js b/pc4backstage/hrmengine/components/salaryItemsSet/Header.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/ItemsSet.js b/pc4backstage/hrmengine/components/salaryItemsSet/ItemsSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/LeftTree.js b/pc4backstage/hrmengine/components/salaryItemsSet/LeftTree.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/LevelSet.js b/pc4backstage/hrmengine/components/salaryItemsSet/LevelSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/MainDialog.js b/pc4backstage/hrmengine/components/salaryItemsSet/MainDialog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/MainTableInfo.js b/pc4backstage/hrmengine/components/salaryItemsSet/MainTableInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/SalaryItemsSet.js b/pc4backstage/hrmengine/components/salaryItemsSet/SalaryItemsSet.js
new file mode 100755
index 0000000..9d6abec
--- /dev/null
+++ b/pc4backstage/hrmengine/components/salaryItemsSet/SalaryItemsSet.js
@@ -0,0 +1,288 @@
+import {
+ inject,
+ observer,
+} from 'mobx-react'
+import {
+ toJS
+} from 'mobx';
+import {
+ WeaFormItem,
+ WeaRightMenu,
+ WeaInputNumber,
+ WeaSearchGroup,
+} from 'ecCom'
+import {
+ Spin,
+ Modal,
+ Button,
+} from 'antd'
+import {
+ i18n
+} from '../../public/i18n';
+const confirm = Modal.confirm;
+
+import FormInfo from './FormInfo';
+import FormulaSet from './FormulaSet';
+import LevelSet from './LevelSet';
+import BenchmarkSet from './BenchmarkSet';
+import TaxRateSet from './TaxRateSet';
+
+@inject('hrmSalaryItemsSet')
+@observer
+export default class SalaryItemsSet extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ componentDidMount() {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ getFormInfo,
+ addTableEdit,
+ } = hrmSalaryItemsSet;
+
+ getFormInfo();
+ addTableEdit();
+ }
+
+ getDropMenuDatas = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ formInfo
+ } = hrmSalaryItemsSet, {
+ loading
+ } = formInfo;
+
+ const menu = [{
+ key: '0',
+ icon: ,
+ content: i18n.button.save(),
+ disabled: loading,
+ }];
+
+ return menu
+ }
+
+ handleMenuClick = (key) => {
+ const {
+ hrmSalaryItemsSet,
+ } = this.props, {
+ save,
+ } = hrmSalaryItemsSet;
+
+ key == '0' && save();
+ }
+
+ getGroupTwoTitle = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ formInfo
+ } = hrmSalaryItemsSet, {
+ itemType
+ } = formInfo;
+
+ let title;
+ if (itemType == '1') title = i18n.label.levelSet();
+ if (itemType == '3') title = i18n.label.taxRateSet();
+ if (itemType == '4' || itemType == '9') title = i18n.label.formulaSet();
+
+ return title;
+ }
+
+ getChildren = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ formInfo
+ } = hrmSalaryItemsSet, {
+ itemType
+ } = formInfo;
+
+ if (itemType == '1') { //工资
+ return
+ {compProps && changeCascaderValue(cb)}/>}
+
+
+
+
+
+
+
+ {items.map( (item, index) => {
+ return
+ this.clickKeyboard(item, index)}>{item}
+ })}
+
+ {this.percentCom()}
+
+ )
+ }
+ }
+
+ percentCom = () => { //个人、公司百分比
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ welfareCal,
+ setWelfareCalPercent,
+ } = hrmSalaryItemsSet, {
+ personalPercent,
+ companyPercent,
+ } = welfareCal;
+
+ return (
+
+
+ setWelfareCalPercent(val,'personal')}
+ />
+ {'%'}
+
+
+ setWelfareCalPercent(val,'company')}
+ />
+ {'%'}
+
+
+ )
+ }
+
+ getAddFunc = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ addTableEdit, //新增公式设置
+ addTaxRate, //新增税率设置
+ formInfo,
+ } = hrmSalaryItemsSet, {
+ itemType
+ } = formInfo;
+
+ if (itemType == '3') { //税收
+ addTaxRate();
+ } else if (itemType == '4') { //计算
+ addTableEdit();
+ }
+ }
+
+ getCustomComponent = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ deleteTableEdit,
+ } = hrmSalaryItemsSet;
+
+ let len = 0;
+
+ return (
+ this.getAddFunc()}/>
+ this.deleteTableEdit()}/>
+
)
+ }
+
+ isSelected = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ tableEdit
+ } = hrmSalaryItemsSet;
+
+ return toJS(tableEdit.cbStatus).some(val => val == '1')
+ }
+
+ deleteTableEdit = () => {
+ this.showConfirm();
+ }
+
+ showConfirm = () => {
+ let _this = this;
+ confirm({
+ title: i18n.confirm.defaultTitle(),
+ content: i18n.confirm.batchDeleteConfirm(),
+ okText: i18n.button.ok(),
+ cancelText: i18n.button.cancel(),
+ onOk() {
+ _this.onOk()
+ },
+ onCancel() {
+ return false
+ },
+ });
+ }
+
+ onOk = () => {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ changeTableEditStatus,
+ formInfo,
+ } = hrmSalaryItemsSet, {
+ itemType
+ } = formInfo;
+
+ if (itemType == '3') { //税收
+ changeTableEditStatus('tax');
+ } else if (itemType == '4') { //计算
+ changeTableEditStatus('count');
+ }
+ }
+
+
+ render() {
+ const {
+ hrmSalaryItemsSet
+ } = this.props, {
+ formInfo
+ } = hrmSalaryItemsSet, {
+ loading,
+ itemType
+ } = formInfo;
+
+ return (
+
+ {loading ? this.handleMenuClick(key)}>
+
+ }
+
+ )
+
+ }
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/Search.js b/pc4backstage/hrmengine/components/salaryItemsSet/Search.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/StandardSet.js b/pc4backstage/hrmengine/components/salaryItemsSet/StandardSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/SubDialog.js b/pc4backstage/hrmengine/components/salaryItemsSet/SubDialog.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/TaxRateSet.js b/pc4backstage/hrmengine/components/salaryItemsSet/TaxRateSet.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/TextArea.js b/pc4backstage/hrmengine/components/salaryItemsSet/TextArea.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/TextAreaCopy.js b/pc4backstage/hrmengine/components/salaryItemsSet/TextAreaCopy.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/index.js b/pc4backstage/hrmengine/components/salaryItemsSet/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/salaryItemsSet/staticDatas.js b/pc4backstage/hrmengine/components/salaryItemsSet/staticDatas.js
new file mode 100755
index 0000000..590ebf4
--- /dev/null
+++ b/pc4backstage/hrmengine/components/salaryItemsSet/staticDatas.js
@@ -0,0 +1,99 @@
+const countColumns = [{
+ title: '范围',
+ dataIndex: 'scope',
+ useRecord: true,
+ com: [{
+ type: 'CASCADER',
+ key: 'scope',
+ compDef: {
+ type: 'SELECT',
+ options: [{
+ key: 'all',
+ selected: true,
+ showname: '全部'
+ }, {
+ key: 'subbrowser',
+ selected: false,
+ showname: '分部'
+ }, {
+ key: 'departbrowser',
+ selected: false,
+ showname: '部门'
+ }, {
+ key: 'hrmbrowser',
+ selected: false,
+ showname: '人力资源'
+ }],
+ parent: {
+ type: 'div',
+ style: {
+ width: 100,
+ display: 'inline-block',
+ float: 'left'
+ }
+ },
+ subChildren: {
+ subbrowser: {
+ type: 'BROWSER',
+ propType: '164'
+ },
+ departbrowser: {
+ type: 'BROWSER',
+ propType: '4'
+ },
+ hrmbrowser: {
+ type: 'BROWSER',
+ propType: '1'
+ }
+ }
+ }
+ }],
+ width: '30%',
+ colSpan: 1,
+}, {
+ title: '时间范围',
+ dataIndex: 'timescope',
+ com: [{
+ type: 'SELECT',
+ key: 'timescope',
+ options: [{
+ key: '0',
+ selected: false,
+ showname: '年度',
+ }, {
+ key: '1',
+ selected: false,
+ showname: '半年度',
+ }, {
+ key: '2',
+ selected: false,
+ showname: '季度',
+ }, {
+ key: '3',
+ selected: false,
+ showname: '月度',
+ }],
+ width: 100
+ }],
+ width: '30%',
+ colSpan: 1,
+}, {
+ title: '条件',
+ dataIndex: 'condition',
+ key: 'condition',
+ com: [ console.log('aa')}/>],
+ width: '20%',
+ colSpan: 1,
+}, {
+ title: '公式', //列名
+ dataIndex: 'formula', //列的id 对应数据
+ key: 'formula', //前端渲染key值
+ com: [],
+ width: '20%',
+ colSpan: 1,
+}]
+
+
+export {
+ countColumns
+}
\ No newline at end of file
diff --git a/pc4backstage/hrmengine/components/sanyuan/Processing.js b/pc4backstage/hrmengine/components/sanyuan/Processing.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/sanyuan/index.js b/pc4backstage/hrmengine/components/sanyuan/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/CalendarScheduling.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/CalendarScheduling.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/DataList.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/DataList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/ScheduleList.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/ScheduleList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/SchedulingInfo.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/SchedulingInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/SchedulingMember.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/SchedulingMember.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/Setting.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/Setting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/schedulingSetting/index.js b/pc4backstage/hrmengine/components/schedule/schedulingSetting/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/shiftsSetting/DataList.js b/pc4backstage/hrmengine/components/schedule/shiftsSetting/DataList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/shiftsSetting/DetailSetting.js b/pc4backstage/hrmengine/components/schedule/shiftsSetting/DetailSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/shiftsSetting/Setting.js b/pc4backstage/hrmengine/components/schedule/shiftsSetting/Setting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/shiftsSetting/ShiftsSettingInfo.js b/pc4backstage/hrmengine/components/schedule/shiftsSetting/ShiftsSettingInfo.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/shiftsSetting/index.js b/pc4backstage/hrmengine/components/schedule/shiftsSetting/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/workTime/DataList.js b/pc4backstage/hrmengine/components/schedule/workTime/DataList.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/schedule/workTime/index.js b/pc4backstage/hrmengine/components/schedule/workTime/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/secAdminLog/index.js b/pc4backstage/hrmengine/components/secAdminLog/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/secAuditorLog/index.js b/pc4backstage/hrmengine/components/secAuditorLog/index.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/securitySetting/AdvanceSetting.js b/pc4backstage/hrmengine/components/securitySetting/AdvanceSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/securitySetting/BasicSetting.js b/pc4backstage/hrmengine/components/securitySetting/BasicSetting.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/securitySetting/ButtonIcons.js b/pc4backstage/hrmengine/components/securitySetting/ButtonIcons.js
old mode 100644
new mode 100755
diff --git a/pc4backstage/hrmengine/components/securitySetting/CustomerFormItem.js b/pc4backstage/hrmengine/components/securitySetting/CustomerFormItem.js
new file mode 100755
index 0000000..ffb86d5
--- /dev/null
+++ b/pc4backstage/hrmengine/components/securitySetting/CustomerFormItem.js
@@ -0,0 +1,52 @@
+import React, {
+ Component
+} from 'react';
+
+import {
+ WeaFormItem
+} from 'ecCom';
+
+import {
+ Row,
+ Col
+} from 'antd';
+
+import {
+ observer
+} from 'mobx-react';
+
+export default class CustomerFormItem extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ const {
+ form,
+ fields,
+ keys,
+ children
+ } = this.props;
+
+ let errorMsg = [];
+ keys && keys.map(f => {
+ form.getError(f) && errorMsg.push(form.getError(f));
+ })
+ errorMsg = errorMsg.join(',');
+
+ return (
+
+
+ :
+ }
+ />
+
+ {itemType == '1' &&
+
+ }
+
+
+
+ );
+ break;
+ case 'helper':
+ children.push(
+
+
+ );
+ break;
+ default:
+ break;
+ }
+ });
+
+ items.push({
+ com: (
+
+
+
+
+ {children}
+
+
+
+ );
+ break;
+ case 'helper':
+ children.push(
+
+
+ );
+ break;
+ default:
+ break;
+ }
+ });
+
+ items.push({
+ com: (
+
+
+
+
+ {children}
+
+
+
+ );
+ break;
+ case 'helper':
+ children.push(
+
+
+ );
+ break;
+ default:
+ break;
+ }
+ });
+
+ items.push({
+ com: (
+
+
+
+
+ {children}
+ .
+ .
+ .
+
+
+
+ );
+ } else {
+ const fields = map.get(child.key.toLowerCase());
+ if (!_.isEmpty(fields)) {
+ children.push(
+ {i18n.label.beforeActive()}{i18n.label.setNetworkStrategy()}
+
+ );
+ keys.push(fields);
+ }
+ }
+ })
+
+ if (r.key === 'forbidLogin' && tabConfig.tabs.length < 3) {
+
+ } else if (!r.checkSwitch || formParams[r.checkSwitch] === '1') {
+ items.push({
+ com: (
+ {child.label}
+
+
+ {child.info}
+
+
+
+
+ {children}
+
+
+
+ 
refreshVerificationCode(formParams)} title={i18n.label.preview()} />
+
+
+
+