diff --git a/.env.production b/.env.production index 89ab5df..66572c5 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ VITE_COMMON_API_PREFIX = /api-base -VITE_COMMON_API_URL = https://store.manage.zlgj168.com/api +VITE_COMMON_API_URL = http://store-manage.hmily.club/api -VITE_COMMON_URL = https://store.manage.zlgj168.com \ No newline at end of file +VITE_COMMON_URL = http://store-manage.hmily.club \ No newline at end of file diff --git a/src/pages/ask-leave/create.vue b/src/pages/ask-leave/create.vue index 8dd8cb6..00aa1b2 100644 --- a/src/pages/ask-leave/create.vue +++ b/src/pages/ask-leave/create.vue @@ -38,8 +38,8 @@ - - + + @@ -110,7 +110,7 @@ const confirmPicker = e => { const rules = reactive({ start_at: [{ required: true, message: "请选择时间" }], end_at: [{ required: true, message: "请选择时间" }], - reason: [{ required: true, message: "请输入请假理由" }], + reason: [{ required: true, message: "请输入请假事由" }], type_id: [{ required: true, message: "请选择请假类别" }] }) onLoad(options => { diff --git a/src/pages/ask-leave/detail.vue b/src/pages/ask-leave/detail.vue index b209195..6e56d6a 100644 --- a/src/pages/ask-leave/detail.vue +++ b/src/pages/ask-leave/detail.vue @@ -39,7 +39,7 @@ const columns = [ { title: '请假类型', dataIndex: 'type.name' }, { title: '请假开始时间', dataIndex: 'start_format' }, { title: '请假结束时间', dataIndex: 'end_format' }, - { title: '请假原因', dataIndex: 'reason', labelPosition: 'top' }, + { title: '请假事由', dataIndex: 'reason', labelPosition: 'top' }, { title: '未通过原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 }, ] diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js index 77d0b99..b8a5ed0 100644 --- a/src/pages/audits/data.data.js +++ b/src/pages/audits/data.data.js @@ -91,7 +91,7 @@ export default { { title: '请假类型', dataIndex: 'check.subject.type.name'}, { title: '请假开始时间', dataIndex: 'check.subject.start_format'}, { title: '请假结束时间', dataIndex: 'check.subject.end_format'}, - { title: '请假原因', dataIndex: 'check.subject.reason', labelPosition: 'top'}, + { title: '请假事由', dataIndex: 'check.subject.reason', labelPosition: 'top'}, { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, ] },