Compare commits
No commits in common. "ec18ccf0074c924c859a84ffce8ae29ecbdbeb5e" and "3202c0c119d098fe6a1d471542fc2f36a3b3e2b1" have entirely different histories.
ec18ccf007
...
3202c0c119
|
|
@ -42,8 +42,8 @@ export default class GroupInfo4Coms extends Component{
|
|||
|
||||
let children = [
|
||||
(
|
||||
<div style={{height: '100%'}}>
|
||||
<div style={{height: 'calc(100% - 64px)', position: 'relative'}}>
|
||||
<div>
|
||||
<div style={{height: 680, position: 'relative'}}>
|
||||
<Info ecId={`${this && this.props && this.props.ecId || ''}_Info@p8cxnm`} store={store} />
|
||||
</div>
|
||||
<WeaDialogFooter ecId={`${this && this.props && this.props.ecId || ''}_WeaDialogFooter@eacpnh`} buttons={buttons} moreBtn={{datas: menus}}/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import has from 'lodash/has';
|
|||
const getLabel = WeaLocaleProvider.getLabel;
|
||||
import {i18n} from '../../public/i18n';
|
||||
|
||||
let map, geolocation, geocoder,MapAddress;
|
||||
let map, geolocation, geocoder;
|
||||
|
||||
@observer
|
||||
export default class Map extends Component {
|
||||
|
|
@ -32,16 +32,13 @@ export default class Map extends Component {
|
|||
}
|
||||
|
||||
onSelectHandle = params => {
|
||||
const{cityname,adname,business_area}=params
|
||||
MapAddress=cityname+adname+business_area+params.address
|
||||
const {store: {onPositionSelected}} = this.props;
|
||||
let locationname = '', address = '', longitude = '', latitude = '';
|
||||
locationname = params.name;
|
||||
address = MapAddress
|
||||
address = params.address;
|
||||
const latlng = params.location.split(',');
|
||||
longitude = latlng[0];
|
||||
latitude = latlng[1];
|
||||
|
||||
const data = {locationname,address,longitude,latitude}
|
||||
onPositionSelected && onPositionSelected(data);
|
||||
// this.setState({selectedPosition: data});
|
||||
|
|
@ -75,8 +72,7 @@ export default class Map extends Component {
|
|||
const {store} = this.props;
|
||||
const {rangeParams} = store;
|
||||
const mapProps = {showGeolocation: true}
|
||||
const {locationname:name} = rangeParams;
|
||||
|
||||
|
||||
const {longitude, latitude} = rangeParams;
|
||||
if(/^(\-)?\d+(\.\d+)?$/.test(longitude) && /^(\-)?\d+(\.\d+)?$/.test(latitude)){
|
||||
Object.assign(mapProps,{position: [rangeParams.longitude, rangeParams.latitude]});
|
||||
|
|
@ -98,7 +94,6 @@ export default class Map extends Component {
|
|||
gaodeRegeoCallback={this.gaodeRegeoCallback}
|
||||
googleRegeoCallback={this.googleRegeoCallback}
|
||||
{...mapProps}
|
||||
info={{name, address:MapAddress}}
|
||||
/>
|
||||
</div>
|
||||
<div style={{height: 90, padding: 10}}>
|
||||
|
|
|
|||
|
|
@ -32,8 +32,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
across: 0,
|
||||
mins: 60,
|
||||
mins_next:'',
|
||||
times: "",
|
||||
clockinnot:'0'
|
||||
times: ""
|
||||
};
|
||||
searchParams = {};
|
||||
orgTreeProps = {
|
||||
|
|
@ -292,7 +291,6 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
/>
|
||||
</div>)
|
||||
},
|
||||
|
||||
cardRemOfSignIn: (field, textAreaProps, form, formParams) => {//上班打卡提醒
|
||||
const {
|
||||
cardRemind
|
||||
|
|
@ -960,7 +958,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
childrenComponents = {
|
||||
shiftonoffworkcount: () => {
|
||||
const formParams = this.formTarget.baseForm.getFormParams();
|
||||
/*if (formParams.shiftonoffworkcount != "1") {
|
||||
/*if (formParams.shiftonoffworkcount != "1") {
|
||||
this.formTarget.baseForm.updateFields({
|
||||
isresttimeopen: {
|
||||
value: "0"
|
||||
|
|
@ -1031,28 +1029,13 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
tip={i18n.label["388787"]()}
|
||||
onChange={v => (this.worktimes[i - 1].start.mins_next = v)}
|
||||
/>
|
||||
|
||||
</WeaError>
|
||||
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div style={{margin:'5px 0 0 50px'}}>
|
||||
<WeaCheckbox
|
||||
id="test"
|
||||
value={timeConfig.start.clockinnot}
|
||||
onChange={
|
||||
v => (this.worktimes[i - 1].start.clockinnot = (v || 1))
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
<div style={{margin:'10px 0 0 10px'}}>{getLabel('540846','无需打卡')}</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div className="cust">
|
||||
<div className="child">
|
||||
<div className="child">
|
||||
<div className="lbl1" style={{width: 90}}>{i18n.label["125810"]()}</div>
|
||||
<div className="restTime">
|
||||
<WeaTimePicker ecId={`${this && this.props && this.props.ecId || ''}_WeaTimePicker@jov4v8@${i}`}
|
||||
|
|
@ -1062,7 +1045,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
/>
|
||||
</div>
|
||||
{timeConfig.end.across === '1' && (
|
||||
<div className="restTimeInfo">{i18n.label["388785"]()}</div>
|
||||
<div className="restTimeInfo">{i18n.label["388785"]()}</div>
|
||||
)}
|
||||
{formParams.punchsettings === "1" && (
|
||||
<div
|
||||
|
|
@ -1107,20 +1090,6 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div style={{margin:'5px 0 0 50px'}}>
|
||||
<WeaCheckbox
|
||||
id="test"
|
||||
value={timeConfig.end.clockinnot}
|
||||
onChange={
|
||||
v => (this.worktimes[i - 1].end.clockinnot = (v || 1))
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
<div style={{margin:'10px 0 0 10px'}}>{getLabel('540846','无需打卡')}</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -1137,17 +1106,18 @@ 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.restTimeCollection.forEach((d, index) => {
|
||||
this.toJS(this.restTimeCollection).forEach((d, index) => {
|
||||
console.debug(d)
|
||||
const {record, start, end} = d;
|
||||
const {time: sTime = '12:00', accross: sAccross = '0'} = start || {};
|
||||
const {time: eTime, accross: eAccross = '0'} = end || {};
|
||||
const {time: sTime = '12:00', accross: sAccross} = start || {};
|
||||
const {time: eTime, accross: eAccross} = end || {};
|
||||
coms.push(
|
||||
<WeaFormItem
|
||||
label={`${fieldMap['isresttimeopen'].label}${index + 1}`}
|
||||
|
|
@ -1646,7 +1616,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
};
|
||||
|
||||
@observable timeErrorType = 1;
|
||||
|
||||
|
||||
@observable restTimeCollection = [];
|
||||
/********************* observable list *********************/
|
||||
|
||||
|
|
@ -1796,7 +1766,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
this.processCondition(data);
|
||||
this.canAdd = data.canAdd;
|
||||
this.shift_24 = data.shift_24 || 0;
|
||||
this.restTimeCollection = data.restTimeSections;
|
||||
this.restTimeCollection = data.restTimeSections;
|
||||
this.setFormData("baseForm", data.condition);
|
||||
if (this.formTarget.baseForm.isFormInit) {
|
||||
callback && callback();
|
||||
|
|
@ -1897,16 +1867,14 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
mins: i == 1 ? 60 : 30,
|
||||
mins_next:'',
|
||||
times: count === 1 ? "09:00" : this.sTime[i - 1],
|
||||
key: `s${i - 1}`,
|
||||
clockinnot:'0'
|
||||
key: `s${i - 1}`
|
||||
},
|
||||
end: {
|
||||
across: 0,
|
||||
mins: i == count ? 60 : 29,
|
||||
mins_next:'',
|
||||
times: count === 1 ? "18:00" : this.eTime[i - 1],
|
||||
key: `e${i - 1}`,
|
||||
clockinnot:'0'
|
||||
key: `e${i - 1}`
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -2001,7 +1969,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
return this.restTimeSections[1].across == '1';
|
||||
}
|
||||
|
||||
checkRestTimeCollection = (times) => {
|
||||
checkRestTimeCollection = (times) => {
|
||||
this.resttimeRangeError = false;
|
||||
if(times.length <= 1)
|
||||
return this.resttimeRangeError;
|
||||
|
|
@ -2017,8 +1985,8 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
|
||||
for(let i = 1; i < start.length; i++){
|
||||
if (start[i] <= end[i - 1]){
|
||||
console && console.debug("时间有重复！");
|
||||
this.resttimeRangeError = true;
|
||||
message.error(getLabel('523624','休息时间不能重叠'));
|
||||
this.resttimeRangeError = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2033,137 +2001,96 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
minute = 0;
|
||||
try {
|
||||
const d = this.toJS(this.worktimes);
|
||||
if (d.length === 1) {
|
||||
let record = d[0];
|
||||
let firstS;
|
||||
let lastE;
|
||||
d.map((record, i) => {
|
||||
let s = this.convertTimeToMoment(record.start.times),
|
||||
e = this.convertTimeToMoment(record.end.times);
|
||||
if (record.start.across === '1' && record.end.across === '1') {
|
||||
} else if (record.end.across === '1') {
|
||||
i == 0 && (firstS = s);
|
||||
if (record.start.across === "1" && record.end.across === "1") {
|
||||
} else if (record.end.across === "1") {
|
||||
e.add(1, "d");
|
||||
}
|
||||
minute = Math.abs(s.diff(e, "m"));
|
||||
if (formParams.isresttimeopen === "1") {
|
||||
const times = [];
|
||||
this.restTimeCollection = this.toJS(this.restTimeCollection).map(d => {
|
||||
const {record, start, end} = d;
|
||||
const {time: restbeigin = ''} = start || {};
|
||||
const {time: restend = ''} = end || {};
|
||||
let sAcross = '0', eAcross = '0';
|
||||
if (restbeigin != "" && restend != "") {
|
||||
const rst = this.convertTimeToMoment(restbeigin),
|
||||
ret = this.convertTimeToMoment(restend),
|
||||
wst = this.convertTimeToMoment(this.worktimes[0].start.times),
|
||||
wet = this.convertTimeToMoment(this.worktimes[0].end.times);
|
||||
this.worktimes[0].end.across === '1' && wet.add(1, "d");
|
||||
if(rst.isBefore(wst)){
|
||||
sAcross = '1';
|
||||
rst.add(1, 'd');
|
||||
ret.add(1, 'd');
|
||||
}
|
||||
if(ret.isBefore(rst)){
|
||||
eAcross = '1';
|
||||
ret.add(1, 'd');
|
||||
}
|
||||
i == d.length - 1 && (lastE = e);
|
||||
minute += Math.abs(s.diff(e, "m"));
|
||||
});
|
||||
if (formParams.isresttimeopen === "1") {
|
||||
const times = [];
|
||||
const wst = this.convertTimeToMoment(this.worktimes[0].start.times),
|
||||
wet = this.convertTimeToMoment(this.worktimes[this.worktimes.length - 1].end.times);
|
||||
if(this.worktimes[this.worktimes.length - 1].end.across == '1')
|
||||
wet.add(1, 'd');
|
||||
|
||||
times.push({s: rst, e: ret});
|
||||
if (
|
||||
rst.isBefore(wst) ||
|
||||
rst.isAfter(wet) ||
|
||||
ret.isBefore(wst) ||
|
||||
ret.isAfter(wet) ||
|
||||
rst.isSame(ret)
|
||||
) {
|
||||
this.resttimeError = true;
|
||||
let ts = rst, te = ret;
|
||||
sAcross == '1' && ts.add(-1, 'd') && te.add(-1, 'd');
|
||||
if(ts.isAfter(wet)){
|
||||
ts = wet;
|
||||
}else if(ts.isBefore(wst))
|
||||
ts = wst;
|
||||
this.restTimeCollection = this.toJS(this.restTimeCollection).map((d, index) => {
|
||||
const {start, end} = d;
|
||||
const {time: restbeigin = ''} = start || {};
|
||||
const {time: restend = ''} = end || {};
|
||||
let sAcross = '0', eAcross = '0';
|
||||
if (restbeigin != "" && restend != "") {
|
||||
const rst = this.convertTimeToMoment(restbeigin),
|
||||
ret = this.convertTimeToMoment(restend);
|
||||
|
||||
if(te.isAfter(wet)){
|
||||
te = wet;
|
||||
}
|
||||
minute -= Math.abs(ts.diff(te, "m"));
|
||||
} else {
|
||||
if (ret.isBefore(rst)) ret.add(1, "d");
|
||||
minute -= Math.abs(rst.diff(ret, "m"));
|
||||
}
|
||||
d.start.accross = sAcross;
|
||||
d.end.accross = sAcross == '1' ? '1' : eAcross;
|
||||
if(index != 0){
|
||||
let lastRecord = this.restTimeCollection[index - 1];
|
||||
let le = this.convertTimeToMoment(lastRecord.end.time);
|
||||
d.start.accross = rst.isBefore(le) ? '1' : lastRecord.end.across;
|
||||
}else{
|
||||
d.start.accross = rst.isBefore(wst) ? '1' : '0';
|
||||
}
|
||||
d.end.accross = ret.isBefore(rst) ? '1' : d.start.accross;
|
||||
|
||||
console.debug(d)
|
||||
|
||||
d.start.accross == '1' && rst.add(1, 'd');
|
||||
d.end.accross == '1' && ret.add(1, 'd');
|
||||
|
||||
times.push({s: rst, e: ret});
|
||||
|
||||
if (
|
||||
rst.isBefore(wst) ||
|
||||
rst.isAfter(wet) ||
|
||||
ret.isBefore(wst) ||
|
||||
ret.isAfter(wet) ||
|
||||
rst.isSame(ret)
|
||||
){
|
||||
this.resttimeError = true;
|
||||
message.error('休息时间不在工作时段内');
|
||||
|
||||
if(!rst.isSame(ret)) {
|
||||
this.toJS(this.worktimes).forEach((worktime) => {
|
||||
const s = this.convertTimeToMoment(worktime.start.times);
|
||||
worktime.start.across == '1' && s.add(1, 'd');
|
||||
|
||||
const e = this.convertTimeToMoment(worktime.end.times);
|
||||
worktime.end.across == '1' && e.add(1, 'd');
|
||||
|
||||
let ts = rst, te = ret;
|
||||
if(ts.isBefore(s))
|
||||
ts = s;
|
||||
else if(ts.isAfter(e)){
|
||||
ts = e;
|
||||
}
|
||||
if(te.isAfter(e))
|
||||
te = e;
|
||||
|
||||
minute -= Math.abs(ts.diff(te, "m"));
|
||||
})
|
||||
}
|
||||
}else{
|
||||
minute -= Math.abs(rst.diff(ret, "m"));
|
||||
}
|
||||
return d;
|
||||
});
|
||||
this.checkRestTimeCollection(times);
|
||||
}
|
||||
this.hour = Math.floor(minute / 60);
|
||||
this.minute = minute % 60;
|
||||
} else {
|
||||
let firstS;
|
||||
let lastE;
|
||||
d.map((record, i) => {
|
||||
let s = this.convertTimeToMoment(record.start.times),
|
||||
e = this.convertTimeToMoment(record.end.times);
|
||||
i == 0 && (firstS = s);
|
||||
if (record.start.across === '1' && record.end.across === '1') {
|
||||
} else if (record.end.across === '1') {
|
||||
e.add(1, "d");
|
||||
}
|
||||
i == (d.length - 1) && (lastE = e);
|
||||
minute += Math.abs(s.diff(e, "m"));
|
||||
return d;
|
||||
});
|
||||
if (formParams.isresttimeopen === "1") {
|
||||
for(let i=0; i<this.worktimes.length; i++) {
|
||||
const times = [];
|
||||
this.restTimeCollection = this.toJS(this.restTimeCollection).map(d => {
|
||||
const {record, start, end} = d;
|
||||
const {time: restbeigin = ''} = start || {};
|
||||
const {time: restend = ''} = end || {};
|
||||
let sAcross = '0', eAcross = '0';
|
||||
if (restbeigin != "" && restend != "") {
|
||||
const rst = this.convertTimeToMoment(restbeigin),
|
||||
ret = this.convertTimeToMoment(restend),
|
||||
wst = this.convertTimeToMoment(this.worktimes[i].start.times),
|
||||
wet = this.convertTimeToMoment(this.worktimes[i].end.times);
|
||||
this.worktimes[0].end.across === '1' && wet.add(1, "d");
|
||||
if(!(ret.isBefore(wst) || rst.isAfter(wet))){
|
||||
times.push({s: rst, e: ret});
|
||||
if (
|
||||
rst.isBefore(wst) ||
|
||||
rst.isAfter(wet) ||
|
||||
ret.isBefore(wst) ||
|
||||
ret.isAfter(wet) ||
|
||||
rst.isSame(ret)
|
||||
) {
|
||||
this.resttimeError = true;
|
||||
let ts = rst, te = ret;
|
||||
sAcross == '1' && ts.add(-1, 'd') && te.add(-1, 'd');
|
||||
if(ts.isAfter(wet)){
|
||||
ts = wet;
|
||||
}else if(ts.isBefore(wst))
|
||||
ts = wst;
|
||||
|
||||
if(te.isAfter(wet)){
|
||||
te = wet;
|
||||
}
|
||||
minute -= Math.abs(ts.diff(te, "m"));
|
||||
} else {
|
||||
if (ret.isBefore(rst)) ret.add(1, "d");
|
||||
minute -= Math.abs(rst.diff(ret, "m"));
|
||||
}
|
||||
}
|
||||
}
|
||||
return d;
|
||||
});
|
||||
this.checkRestTimeCollection(times);
|
||||
}
|
||||
}
|
||||
this.hour = Math.floor(minute / 60);
|
||||
this.minute = minute % 60;
|
||||
this.timeRange = Math.abs(firstS.diff(lastE, "m"));
|
||||
this.checkRestTimeCollection(times);
|
||||
}
|
||||
|
||||
this.worktime = minute;
|
||||
} catch (ex) {}
|
||||
this.hour = Math.floor(minute / 60);
|
||||
this.minute = minute % 60;
|
||||
} catch (ex) {
|
||||
console.error(ex)
|
||||
}
|
||||
let result = i18n.label["388788"]().replace("{hour}", hour);
|
||||
result = result.replace("{minute}", minute);
|
||||
return result;
|
||||
|
|
@ -2402,7 +2329,7 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
isresttimeopen &&
|
||||
isresttimeopen != "1"))
|
||||
) {*/
|
||||
window.e9HideFormFieldKeys.push(...["restbeigin", "restend"]);
|
||||
window.e9HideFormFieldKeys.push(...["restbeigin", "restend"]);
|
||||
//}
|
||||
if(halfcalrule == '0'){
|
||||
['halfcalpoint','halfcalpoint2cross'].forEach(key=>{
|
||||
|
|
@ -2454,6 +2381,12 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
return;
|
||||
}
|
||||
if(/*shiftonoffworkcount == "1" &&*/ isresttimeopen == '1'){
|
||||
if(this.resttimeError){
|
||||
message.error('休息时间不在工作时段内');
|
||||
this.spinning = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if(this.resttimeRangeError){
|
||||
message.error(getLabel('523624','休息时间不能重叠'));
|
||||
this.spinning = false;
|
||||
|
|
@ -2464,14 +2397,14 @@ export class HrmShiftManager extends HrmBaseStore {
|
|||
// this.spinning = false;
|
||||
// return;
|
||||
// }
|
||||
|
||||
|
||||
const arr = this.toJS(this.restTimeCollection);
|
||||
if(arr.length == 0){
|
||||
message.error(getLabel('523634','请设置休息时间'));
|
||||
this.spinning = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
const rIndex = [];
|
||||
arr.map((d, i) => {
|
||||
const {start, end} = d;
|
||||
|
|
|
|||
|
|
@ -208,10 +208,9 @@ class VacationRemainStore {
|
|||
return;
|
||||
}
|
||||
|
||||
//#2458933# 假期余额去除条件限制
|
||||
// if (!this.isDatasNormal()) {
|
||||
// return;
|
||||
// }
|
||||
if (!this.isDatasNormal()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const params = {
|
||||
datas: JSON.stringify(this.tableListStore.tableStore.datas),
|
||||
|
|
@ -260,18 +259,18 @@ class VacationRemainStore {
|
|||
lastname,
|
||||
} = data;
|
||||
|
||||
const result1 = parseFloat(baseAmountspan) + parseFloat(extraAmountspan) >= parseFloat(usedAmountspan);
|
||||
//const result1 = parseFloat(baseAmountspan) + parseFloat(extraAmountspan) >= parseFloat(usedAmountspan);
|
||||
|
||||
let result2 = true;
|
||||
// let result2 = true;
|
||||
|
||||
if (baseAmount2span !== undefined) {
|
||||
result2 = parseFloat(baseAmount2span) + parseFloat(extraAmount2span) >= parseFloat(usedAmount2span);
|
||||
}
|
||||
// if (baseAmount2span !== undefined) {
|
||||
// result2 = parseFloat(baseAmount2span) + parseFloat(extraAmount2span) >= parseFloat(usedAmount2span);
|
||||
// }
|
||||
|
||||
if (!(result1 && result2)) {
|
||||
message.warning(`${getLabel(15323, '第')}${index + 1}${getLabel(27592, '行')},${lastname}${getLabel(529327, '已休年假-初始化(天)不能大于本年年假-初始化(天)+额外年假-初始化(天)')}`);
|
||||
}
|
||||
return result1 && result2;
|
||||
// if (!(result1 && result2)) {
|
||||
// message.warning(`${getLabel(15323, '第')}${index + 1}${getLabel(27592, '行')},${lastname}${getLabel(529327, '已休年假-初始化(天)不能大于本年年假-初始化(天)+额外年假-初始化(天)')}`);
|
||||
// }
|
||||
return true;
|
||||
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,30 +64,17 @@ export default class SecuritySet extends React.Component {
|
|||
checkboxValue,
|
||||
} = this.props;
|
||||
|
||||
const {userUsbType,usbstate,needauto} = form.getFormParams();
|
||||
const {userUsbType} = 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 == '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(userUsbType === '7' && ['needauto', 'enableDate', 'enableUsbType', 'mobile', 'tokenKey', 'serial', 'selectdateselect'].includes(key)) return;
|
||||
|
||||
if (!verifyTypeSelectedValue && key !== 'userUsbType') {
|
||||
return;
|
||||
|
|
@ -119,19 +106,6 @@ 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(<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@faj67m@${index}`}
|
||||
label={key !== 'usbstate' ? `${field.label}` : ''}
|
||||
|
|
|
|||
|
|
@ -363,7 +363,7 @@ class ArchiveLogViewStore {
|
|||
|
||||
trans = (id) => {
|
||||
return new Promise( (resolve,reject) => {
|
||||
const params = {id,isArchiveLog:1};
|
||||
const params = {id};
|
||||
|
||||
api.trans(params).then(datas => {
|
||||
const {info, status} = datas;
|
||||
|
|
|
|||
|
|
@ -454,12 +454,11 @@ export class HrmDecentralizationAdminSet {
|
|||
}
|
||||
|
||||
securitySave = () => {
|
||||
|
||||
window.e9HideFormFieldKeys = [];
|
||||
|
||||
const {form,condition}= this.securitySet;
|
||||
|
||||
const {userUsbType,needauto} = form.getFormParams();
|
||||
const {userUsbType} = form.getFormParams();
|
||||
|
||||
const viewAttr3keys = this.collectViewAtrr3key(condition);
|
||||
|
||||
|
|
@ -475,12 +474,6 @@ export class HrmDecentralizationAdminSet {
|
|||
if (userUsbType === '7'){
|
||||
window.e9HideFormFieldKeys = viewAttr3keys;
|
||||
}
|
||||
if (userUsbType === '901'&&needauto=='0'){
|
||||
window.e9HideFormFieldKeys = viewAttr3keys
|
||||
|
||||
}if (userUsbType === '901'&&needauto=='1'){
|
||||
window.e9HideFormFieldKeys = viewAttr3keys.filter(key=>key!=='selectdate')
|
||||
}
|
||||
|
||||
this.securitySet.form.validateForm().then(f => {
|
||||
if (f.isValid) {
|
||||
|
|
|
|||
|
|
@ -85,19 +85,8 @@ export class HrmDismissSet {
|
|||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
|
|
|
|||
|
|
@ -77,28 +77,7 @@ export class HrmEntryMaintenanceSet {
|
|||
|
||||
if (api_status) {
|
||||
if (condition) {
|
||||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}});
|
||||
condition[0].items.forEach(item => item.browserConditionParam.maxLength = 100);
|
||||
this.content.form.initFormFields(condition);
|
||||
extendObservable(this.content, {
|
||||
condition: condition,
|
||||
|
|
|
|||
|
|
@ -85,27 +85,7 @@ export class HrmFormalSet {
|
|||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
|
|
|
|||
|
|
@ -522,7 +522,6 @@ class HrmMatrixAdjust extends HrmBaseStore {
|
|||
@action transferTableEditData = (dataSource, cols) => {
|
||||
const datas = [], cells = [];
|
||||
const replaceData = this.selectedTargetInfo.valueSpan;
|
||||
const checkTargetId = this.selectedTargetInfo.value;
|
||||
dataSource.map((data, i) => {
|
||||
const d = {
|
||||
...data,
|
||||
|
|
@ -530,12 +529,9 @@ class HrmMatrixAdjust extends HrmBaseStore {
|
|||
}
|
||||
const cell = {id: d.id};
|
||||
cols.map(c => {
|
||||
let ids = data[c];
|
||||
ids = ids.substr(1, ids.length - 2);
|
||||
const replaceIndex = ids.split(',').indexOf(checkTargetId);
|
||||
let key = `${c}span`, txt = data[key], found = false;
|
||||
txt = txt.split(',').reduce((pre, cur, index) => {
|
||||
if(index == replaceIndex){
|
||||
txt = txt.split(',').reduce((pre, cur) => {
|
||||
if(cur == replaceData){
|
||||
found = true;
|
||||
pre.push(`<span style='color: ${this.color}'>${replaceData}</span>`);
|
||||
Object.assign(d, {
|
||||
|
|
|
|||
|
|
@ -85,27 +85,7 @@ export class HrmRehireSet {
|
|||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
|
|
|
|||
|
|
@ -85,27 +85,7 @@ export class HrmRenewSet {
|
|||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
|
|
|
|||
|
|
@ -85,27 +85,7 @@ export class HrmRetireSet {
|
|||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
|
|
|
|||
|
|
@ -120,24 +120,13 @@ class SanYuanStore {
|
|||
}, {
|
||||
passiveKey: "needauto", //自动启用
|
||||
activeKey: ["usbstate","userUsbType"],
|
||||
showValue: ["1","3,4,901"]
|
||||
showValue: ["1","3,4"]
|
||||
}, {
|
||||
passiveKey: "enableUsbType", //启用方式
|
||||
activeKey: ["needauto","userUsbType"],
|
||||
showValue:[ "1","2,3,4,5,6"]
|
||||
},{
|
||||
passiveKey: "selectdateselect", //启用时间
|
||||
activeKey: "needauto",
|
||||
showValue: "1"
|
||||
},{
|
||||
passiveKey: "selectdate", //启用日期
|
||||
activeKey: "needauto",
|
||||
showValue: "1"
|
||||
}],
|
||||
|
||||
|
||||
|
||||
customRenderKeyList: ["usbstate"],
|
||||
customRenderKeyList: ["selectdateselect","usbstate"],
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -161,7 +150,7 @@ class SanYuanStore {
|
|||
const {
|
||||
userUsbType
|
||||
} = form.getFormParams();
|
||||
if (["3", "4","6","901"].includes(userUsbType)) {
|
||||
if (["3", "4","6"].includes(userUsbType)) {
|
||||
const customRenderItems = this.getCustomRenderItems(["usbstate"]);
|
||||
if (isEmpty(customRenderItems)) {
|
||||
return null;
|
||||
|
|
@ -1049,7 +1038,6 @@ class SanYuanStore {
|
|||
if(usbstate && usbstate !== "1"){
|
||||
this.formStore.form.updateFields({
|
||||
needauto: "0"
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1249,7 +1237,7 @@ class SanYuanStore {
|
|||
const {userUsbType} =form.getFormParams();
|
||||
this.formStore.conditions.map(c => c.items.map(item => {
|
||||
if (item.domkey[0] == 'usbstate') {
|
||||
item.options = (userUsbType == '6'||userUsbType == '901') ? this.usestateOption.slice(0,2):this.usestateOption
|
||||
item.options = (userUsbType == '6') ? this.usestateOption.slice(0,2):this.usestateOption
|
||||
}
|
||||
}))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1587,7 +1587,6 @@ export class HrmSecuritySetting extends HrmBaseStore {
|
|||
const { defaultPasswordEnable } = formParams;
|
||||
const save = () => {
|
||||
const params = transParams(formParams);
|
||||
Object.assign(params,{defaultPassword:window.__RSAEcrypt__.rsa_data_encrypt(params.defaultPassword)})
|
||||
api.saveBasicSetting(params).then(data => {
|
||||
if (data.status === '1') {
|
||||
this.refreshVerificationCode();
|
||||
|
|
|
|||
|
|
@ -85,27 +85,7 @@ export class HrmTransferSet {
|
|||
if (item) {
|
||||
let key = item.domkey[0];
|
||||
if (item.browserConditionParam) {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (key == 'changereason') {
|
||||
item.otherParams = {
|
||||
|
|
|
|||
|
|
@ -84,27 +84,7 @@ export class HrmTrialSet {
|
|||
condition[0].items.forEach(item => {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
if (item) {
|
||||
if (item.browserConditionParam) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
async: false,
|
||||
url: "/hrPerson/hrmTb.jsp",
|
||||
dataType: "json",
|
||||
success: function(data){
|
||||
if(data==1){
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}else{
|
||||
item.browserConditionParam.maxLength = 100000
|
||||
}
|
||||
}
|
||||
}) }
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
maxRows: 4
|
||||
}
|
||||
}
|
||||
}
|
||||
item.browserConditionParam.maxLength = 100
|
||||
}
|
||||
if (item.domkey[0] == 'changereason') {
|
||||
item.otherParams = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue