diff --git a/src/pages/ask-leave/create.vue b/src/pages/ask-leave/create.vue index e8282d9..8dd8cb6 100644 --- a/src/pages/ask-leave/create.vue +++ b/src/pages/ask-leave/create.vue @@ -39,7 +39,7 @@ - + @@ -114,37 +114,21 @@ const rules = reactive({ type_id: [{ required: true, message: "请选择请假类别" }] }) onLoad(options => { - http - .request({ - url: `/keywords?parent_key=holiday_type`, - method: "GET", - header: { - Accept: "application/json" - } - }) - .then(res => { - let names = res.map(item => item.name) - columns.value = [names] - pickerData.value = res - }) + http.get(`/keywords?parent_key=holiday_type`).then(res => { + let names = res.map(item => item.name) + columns.value = [names] + pickerData.value = res + }) id.value = options.id if (id.value) { - http - .request({ - url: `/hr/holidays/${options.id}`, - method: "GET", - header: { - Accept: "application/json" - } - }) - .then(res => { - startValue.value = res.start_at * 1000 - endValue.value = res.end_at * 1000 - form.start_at = timeFormat(res.start_at, "yyyy-mm-dd hh:MM:ss") - form.end_at = timeFormat(res.end_at, "yyyy-mm-dd hh:MM:ss") - form.reason = res.reason - form.type_id = res.type.name - }) + http.get(`/hr/holidays/${options.id}`).then(res => { + startValue.value = res.start_at * 1000 + endValue.value = res.end_at * 1000 + form.start_at = timeFormat(res.start_at, "yyyy-mm-dd hh:MM:ss") + form.end_at = timeFormat(res.end_at, "yyyy-mm-dd hh:MM:ss") + form.reason = res.reason + form.type_id = res.type.name + }) } }) diff --git a/src/pages/ask-leave/detail.vue b/src/pages/ask-leave/detail.vue index b209195..af10966 100644 --- a/src/pages/ask-leave/detail.vue +++ b/src/pages/ask-leave/detail.vue @@ -33,9 +33,9 @@ const id = ref(0) const columns = [ { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') }, { title: '申请人', dataIndex: 'employee.name' }, + { title: '申请时间', dataIndex: 'created_format' }, { title: '所属门店', dataIndex: 'store.title' }, { title: '电话号码', dataIndex: 'employee.phone' }, - { title: '申请时间', dataIndex: 'created_format' }, { title: '请假类型', dataIndex: 'type.name' }, { title: '请假开始时间', dataIndex: 'start_format' }, { title: '请假结束时间', dataIndex: 'end_format' }, diff --git a/src/pages/ask-leave/list.vue b/src/pages/ask-leave/list.vue index b6a4c2c..0992514 100644 --- a/src/pages/ask-leave/list.vue +++ b/src/pages/ask-leave/list.vue @@ -26,8 +26,8 @@ @@ -144,22 +144,14 @@ onLoad((options) => { form.sign_time = options.type == 1 ? '上班补卡' : '下班补卡' } if (id.value) { - http - .request({ - url: `/hr/sign-repairs/${options.id}`, - method: 'GET', - header: { - Accept: 'application/json', - }, - }) - .then((res) => { - value.value = res.date * 1000 - form.date = timeFormat(res.date, 'yyyy-mm-dd hh:MM') - form.reason = res.reason - form.isOutSide = res.sign_type == 1 ? false : true - form.outside_remarks = res.outside_remarks - form.sign_time = res.sign_time == 1 ? '上班补卡' : '下班补卡' - }) + http.get(`/hr/sign-repairs/${options.id}`).then((res) => { + value.value = res.date * 1000 + form.date = timeFormat(res.date, 'yyyy-mm-dd hh:MM') + form.reason = res.reason + form.isOutSide = res.sign_type == 1 ? false : true + form.outside_remarks = res.outside_remarks + form.sign_time = res.sign_time == 1 ? '上班补卡' : '下班补卡' + }) } })