Skip to content

M
mes-ui
Commit a643dc4f authored by renjintao's avatar renjintao
Browse files
Options

overtime work

parent 2e121744
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 230 deletions
pages/basicData/calendar/overtime/index.vue
View file @ a643dc4f
...@@ -104,6 +104,12 @@ export default { ...@@ -104,6 +104,12 @@ export default {
high: true, high: true,
align: 'left' align: 'left'
}, },
{
key: 'mesHolidayIds',
title: this.l('mesHolidayIds'),
hide: true,
align: 'left'
},
{ {
key: 'creationTime', key: 'creationTime',
title: this.l('creationTime'), title: this.l('creationTime'),
...@@ -154,171 +160,154 @@ export default { ...@@ -154,171 +160,154 @@ export default {
] ]
} }
}, },
//获取公休日数组 created() {
getweekList() { this.getWeekTypeListFn()
let parmse = { this.tableHeight = window.innerHeight - 230
conditions: [], },
isDesc: true, mounted() {
pageSize: 10 window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tableHeight = window.screenHeight - 230
})()
} }
Api.getWeekTypeList(parmse).then((res) => {
console.log(res.result)
this.weekTypeList = res.result
})
}, },
//设置公休日 async fetch({
radioChange(a) { store,
console.log(a) params
let datArray = this.weekTypeList }) {
datArray.map(u => { await store.dispatch('loadDictionary') // 加载数据字典
if (a == u.weekendTypeName) { },
this.weekTypeid = u.id methods: {
getWeekTypeListFn() {
Api.getsetweek().then((res) => {
if (res.success) {
this.getweekList()
this.weekType = res.result.weekendTypeName
} else {
let parmse = {
conditions: [],
isDesc: true,
pageSize: 10
}
Api.getWeekTypeList(parmse).then((res) => {
this.weekTypeList = res.result
this.weekTypeList.map((v) => {
if ((v.isvalid = 1)) {
this.weekType = v.weekendTypeName
} else {
this.weekType = 0
}
})
})
}
})
},
//获取公休日数组
getweekList() {
let parmse = {
conditions: [],
isDesc: true,
pageSize: 10
} }
}) Api.getWeekTypeList(parmse).then((res) => {
let id = this.weekTypeid console.log(res.result)
Api.setweek({ this.weekTypeList = res.result
id: id })
}).then((res) => { },
//设置公休日
radioChange(a) {
console.log(a)
let datArray = this.weekTypeList
datArray.map(u => {
if (a == u.weekendTypeName) {
this.weekTypeid = u.id
}
})
let id = this.weekTypeid
Api.setweek({
id: id
}).then((res) => {
if (res.success) { if (res.success) {
this.weekFlag = true this.weekFlag = true
} else { } else {
this.weekFlag = false this.weekFlag = false
console.log('设置失败') console.log('设置失败')
} }
}, })
async fetch({ },
store, addOk() {
params this.$refs.grid.load()
}) { this.addModal = false
await store.dispatch('loadDictionary') // 加载数据字典 this.editModal = false
}, this.curId = 0
methods: { },
getWeekTypeListFn() { search() {
Api.getsetweek().then((res) => { this.$refs.grid.reload(this.easySearch)
if (res.success) { },
this.getweekList() edit(id) {
this.weekType = res.result.weekendTypeName this.editModal = true
} else { this.curId = id
let parmse = { },
conditions: [],
isDesc: true,
pageSize: 10
}
Api.getWeekTypeList(parmse).then((res) => {
this.weekTypeList = res.result
this.weekTypeList.map((v) => {
if ((v.isvalid = 1)) {
this.weekType = v.weekendTypeName
} else {
this.weekType = 0
}
})
})
}
})
},
//获取公休日数组
getweekList() {
let parmse = {
conditions: [],
isDesc: true,
pageSize: 10
}
Api.getWeekTypeList(parmse).then((res) => {
this.weekTypeList = res.result
})
},
//设置公休日
radioChange(a) {
let datArray = this.weekTypeList
datArray.map(u => {
if (a == u.title) {
this.weekTypeid = u.id
}
})
let id = this.weekTypeid
Api.setweek({
id: id
}).then((res) => {
if (res.success) {
this.weekFlag = true
} else {
this.weekFlag = false
console.log('设置失败')
}
})
},
addOk() {
this.$refs.grid.load()
this.addModal = false
this.editModal = false
this.curId = 0
},
search() {
this.$refs.grid.reload(this.easySearch)
},
edit(id) {
this.editModal = true
this.curId = id
},
remove(id) { remove(id) {
this.deletelModal = true this.deletelModal = true
this.curId = id this.curId = id
}, },
removeOk() { removeOk() {
Api.delete({ Api.delete({
id: this.curId id: this.curId
}).then((r) => { }).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load() this.$refs.grid.load()
this.deletelModal = false this.deletelModal = false
this.$Message.success('删除成功') this.$Message.success('删除成功')
}
})
},
removeCancel() {
this.deletelModal = false
},
cancel() {
this.curId = 0
this.addModal = false
this.editModal = false
this.deletedlModal = false
this.deletelMore = false
},
//多选处理--表格选择项变化方法
selectionChange(selection) {
this.selectedRows = selection
this.footerModel = selection.length > 0
},
deleteMore() {
this.deletelMore = true
},
l(key) {
/*
calendar_overtime:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
title:'日历名称',
restType:'关联节假日',
holidayId:'',
holidayTitle:'',
holidayStartendTime:'',
status:'',
}
*/
let vkey = 'calendar_overtime' + '.' + key
return this.$t(vkey) || key
}
} }
})
},
removeCancel() {
this.deletelModal = false
},
cancel() {
this.curId = 0
this.addModal = false
this.editModal = false
this.deletedlModal = false
this.deletelMore = false
},
//多选处理--表格选择项变化方法
selectionChange(selection) {
this.selectedRows = selection
this.footerModel = selection.length > 0
},
deleteMore() {
this.deletelMore = true
},
l(key) {
/*
calendar_overtime:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
title:'日历名称',
restType:'关联节假日',
holidayId:'',
holidayTitle:'',
holidayStartendTime:'',
status:'',
}
*/
let vkey = 'calendar_overtime' + '.' + key
return this.$t(vkey) || key
} }
}
}
</script> </script>
<style lang="less"> <style lang="less">
......
pages/basicData/calendar/work/index.vue
View file @ a643dc4f
...@@ -198,85 +198,66 @@ export default { ...@@ -198,85 +198,66 @@ export default {
this.editModal = true; this.editModal = true;
this.curId = id; this.curId = id;
}, },
methods: {
addOk() {
this.$refs.grid.load()
this.addModal = false
this.$refs.addModal.entity = {}
this.editModal = false
this.curId = 0
},
addFn() {
this.addModal = true
this.$refs.addmodal.entity = {}
},
search() {
this.$refs.grid.reload(this.easySearch)
},
edit(id) {
this.editModal = true
this.curId = id
},
remove(id) { remove(id) {
this.deletelModal = true; this.deletelModal = true;
this.curId = id; this.curId = id;
},
removeOk() {
Api.delete({
id: this.curId
}).then((r) => {
if (r.success) {
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
});
},
removeCancel() {
this.deletelModal = false;
},
cancel() {
this.curId = 0;
this.addModal = false;
this.$refs.addModal.entity = {};
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.deletelMore = false;
},
//多选处理--表格选择项变化方法
selectionChange(selection) {
this.selectedRows = selection;
this.footerModel = selection.length > 0;
},
deleteMore() {
this.deletelMore = true;
},
l(key) {
/*
calendar_work:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
title:'日历名称',
calendarClassId:'关联班次',
calendarClassTitle:'',
calendarClassStart:'',
calendarClassEnd:'',
workHours:'工作时长',
}
*/
let vkey = "calendar_work" + "." + key;
return this.$t(vkey) || key;
},
}, },
}; removeOk() {
Api.delete({
id: this.curId
}).then((r) => {
if (r.success) {
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
});
},
removeCancel() {
this.deletelModal = false;
},
cancel() {
this.curId = 0;
this.addModal = false;
this.$refs.addModal.entity = {};
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.deletelMore = false;
},
//多选处理--表格选择项变化方法
selectionChange(selection) {
this.selectedRows = selection;
this.footerModel = selection.length > 0;
},
deleteMore() {
this.deletelMore = true;
},
l(key) {
/*
calendar_work:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
title:'日历名称',
calendarClassId:'关联班次',
calendarClassTitle:'',
calendarClassStart:'',
calendarClassEnd:'',
workHours:'工作时长',
}
*/
let vkey = "calendar_work" + "." + key;
return this.$t(vkey) || key;
},
},
};
</script> </script>
<style lang="less"> <style lang="less">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment