Commit 68c131ee by wangchunyang

增加区县使用划分,样式调整

parent 51151952
...@@ -292,6 +292,7 @@ import { ...@@ -292,6 +292,7 @@ import {
getUserDmPermissionList, getUserDmPermissionList,
getLeaveApprovalPermission getLeaveApprovalPermission
} from '@/api/key-dm' } from '@/api/key-dm'
import { normalizeVisitTimeValue } from '@/view/key-person/key_dm_conf/dates.js'
// 注意:不单独调用后台的 isPending 接口,改为复用 getPendingLeaveList 获取 totalRecord 判定是否存在待办 // 注意:不单独调用后台的 isPending 接口,改为复用 getPendingLeaveList 获取 totalRecord 判定是否存在待办
export default { export default {
...@@ -783,7 +784,7 @@ export default { ...@@ -783,7 +784,7 @@ export default {
this.applyModal.isEdit = false this.applyModal.isEdit = false
// 默认开始时间为当天(时分秒置为 0),精确到天 // 默认开始时间为当天(时分秒置为 0),精确到天
const today = new Date() const today = new Date()
today.setHours(0, 0, 0, 0) today.setHours(8, 0, 0, 0)
this.applyModal.form = { user_id: '', user_name: '', leave_type_id: '', start_time: today, end_time: '', duration_unit: 2, duration: '', reason: '', emergency_contact: '', emergency_phone: '', approver_id: this.selectedApprovalUser || '' } this.applyModal.form = { user_id: '', user_name: '', leave_type_id: '', start_time: today, end_time: '', duration_unit: 2, duration: '', reason: '', emergency_contact: '', emergency_phone: '', approver_id: this.selectedApprovalUser || '' }
this.applyModal.visible = true this.applyModal.visible = true
}, },
...@@ -1103,9 +1104,11 @@ export default { ...@@ -1103,9 +1104,11 @@ export default {
}, },
loadStats () { loadStats () {
this.loading.stats = true this.loading.stats = true
const st = this.statsStart ? normalizeVisitTimeValue(this.statsStart) : null
const et = this.statsEnd ? normalizeVisitTimeValue(this.statsEnd).substring(0, 10) + ' 23:59:59' : null
getLeaveStats({ getLeaveStats({
start: this.statsStart, start: st,
end: this.statsEnd, end: et,
department: this.statsDept department: this.statsDept
}).then(ret => { }).then(ret => {
if (ret.data && ret.data.errcode === 0) { if (ret.data && ret.data.errcode === 0) {
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
<FormItem label="姓名"> <FormItem label="姓名">
<Input v-model="editModal.form.name" disabled /> <Input v-model="editModal.form.name" disabled />
</FormItem> </FormItem>
<FormItem label="工号"> <!-- <FormItem label="工号">
<Input v-model="editModal.form.gh" disabled /> <Input v-model="editModal.form.gh" disabled />
</FormItem> </FormItem> -->
<FormItem label="电话"> <FormItem label="电话">
<Input v-model="editModal.form.phone" /> <Input v-model="editModal.form.phone" />
</FormItem> </FormItem>
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
columns: [ columns: [
{ type: 'index', title: '序号', width: 60, align: 'center' }, { type: 'index', title: '序号', width: 60, align: 'center' },
{ title: '姓名', key: 'name', align: 'center' }, { title: '姓名', key: 'name', align: 'center' },
{ title: '工号', key: 'gh', align: 'center' }, // { title: '工号', key: 'gh', align: 'center' },
{ title: '电话', key: 'phone', align: 'center' }, { title: '电话', key: 'phone', align: 'center' },
{ title: '手机', key: 'mobile', align: 'center' }, { title: '手机', key: 'mobile', align: 'center' },
{ title: '离职', key: 'is_leave', slot: 'is_leave', width: 80, align: 'center' }, { title: '离职', key: 'is_leave', slot: 'is_leave', width: 80, align: 'center' },
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
// no strict validation here, just save // no strict validation here, just save
const formData = Object.assign({}, this.editModal.form) const formData = Object.assign({}, this.editModal.form)
// 如果当前为未离职状态,不提交离职时间字段 // 如果当前为未离职状态,不提交离职时间字段
this.editModal.saving = true this.editModal.saving = true
formData.in_work_time = formData.in_work_time ? normalizeVisitTimeValue(formData.in_work_time) : null formData.in_work_time = formData.in_work_time ? normalizeVisitTimeValue(formData.in_work_time) : null
formData.leave_time = formData.leave_time ? normalizeVisitTimeValue(formData.leave_time) : null formData.leave_time = formData.leave_time ? normalizeVisitTimeValue(formData.leave_time) : null
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论