Compare commits
No commits in common. "ada57beec5abaf3791457eb34528665d67978d70" and "f3f08ba3bab3b857a2164bfdd2b2c87954d1bda1" have entirely different histories.
ada57beec5
...
f3f08ba3ba
@ -42,16 +42,16 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="物品名字" prop="usageName">
|
||||||
|
<el-input v-model="formData.usageName" placeholder="请输入申请物品名字" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="物品数量" prop="usageQuantity">
|
<el-form-item label="物品数量" prop="usageQuantity">
|
||||||
<el-input v-model.number="formData.usageQuantity" placeholder="请输入申请物品数量" />
|
<el-input v-model.number="formData.usageQuantity" placeholder="请输入申请物品数量" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="物品名字" prop="usageName">-->
|
|
||||||
<!-- <el-input v-model="formData.usageName" placeholder="请输入申请物品名字" />-->
|
|
||||||
<!-- </el-form-item>-->
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="12">-->
|
|
||||||
<!-- </el-col>-->
|
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
|
|||||||
@ -43,7 +43,6 @@
|
|||||||
type="date"
|
type="date"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
placeholder="选择用车开始时间"
|
placeholder="选择用车开始时间"
|
||||||
@change="validateDate"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -54,7 +53,6 @@
|
|||||||
type="date"
|
type="date"
|
||||||
value-format="x"
|
value-format="x"
|
||||||
placeholder="选择用车结束时间"
|
placeholder="选择用车结束时间"
|
||||||
@change="validateDate"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -152,17 +150,6 @@ const formData = ref({
|
|||||||
carReason: undefined,
|
carReason: undefined,
|
||||||
carRemark: undefined,
|
carRemark: undefined,
|
||||||
})
|
})
|
||||||
// 方法：验证开始时间是否小于结束时间
|
|
||||||
const validateDate = () => {
|
|
||||||
if (formData.value.carStart && formData.value.carEnd) {
|
|
||||||
const start = formData.value.carStart
|
|
||||||
const end = formData.value.carEnd
|
|
||||||
if (start > end) {
|
|
||||||
formData.value.carEnd = undefined
|
|
||||||
message.error('开始时间不能大于结束时间')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
carType: [{ required: true, message: '车辆类型不能为空', trigger: 'change' }],
|
carType: [{ required: true, message: '车辆类型不能为空', trigger: 'change' }],
|
||||||
carDriver: [{ required: true, message: '驾驶员不能为空', trigger: 'blur' }],
|
carDriver: [{ required: true, message: '驾驶员不能为空', trigger: 'blur' }],
|
||||||
|
|||||||
@ -10,80 +10,54 @@
|
|||||||
label-width="100px"
|
label-width="100px"
|
||||||
v-loading="formLoading"
|
v-loading="formLoading"
|
||||||
>
|
>
|
||||||
<el-row>
|
<el-form-item label="申请标题" prop="title">
|
||||||
<el-col :span="12">
|
<el-input v-model="formData.title" placeholder="请输入申请标题" />
|
||||||
<el-form-item label="申请人名字" prop="userName">
|
</el-form-item>
|
||||||
<div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
|
<el-form-item label="申请人名字" prop="userName">
|
||||||
<div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
|
<div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
|
||||||
</el-form-item>
|
<div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="12">
|
<el-form-item label="申请部门名字" prop="deptName">
|
||||||
<el-form-item label="申请部门名字" prop="deptName">
|
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo}} </div>
|
||||||
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo}} </div>
|
<div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
|
||||||
<div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="申请时间" prop="usageDate">
|
||||||
</el-col>
|
<el-date-picker
|
||||||
</el-row>
|
v-model="formData.usageDate"
|
||||||
<el-row>
|
type="date"
|
||||||
<el-col :span="12">
|
value-format="x"
|
||||||
<el-form-item label="申请标题" prop="title">
|
placeholder="选择申请时间"
|
||||||
<el-input v-model="formData.title" placeholder="请输入申请标题" />
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
<el-form-item label="加班类型" prop="type">
|
||||||
<el-col :span="12">
|
<el-select v-model="formData.type" placeholder="请选择加班类型">
|
||||||
<el-form-item label="申请时间" prop="usageDate">
|
<el-option
|
||||||
<el-date-picker
|
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
|
||||||
v-model="formData.usageDate"
|
:key="dict.value"
|
||||||
type="date"
|
:label="dict.label"
|
||||||
value-format="x"
|
:value="dict.value"
|
||||||
placeholder="选择申请时间"
|
/>
|
||||||
/>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
<el-form-item label="加班开始时间" prop="startDate">
|
||||||
</el-row>
|
<el-date-picker
|
||||||
<el-row>
|
v-model="formData.startDate"
|
||||||
<el-col :span="12">
|
type="date"
|
||||||
<el-form-item label="开始时间" prop="startDate">
|
value-format="x"
|
||||||
<el-date-picker
|
placeholder="选择加班开始时间"
|
||||||
v-model="formData.startDate"
|
/>
|
||||||
type="datetime"
|
</el-form-item>
|
||||||
value-format="x"
|
<el-form-item label="加班结束时间" prop="endDate">
|
||||||
placeholder="选择加班开始时间"
|
<el-date-picker
|
||||||
@change="validateDate"
|
v-model="formData.endDate"
|
||||||
/>
|
type="date"
|
||||||
</el-form-item>
|
value-format="x"
|
||||||
</el-col>
|
placeholder="选择加班结束时间"
|
||||||
<el-col :span="12">
|
/>
|
||||||
<el-form-item label="结束时间" prop="endDate">
|
</el-form-item>
|
||||||
<el-date-picker
|
<el-form-item label="加班总时长" prop="duration">
|
||||||
v-model="formData.endDate"
|
<el-input v-model="formData.duration" placeholder="请输入加班总时长" />
|
||||||
type="datetime"
|
</el-form-item>
|
||||||
value-format="x"
|
|
||||||
placeholder="选择加班结束时间"
|
|
||||||
@change="validateDate"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="加班类型" prop="type">
|
|
||||||
<el-select v-model="formData.type" placeholder="请选择加班类型">
|
|
||||||
<el-option
|
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="加班总时长" prop="duration">
|
|
||||||
<el-input v-model.number="formData.duration" placeholder="请输入加班总时长" disabled/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-form-item label="加班原因" prop="reason">
|
<el-form-item label="加班原因" prop="reason">
|
||||||
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" />
|
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -100,7 +74,6 @@ import * as DefinitionApi from '@/api/bpm/definition'
|
|||||||
import * as UserApi from '@/api/system/user'
|
import * as UserApi from '@/api/system/user'
|
||||||
import {useTagsViewStore} from "@/store/modules/tagsView";
|
import {useTagsViewStore} from "@/store/modules/tagsView";
|
||||||
import {getUserProfile} from "@/api/system/user/profile";
|
import {getUserProfile} from "@/api/system/user/profile";
|
||||||
import {number} from "echarts";
|
|
||||||
|
|
||||||
/** 加班管理 表单 */
|
/** 加班管理 表单 */
|
||||||
defineOptions({ name: 'JbglCreate' })
|
defineOptions({ name: 'JbglCreate' })
|
||||||
@ -120,7 +93,7 @@ const formData = ref({
|
|||||||
type: undefined,
|
type: undefined,
|
||||||
startDate: undefined,
|
startDate: undefined,
|
||||||
endDate: undefined,
|
endDate: undefined,
|
||||||
duration: 0,
|
duration: undefined,
|
||||||
reason: undefined,
|
reason: undefined,
|
||||||
status: undefined,
|
status: undefined,
|
||||||
processInstanceId: undefined,
|
processInstanceId: undefined,
|
||||||
@ -138,29 +111,6 @@ const userList = ref<any[]>([]) // 用户列表
|
|||||||
const deptInfo = ref('') // 部门信息
|
const deptInfo = ref('') // 部门信息
|
||||||
const userInfo = ref('') // 用户名字
|
const userInfo = ref('') // 用户名字
|
||||||
|
|
||||||
// 计算属性：计算时间差
|
|
||||||
watchEffect(() => {
|
|
||||||
if (formData.value.startDate && formData.value.endDate) {
|
|
||||||
const start = formData.value.startDate
|
|
||||||
const end = formData.value.endDate
|
|
||||||
const differenceInMs = end - start
|
|
||||||
formData.value.duration = differenceInMs > 0 ? Math.floor(differenceInMs / (1000 * 60 * 60)) : -1;
|
|
||||||
}else {
|
|
||||||
formData.value.duration = 0
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
// 方法：验证开始时间是否小于结束时间
|
|
||||||
const validateDate = () => {
|
|
||||||
if (formData.value.startDate && formData.value.endDate) {
|
|
||||||
const start = formData.value.startDate
|
|
||||||
const end = formData.value.endDate
|
|
||||||
if (start > end) {
|
|
||||||
formData.value.endDate = undefined
|
|
||||||
message.error('开始时间不能大于结束时间')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 获取用户部门
|
// 获取用户部门
|
||||||
const getUserInfo = async () => {
|
const getUserInfo = async () => {
|
||||||
const user = await getUserProfile();
|
const user = await getUserProfile();
|
||||||
@ -230,7 +180,7 @@ const formRules = reactive({
|
|||||||
type: [{ required: true, message: '加班类型不能为空', trigger: 'change' }],
|
type: [{ required: true, message: '加班类型不能为空', trigger: 'change' }],
|
||||||
startDate: [{ required: true, message: '加班开始时间不能为空', trigger: 'blur' }],
|
startDate: [{ required: true, message: '加班开始时间不能为空', trigger: 'blur' }],
|
||||||
endDate: [{ required: true, message: '加班结束时间不能为空', trigger: 'blur' }],
|
endDate: [{ required: true, message: '加班结束时间不能为空', trigger: 'blur' }],
|
||||||
// duration: [{ required: true,type: 'number', message: '加班总时长不能为空且是数字', trigger: 'blur' }],
|
duration: [{ required: true, message: '加班总时长不能为空', trigger: 'blur' }],
|
||||||
})
|
})
|
||||||
const formRef = ref() // 表单 Ref
|
const formRef = ref() // 表单 Ref
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -9,82 +9,58 @@
|
|||||||
label-width="100px"
|
label-width="100px"
|
||||||
v-loading="formLoading"
|
v-loading="formLoading"
|
||||||
>
|
>
|
||||||
<el-row>
|
<el-form-item label="申请标题" prop="title">
|
||||||
<el-col :span="12">
|
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled />
|
||||||
<el-form-item label="申请人名字" prop="userName">
|
</el-form-item>
|
||||||
<div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
|
<el-form-item label="申请人名字" prop="userName">
|
||||||
<div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
|
<div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
|
||||||
</el-form-item>
|
<div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="12">
|
<el-form-item label="申请部门名字" prop="deptName">
|
||||||
<el-form-item label="申请部门名字" prop="deptName">
|
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo}} </div>
|
||||||
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo}} </div>
|
<div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
|
||||||
<div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item label="申请时间" prop="usageDate">
|
||||||
</el-col>
|
<el-date-picker
|
||||||
</el-row>
|
v-model="formData.usageDate"
|
||||||
<el-row>
|
type="date"
|
||||||
<el-col :span="12">
|
value-format="x"
|
||||||
<el-form-item label="申请标题" prop="title">
|
placeholder="选择申请时间"
|
||||||
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled />
|
disabled
|
||||||
</el-form-item>
|
/>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="12">
|
<el-form-item label="加班类型" prop="type">
|
||||||
<el-form-item label="申请时间" prop="usageDate">
|
<el-select v-model="formData.type" placeholder="请选择加班类型" disabled>
|
||||||
<el-date-picker
|
<el-option
|
||||||
v-model="formData.usageDate"
|
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
|
||||||
type="date"
|
:key="dict.value"
|
||||||
value-format="x"
|
:label="dict.label"
|
||||||
placeholder="选择申请时间"
|
:value="dict.value"
|
||||||
disabled
|
disabled
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-select>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
</el-row>
|
<el-form-item label="加班开始时间" prop="startDate">
|
||||||
<el-row>
|
<el-date-picker
|
||||||
<el-col :span="12">
|
v-model="formData.startDate"
|
||||||
<el-form-item label="开始时间" prop="startDate">
|
type="date"
|
||||||
<el-date-picker
|
value-format="x"
|
||||||
v-model="formData.startDate"
|
placeholder="选择加班开始时间"
|
||||||
type="datetime"
|
disabled
|
||||||
value-format="x"
|
/>
|
||||||
placeholder="选择加班开始时间"
|
</el-form-item>
|
||||||
disabled
|
<el-form-item label="加班结束时间" prop="endDate">
|
||||||
/>
|
<el-date-picker
|
||||||
</el-form-item>
|
v-model="formData.endDate"
|
||||||
</el-col>
|
type="date"
|
||||||
<el-col :span="12">
|
value-format="x"
|
||||||
<el-form-item label="结束时间" prop="endDate">
|
placeholder="选择加班结束时间"
|
||||||
<el-date-picker
|
disabled
|
||||||
v-model="formData.endDate"
|
/>
|
||||||
type="datetime"
|
</el-form-item>
|
||||||
value-format="x"
|
<el-form-item label="加班总时长" prop="duration">
|
||||||
placeholder="选择加班结束时间"
|
<el-input v-model="formData.duration" placeholder="请输入加班总时长" disabled />
|
||||||
disabled
|
</el-form-item>
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="加班类型" prop="type">
|
|
||||||
<el-select v-model="formData.type" placeholder="请选择加班类型" disabled>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
disabled
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="12">
|
|
||||||
<el-form-item label="加班总时长" prop="duration">
|
|
||||||
<el-input v-model="formData.duration" placeholder="请输入加班总时长" disabled />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-form-item label="加班原因" prop="reason">
|
<el-form-item label="加班原因" prop="reason">
|
||||||
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" disabled />
|
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user