This commit is contained in:
XaoLi717 2024-11-08 11:45:06 +08:00
parent 34dd84d743
commit c2ecda0e60
6 changed files with 79 additions and 78 deletions

View File

@ -49,6 +49,7 @@
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
/>
</el-form-item>
</el-col>
@ -114,7 +115,7 @@ const formData = ref({
usageQuantity: undefined,
unit: undefined,
usagePurpose: undefined,
usageDate: undefined,
usageDate: Date.now(),
status: undefined,
userId: undefined,
processInstanceId: undefined,

View File

@ -171,13 +171,13 @@ const getList = async () => {
}
/**发起操作 */
const handleCreate = () => {
router.push({ name: 'BgypCreate' })
const handleCreate =async () => {
await router.push({name: 'BgypCreate'})
}
/** 审批进度 */
const handleProcessDetail = (row) => {
router.push({
const handleProcessDetail =async (row) => {
await router.push({
name: 'BpmProcessInstanceDetail',
query: {
id: row.processInstanceId
@ -186,8 +186,8 @@ const handleProcessDetail = (row) => {
}
/** 详情操作 */
const handleDetail = (row: LeaveApi.LeaveVO) => {
router.push({
const handleDetail =async (row: LeaveApi.LeaveVO) => {
await router.push({
name: 'BgypDetail',
query: {
id: row.id
@ -231,7 +231,7 @@ const handleExport = async () => {
}
/** 初始化 **/
onMounted(() => {
getList()
onMounted(async () => {
await getList()
})
</script>

View File

@ -272,7 +272,7 @@ const handleExport = async () => {
}
/** 初始化 **/
onMounted(() => {
getList()
onMounted(async () => {
await getList()
})
</script>

View File

@ -30,37 +30,8 @@
<el-input v-model="formData.title" placeholder="请输入申请标题" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="datetime"
value-format="x"
placeholder="选择加班开始时间"
@change="validateDate"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="datetime"
value-format="x"
placeholder="选择加班结束时间"
@change="validateDate"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="加班总时长" prop="duration">
<el-input v-model.number="formData.duration" placeholder="请输入加班总时长" disabled/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="12">
@ -82,10 +53,40 @@
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="datetime"
value-format="x"
placeholder="选择加班开始时间"
@change="validateDate"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="datetime"
value-format="x"
placeholder="选择加班结束时间"
@change="validateDate"
/>
</el-form-item>
</el-col>
</el-row>
<el-col :span="24">
<el-form-item label="加班总时长" prop="duration">
<el-input v-model.number="formData.duration" placeholder="请输入加班总时长" disabled/>
</el-form-item>
</el-col>
<el-form-item label="加班原因" prop="reason">
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" />
</el-form-item>
@ -102,7 +103,6 @@ import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView";
import {getUserProfile} from "@/api/system/user/profile";
import {number} from "echarts";
/** 加班管理 表单 */
defineOptions({ name: 'JbglCreate' })
@ -118,7 +118,7 @@ const formData = ref({
userId: undefined,
deptName: undefined,
deptId: undefined,
usageDate: undefined,
usageDate: Date.now(),
type: undefined,
startDate: undefined,
endDate: undefined,

View File

@ -24,42 +24,13 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="申请标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="datetime"
value-format="x"
placeholder="选择加班开始时间"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="datetime"
value-format="x"
placeholder="选择加班结束时间"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="加班总时长" prop="duration">
<el-input v-model="formData.duration" placeholder="请输入加班总时长" disabled />
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="12">
@ -87,6 +58,35 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="datetime"
value-format="x"
placeholder="选择加班开始时间"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="datetime"
value-format="x"
placeholder="选择加班结束时间"
disabled
/>
</el-form-item>
</el-col>
</el-row>
<el-col :span="24">
<el-form-item label="加班总时长" prop="duration">
<el-input v-model="formData.duration" placeholder="请输入加班总时长" disabled />
</el-form-item>
</el-col>
<el-form-item label="加班原因" prop="reason">
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" disabled />
</el-form-item>

View File

@ -265,7 +265,7 @@ const handleExport = async () => {
}
/** 初始化 **/
onMounted(() => {
getList()
onMounted(async () => {
await getList()
})
</script>