提交 ad5749fe authored 作者: lidongxu's avatar lidongxu

refactor(promotion/plan): 计划任务中上下班时间设置改为时分,秒固定为0

同上
上级 c55177fb
...@@ -17,4 +17,13 @@ export function createExamine(data) { ...@@ -17,4 +17,13 @@ export function createExamine(data) {
method: 'post', method: 'post',
data: data data: data
}) })
}
// 获取稽核任务列表
export function getExamineList() {
return request({
baseURL: VITE_APP_PROMOTION,
url: `/exa/query/page`,
method: 'post',
})
} }
\ No newline at end of file
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
accept="image/*" accept="image/*"
v-model="form.storePicture" v-model="form.storePicture"
:after-read="storePictureRead" :after-read="storePictureRead"
:capture="['camera', 'album']"
preview-size="120" preview-size="120"
@delete="deleteStorePicture"> @delete="deleteStorePicture">
</van-uploader> </van-uploader>
......
差异被折叠。
...@@ -349,24 +349,24 @@ ...@@ -349,24 +349,24 @@
<el-col :span="12"> <el-col :span="12">
<!-- 上班打卡时间 --> <!-- 上班打卡时间 -->
<el-form-item label="上班打卡时间" <el-form-item label="上班打卡时间"
prop="clockInTime"> prop="inTime">
<el-time-picker v-model="addOrEditPlanForm.clockInTime" <el-time-picker v-model="addOrEditPlanForm.inTime"
placeholder="选择时间" placeholder="选择时间"
format="HH:mm" format="HH:mm"
value-format="YYYY-MM-DDTHH:mm:ss" value-format="HH:mm:ss"
style="width: 95%" /> style="width: 95%" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- 下班打卡时间 --> <!-- 下班打卡时间 -->
<el-form-item label="下班打卡时间" <el-form-item label="下班打卡时间"
prop="clockOutTime"> prop="outTime">
<el-time-picker v-model="addOrEditPlanForm.clockOutTime" <el-time-picker v-model="addOrEditPlanForm.outTime"
placeholder="选择时间" placeholder="选择时间"
format="HH:mm" format="HH:mm"
value-format="YYYY-MM-DDTHH:mm:ss" value-format="HH:mm:ss"
style="width: 95%" style="width: 95%"
:disabled="!addOrEditPlanForm.clockInTime" :disabled="!addOrEditPlanForm.inTime"
:disabled-hours="disabledHours" :disabled-hours="disabledHours"
:disabled-minutes="disabledMinutes" :disabled-minutes="disabledMinutes"
:disabled-seconds="disabledSeconds" /> :disabled-seconds="disabledSeconds" />
...@@ -1003,14 +1003,14 @@ const addOrEditPlanFormRules = reactive({ ...@@ -1003,14 +1003,14 @@ const addOrEditPlanFormRules = reactive({
trigger: 'blur' trigger: 'blur'
} }
], ],
clockInTime: [ inTime: [
{ {
required: true, required: true,
message: '请选择上班打卡时间', message: '请选择上班打卡时间',
trigger: 'blur' trigger: 'blur'
} }
], ],
clockOutTime: [ outTime: [
{ {
required: true, required: true,
message: '请选择下班打卡时间', message: '请选择下班打卡时间',
...@@ -1082,21 +1082,21 @@ const makeRange = (start, end) => { ...@@ -1082,21 +1082,21 @@ const makeRange = (start, end) => {
} }
const disabledHours = (h) => { const disabledHours = (h) => {
// 根据上班时间选择的结果,禁用小时 // 根据上班时间选择的结果,禁用小时
const date = new Date(addOrEditPlanForm.value.clockInTime) const date = new Date(addOrEditPlanForm.value.nTime)
return makeRange(0, date.getHours() - 1); return makeRange(0, date.getHours() - 1);
} }
const disabledMinutes = (h, m) => { const disabledMinutes = (h, m) => {
// 如果小时大于上班打卡时间小时,则不限制分钟 // 如果小时大于上班打卡时间小时,则不限制分钟
const inDate = new Date(addOrEditPlanForm.value.clockInTime) const inDate = new Date(addOrEditPlanForm.value.inTime)
if (h > inDate.getHours()) { if (h > inDate.getHours()) {
return makeRange(0, -1); return makeRange(0, -1);
} else { } else {
const date = new Date(addOrEditPlanForm.value.clockInTime) const date = new Date(addOrEditPlanForm.value.inTime)
return makeRange(0, date.getMinutes() - 1); return makeRange(0, date.getMinutes() - 1);
} }
} }
const disabledSeconds = (h, m, s) => { const disabledSeconds = (h, m, s) => {
const date = new Date(addOrEditPlanForm.value.clockInTime) const date = new Date(addOrEditPlanForm.value.inTime)
return makeRange(0, date.getSeconds() - 1); return makeRange(0, date.getSeconds() - 1);
} }
...@@ -1112,22 +1112,13 @@ const handleAddOrEditPlan = async () => { ...@@ -1112,22 +1112,13 @@ const handleAddOrEditPlan = async () => {
addOrEditPlanForm.value.operNo = userStore().getEmployeeNo addOrEditPlanForm.value.operNo = userStore().getEmployeeNo
addOrEditPlanForm.value.operName = store.state.value.user.userInfo.nickName addOrEditPlanForm.value.operName = store.state.value.user.userInfo.nickName
addOrEditPlanForm.value.operId = store.state.value.user.userInfo.userId addOrEditPlanForm.value.operId = store.state.value.user.userInfo.userId
// 上班打卡和下班打卡时间前面要和 date 创建任务的年月日一致
console.log(addOrEditPlanForm.value)
const nowDate = new Date(addOrEditPlanForm.value.date)
const clockInTime = new Date(addOrEditPlanForm.value.clockInTime)
clockInTime.setFullYear(nowDate.getFullYear())
clockInTime.setMonth(nowDate.getMonth())
clockInTime.setDate(nowDate.getDate())
// 下班打卡时间
const clockOutTime = new Date(addOrEditPlanForm.value.clockOutTime)
clockOutTime.setFullYear(nowDate.getFullYear())
clockOutTime.setMonth(nowDate.getMonth())
clockOutTime.setDate(nowDate.getDate())
const dataObj = { const dataObj = {
...addOrEditPlanForm.value, ...addOrEditPlanForm.value,
clockInTime, // 格式是 xx:xx:xx,替换最后一对 xx 为 00
clockOutTime inTime: addOrEditPlanForm.value.inTime.replace(/:\d{2}$/, ':00'),
outTime: addOrEditPlanForm.value.outTime.replace(/:\d{2}$/, ':00')
} }
if (dataObj.id) { if (dataObj.id) {
// 根据归属人 employeeId 查询它的 id 和名字 // 根据归属人 employeeId 查询它的 id 和名字
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论