Skip to content

D
dl-ehr-mini
Commit 95a3248a by ningjihai
Options

外出---当日外出

parent 241c0d86
正在显示 包含 88 行增加 和 88 行删除
api/attendance/outside.ts
......@@ -5,7 +5,7 @@ import request from '../../common/utils/request'
* @param {object} data 查询参数
* @param {object} data.pageNum 页数
* @param {object} data.pageSize 条数
* @param {object} data.location 外出地点
* @param {object} data.location 当日外出地点
*/
export function getOutsideApplylist(data) {
return request({
......@@ -16,13 +16,13 @@ export function getOutsideApplylist(data) {
}
/**
* 考勤-外出新增
* 考勤-当日外出新增
* @param {object} data 提交数据
* @param {string} data.location 外出地点
* @param {string} data.outsideDate 外出日期
* @param {string} data.expectBeginTime 预计外出开始时间
* @param {string} data.expectEndTime 预计外出结束时间
* @param {string} data.reason 外出事由
* @param {string} data.location 当日外出地点
* @param {string} data.outsideDate 当日外出日期
* @param {string} data.expectBeginTime 预计当日外出开始时间
* @param {string} data.expectEndTime 预计当日外出结束时间
* @param {string} data.reason 当日外出事由
*/
export function addOutsideApply(data) {
return request({
......@@ -33,15 +33,15 @@ export function addOutsideApply(data) {
}
/**
* 考勤-外出更新
* 考勤-当日外出更新
* @param {object} data 提交数据
* @param {string} data.id
* @param {string} data.auditStatus 审核状态
* @param {string} data.location 外出地点
* @param {string} data.outsideDate 外出日期
* @param {string} data.expectBeginTime 预计外出开始时间
* @param {string} data.expectEndTime 预计外出结束时间
* @param {string} data.reason 外出事由
* @param {string} data.location 当日外出地点
* @param {string} data.outsideDate 当日外出日期
* @param {string} data.expectBeginTime 预计当日外出开始时间
* @param {string} data.expectEndTime 预计当日外出结束时间
* @param {string} data.reason 当日外出事由
*/
export function editOutsideApply(data) {
return request({
......@@ -52,7 +52,7 @@ export function editOutsideApply(data) {
}
/**
* 考勤-外出详情
* 考勤-当日外出详情
* @param {string} id id
*/
export function getOutsideApplyInfo(id) {
......
approve/modules/attendance/cardSign/index.vue
......@@ -43,7 +43,7 @@ function onClickItem(item) {
})
}
// 外出撤办
// 当日外出撤办
function onRevoke(item) {
uni.showModal({
title: '撤办',
......
approve/modules/attendance/outside/add.vue
......@@ -86,16 +86,16 @@ onLoad((option) => {
// 表单验证规则
const rules = reactive({
location: [
{ required: true, message: '请输入外出地点' }
{ required: true, message: '请输入当日外出地点' }
],
outsideDate: [
{ required: true, message: '请选择外出日期' }
{ required: true, message: '请选择当日外出日期' }
],
expectBeginTime: [
{ required: true, message: '请选择外出开始时间' }
{ required: true, message: '请选择当日外出开始时间' }
],
expectEndTime: [
{ required: true, message: '请选择外出结束时间' }
{ required: true, message: '请选择当日外出结束时间' }
],
reason: [
{ required: true, message: '请输入事由' }
......@@ -105,7 +105,7 @@ const rules = reactive({
]
})
// 选择外出日期 - 确认
// 选择当日外出日期 - 确认
function onConfirmOutside(e) {
console.log(e)
......@@ -231,11 +231,11 @@ const onConfirmExpectEndTimeRef = (e) =>{
<div class="container__body">
<div class="container__card flex form-card-container">
<uv-form ref="formRef" labelWidth="140" label-position="top" :rules="rules" :model="form" >
<!-- 外出地点 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出地点" prop="location" required>
<!-- 当日外出地点 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出地点" prop="location" required>
<uv-textarea
v-model="form.location"
placeholder="请输入外出地点"
placeholder="请输入当日外出地点"
maxlength="300"
count
:rules="rules.location"
......@@ -243,13 +243,13 @@ const onConfirmExpectEndTimeRef = (e) =>{
/>
</uv-form-item>
<!-- 外出日期 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出日期" prop="outsideDate" required @click="openOutsideDatePicker">
<!-- 当日外出日期 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出日期" prop="outsideDate" required @click="openOutsideDatePicker">
<uv-input
v-model="form.outsideDate"
disabled
disabledColor="#fff"
placeholder="点击选择外出日期"
placeholder="点击选择当日外出日期"
border="none"
/>
<template v-slot:right>
......@@ -279,12 +279,12 @@ const onConfirmExpectEndTimeRef = (e) =>{
<!-- 时间范围选择 -->
<template v-if="form.offNeedCheck === '1'">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-input
v-model="form.expectBeginTime"
disabled
disabledColor="#fff"
placeholder="点击选择外出开始时间"
placeholder="点击选择当日外出开始时间"
border="none"
/>
<template v-slot:right>
......@@ -299,12 +299,12 @@ const onConfirmExpectEndTimeRef = (e) =>{
@confirm="onConfirmExpectBeginTimeRef"
/>
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出结束时间" prop="expectEndTime" required @click="openExpectEndTimeRef">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出结束时间" prop="expectEndTime" required @click="openExpectEndTimeRef">
<uv-input
v-model="form.expectEndTime"
disabled
disabledColor="#fff"
placeholder="点击选择外出结束时间"
placeholder="点击选择当日外出结束时间"
border="none"
/>
<template v-slot:right>
......@@ -326,12 +326,12 @@ const onConfirmExpectEndTimeRef = (e) =>{
<!-- 仅开始时间选择 -->
<template v-else>
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-input
v-model="form.expectBeginTime"
disabled
disabledColor="#fff"
placeholder="点击选择外出开始时间"
placeholder="点击选择当日外出开始时间"
border="none"
/>
<template v-slot:right>
......
approve/modules/attendance/outside/list.vue
......@@ -49,7 +49,7 @@ function onClickAdd() {
uni.navigateTo({ url: '/attendance/outside/add' })
}
// 外出撤办
// 当日外出撤办
function onRevoke(item) {
uni.showModal({
......
approve/modules/attendance/outside/modules/DetailFlow.vue
......@@ -41,13 +41,13 @@ function onPreview(index) {
<template>
<div>
<van-cell-group>
<van-cell title="外出地点" :value="detail.location" />
<van-cell title="外出日期" :value="detail.outsideDate" />
<van-cell title="预计外出开始时间" :value="detail.expectBeginTime" />
<van-cell title="预计外出结束时间" :value="detail.expectEndTime" />
<van-cell title="实际外出开始时间" :value="detail.actualBeginTime ?? '-'" />
<van-cell title="实际外出结束时间" :value="detail.actualEndTime ?? '-'" />
<van-cell title="外出事由" :value="detail.reason" />
<van-cell title="当日外出地点" :value="detail.location" />
<van-cell title="当日外出日期" :value="detail.outsideDate" />
<van-cell title="预计当日外出开始时间" :value="detail.expectBeginTime" />
<van-cell title="预计当日外出结束时间" :value="detail.expectEndTime" />
<van-cell title="实际当日外出开始时间" :value="detail.actualBeginTime ?? '-'" />
<van-cell title="实际当日外出结束时间" :value="detail.actualEndTime ?? '-'" />
<van-cell title="当日外出事由" :value="detail.reason" />
<van-grid
v-if="detail.fileList?.length"
:border="false"
......
approve/modules/attendance/outside/modules/OutsideListItem.vue
......@@ -23,15 +23,15 @@ function onRevoke() {
<div class="list-item__top">
<div class="list-item__top-title">
<div class="list-item__top-title-firstword">{{ props.userInfo.nickName.substr(0, 1) }}</div>
<div class="list-item__top-title-label">{{ props.userInfo.nickName }}提交的外出</div>
<div class="list-item__top-title-label">{{ props.userInfo.nickName }}提交的当日外出</div>
</div>
<div class="list-item__top-time">{{ parseTime(props.item.createTime, '{y}-{m}-{d}') }}</div>
</div>
<div class="list-item__date">外出日期：{{ props.item.outsideDate }}</div>
<div class="list-item__date">预计外出开始时间：{{ props.item.expectBeginTime.split(' ')[1] }}</div>
<div class="list-item__date">预计外出结束时间：{{ props.item.expectEndTime.split(' ')[1] }}</div>
<div class="list-item__date">实际外出开始时间：{{ props.item.actualBeginTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__date">实际外出结束时间：{{ props.item.actualEndTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__date">当日外出日期：{{ props.item.outsideDate }}</div>
<div class="list-item__date">预计当日外出开始时间：{{ props.item.expectBeginTime.split(' ')[1] }}</div>
<div class="list-item__date">预计当日外出结束时间：{{ props.item.expectEndTime.split(' ')[1] }}</div>
<div class="list-item__date">实际当日外出开始时间：{{ props.item.actualBeginTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__date">实际当日外出结束时间：{{ props.item.actualEndTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__detail">
<div>请假事由：</div>
<div class="list-item__detail-content">{{ props.item.reason }}</div>
......
approve/modules/carUse/apply/list.vue
......@@ -54,7 +54,7 @@ function onClickAdd() {
}
// 外出撤办
// 当日外出撤办
function onRevoke(item) {
showConfirmDialog({
title: '撤办',
......
attendance/cardSign/index.vue
......@@ -43,7 +43,7 @@ function onClickItem(item) {
})
}
// 外出撤办
// 当日外出撤办
function onRevoke(item) {
console.log(item)
uni.showModal({
......
attendance/clockinCalendar/index.vue
......@@ -181,7 +181,7 @@ onMounted(async () => {
<div class="tipeLi">
<div class="topTime">
<div class="icon icon5" />
<span>当天提交过：外出/出差</span>
<span>当天提交过：当日外出/出差</span>
</div>
</div>
<div class="tipeLi">
......
attendance/outside/add.vue
......@@ -86,16 +86,16 @@ onLoad((option) => {
// 表单验证规则
const rules = reactive({
location: [
{ required: true, message: '请输入外出地点' }
{ required: true, message: '请输入当日外出地点' }
],
outsideDate: [
{ required: true, message: '请选择外出日期' }
{ required: true, message: '请选择当日外出日期' }
],
expectBeginTime: [
{ required: true, message: '请选择外出开始时间' }
{ required: true, message: '请选择当日外出开始时间' }
],
expectEndTime: [
{ required: true, message: '请选择外出结束时间' }
{ required: true, message: '请选择当日外出结束时间' }
],
reason: [
{ required: true, message: '请输入事由' }
......@@ -105,7 +105,7 @@ const rules = reactive({
]
})
// 选择外出日期 - 确认
// 选择当日外出日期 - 确认
function onConfirmOutside(e) {
console.log(e)
......@@ -231,11 +231,11 @@ const onConfirmExpectEndTimeRef = (e) =>{
<div class="container__body">
<div class="container__card flex form-card-container">
<uv-form ref="formRef" labelWidth="140" label-position="top" :rules="rules" :model="form" >
<!-- 外出地点 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出地点" prop="location" required>
<!-- 当日外出地点 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出地点" prop="location" required>
<uv-textarea
v-model="form.location"
placeholder="请输入外出地点"
placeholder="请输入当日外出地点"
maxlength="300"
count
:rules="rules.location"
......@@ -243,13 +243,13 @@ const onConfirmExpectEndTimeRef = (e) =>{
/>
</uv-form-item>
<!-- 外出日期 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出日期" prop="outsideDate" required @click="openOutsideDatePicker">
<!-- 当日外出日期 -->
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出日期" prop="outsideDate" required @click="openOutsideDatePicker">
<uv-input
v-model="form.outsideDate"
disabled
disabledColor="#fff"
placeholder="点击选择外出日期"
placeholder="点击选择当日外出日期"
border="none"
/>
<template v-slot:right>
......@@ -279,12 +279,12 @@ const onConfirmExpectEndTimeRef = (e) =>{
<!-- 时间范围选择 -->
<template v-if="form.offNeedCheck === '1'">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-input
v-model="form.expectBeginTime"
disabled
disabledColor="#fff"
placeholder="点击选择外出开始时间"
placeholder="点击选择当日外出开始时间"
border="none"
/>
<template v-slot:right>
......@@ -299,12 +299,12 @@ const onConfirmExpectEndTimeRef = (e) =>{
@confirm="onConfirmExpectBeginTimeRef"
/>
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出结束时间" prop="expectEndTime" required @click="openExpectEndTimeRef">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出结束时间" prop="expectEndTime" required @click="openExpectEndTimeRef">
<uv-input
v-model="form.expectEndTime"
disabled
disabledColor="#fff"
placeholder="点击选择外出结束时间"
placeholder="点击选择当日外出结束时间"
border="none"
/>
<template v-slot:right>
......@@ -326,12 +326,12 @@ const onConfirmExpectEndTimeRef = (e) =>{
<!-- 仅开始时间选择 -->
<template v-else>
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-form-item borderBottom customStyle="padding: 20rpx 32rpx;" label="当日外出开始时间" prop="expectBeginTime" required @click="openExpectBeginTimeRef">
<uv-input
v-model="form.expectBeginTime"
disabled
disabledColor="#fff"
placeholder="点击选择外出开始时间"
placeholder="点击选择当日外出开始时间"
border="none"
/>
<template v-slot:right>
......
attendance/outside/list.vue
......@@ -49,7 +49,7 @@ function onClickAdd() {
uni.navigateTo({ url: '/attendance/outside/add' })
}
// 外出撤办
// 当日外出撤办
function onRevoke(item) {
uni.showModal({
......
attendance/outside/modules/DetailFlow.vue
......@@ -41,13 +41,13 @@ function onPreview(index) {
<template>
<div>
<van-cell-group>
<van-cell title="外出地点" :value="detail.location" />
<van-cell title="外出日期" :value="detail.outsideDate" />
<van-cell title="预计外出开始时间" :value="detail.expectBeginTime" />
<van-cell title="预计外出结束时间" :value="detail.expectEndTime" />
<van-cell title="实际外出开始时间" :value="detail.actualBeginTime ?? '-'" />
<van-cell title="实际外出结束时间" :value="detail.actualEndTime ?? '-'" />
<van-cell title="外出事由" :value="detail.reason" />
<van-cell title="当日外出地点" :value="detail.location" />
<van-cell title="当日外出日期" :value="detail.outsideDate" />
<van-cell title="预计当日外出开始时间" :value="detail.expectBeginTime" />
<van-cell title="预计当日外出结束时间" :value="detail.expectEndTime" />
<van-cell title="实际当日外出开始时间" :value="detail.actualBeginTime ?? '-'" />
<van-cell title="实际当日外出结束时间" :value="detail.actualEndTime ?? '-'" />
<van-cell title="当日外出事由" :value="detail.reason" />
<van-grid
v-if="detail.fileList?.length"
:border="false"
......
attendance/outside/modules/OutsideListItem.vue
......@@ -23,15 +23,15 @@ function onRevoke() {
<div class="list-item__top">
<div class="list-item__top-title">
<div class="list-item__top-title-firstword">{{ props.userInfo.nickName.substr(0, 1) }}</div>
<div class="list-item__top-title-label">{{ props.userInfo.nickName }}提交的外出</div>
<div class="list-item__top-title-label">{{ props.userInfo.nickName }}提交的当日外出</div>
</div>
<div class="list-item__top-time">{{ parseTime(props.item.createTime, '{y}-{m}-{d}') }}</div>
</div>
<div class="list-item__date">外出日期：{{ props.item.outsideDate }}</div>
<div class="list-item__date">预计外出开始时间：{{ props.item.expectBeginTime.split(' ')[1] }}</div>
<div class="list-item__date">预计外出结束时间：{{ props.item.expectEndTime.split(' ')[1] }}</div>
<div class="list-item__date">实际外出开始时间：{{ props.item.actualBeginTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__date">实际外出结束时间：{{ props.item.actualEndTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__date">当日外出日期：{{ props.item.outsideDate }}</div>
<div class="list-item__date">预计当日外出开始时间：{{ props.item.expectBeginTime.split(' ')[1] }}</div>
<div class="list-item__date">预计当日外出结束时间：{{ props.item.expectEndTime.split(' ')[1] }}</div>
<div class="list-item__date">实际当日外出开始时间：{{ props.item.actualBeginTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__date">实际当日外出结束时间：{{ props.item.actualEndTime?.split(' ')[1] ?? '-' }}</div>
<div class="list-item__detail">
<div>请假事由：</div>
<div class="list-item__detail-content">{{ props.item.reason }}</div>
......
carUse/apply/list.vue
......@@ -45,7 +45,7 @@ function onClickAdd() {
}
// 外出撤办
// 当日外出撤办
function onRevoke(item) {
showConfirmDialog({
title: '撤办',
......
pages.json
......@@ -190,7 +190,7 @@
},{
"path": "outside/list",
"style": {
"navigationBarTitleText": "外出申请记录",
"navigationBarTitleText": "当日外出申请记录",
"componentPlaceholder": {
"custom-button": "view"
}
......@@ -198,7 +198,7 @@
},{
"path": "outside/add",
"style": {
"navigationBarTitleText": "外出申请",
"navigationBarTitleText": "当日外出申请",
"componentPlaceholder": {
"custom-button": "view"
}
......@@ -206,7 +206,7 @@
},{
"path": "outside/detail",
"style": {
"navigationBarTitleText": "外出详情",
"navigationBarTitleText": "当日外出详情",
"componentPlaceholder": {
"custom-button": "view"
}
......
pages/approve/index.vue
......@@ -41,7 +41,7 @@ const processCode = {
'yichangjiaban': 'abnormalOvertime', // 考勤-异常加班申请
'jititiaoxiu': 'dayOff', // 考勤-集体调休
'qianka': 'cardSign', // 考勤-签卡
'waichushenqing': 'outside', // 考勤-外出申请
'waichushenqing': 'outside', // 考勤-当日外出申请
'zhaopinxuqiu': 'recruitmentNeeds', // 人事-招聘需求申请
'niruzhi': 'employmentApplication', // 人事-拟入职申请
'ruzhishenqing': '', // 人事-入职申请
......@@ -87,7 +87,7 @@ const processCode = {
// 'ATT_REGISTER_CARD': 'cardSign', // 考勤-签卡
// 'ATT_REGISTER_CARD_FACTORY': 'cardSign',
// 'ATT_REGISTER_CARD_MARKETING': 'cardSign',
// 'ATT_OUTSIDE_APPLY': 'outside' // 考勤-外出申请
// 'ATT_OUTSIDE_APPLY': 'outside' // 考勤-当日外出申请
}
provide('process_group', process_group)
......
pages/stage/index.vue
......@@ -107,7 +107,7 @@ const partList = ref([
// hide: userInfo.value.companyId !== '18'
},
{
name: '外出申请',
name: '当日外出申请',
type: 'waichushenqing',
url: lizhishenqing
}
......@@ -315,7 +315,7 @@ function handleNavPageXitem(val:any) {
url: '/attendance/overTimeForLeave/list'
})
break
case 'waichushenqing': // 外出申请
case 'waichushenqing': // 当日外出申请
uni.navigateTo({
url: '/attendance/outside/list'
})
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论