This commit is contained in:
123 2025-05-14 16:35:34 +08:00
parent 81ee6e69c1
commit d9640b681a
4 changed files with 12 additions and 12 deletions

View File

@ -3,17 +3,17 @@ export interface BusinessTripVO {
leaveType: string; leaveType: string;
startDate: string; startDate: string;
endDate: string; endDate: string;
leaveDays: number; tripDays: number;
remark: string; remark: string;
status?: string; status?: string;
} }
export interface BusinessTripForm extends BaseEntity { export interface BusinessTripForm extends BaseEntity {
id?: string | number; id?: string | number;
leaveType?: string; tripType?: string;
startDate?: string; startDate?: string;
endDate?: string; endDate?: string;
leaveDays?: number; tripDays?: number;
remark?: string; remark?: string;
status?: string; status?: string;
} }

View File

@ -6,9 +6,9 @@
<el-form-item label="出差天数" prop="startLeaveDays"> <el-form-item label="出差天数" prop="startLeaveDays">
<el-input v-model="queryParams.startLeaveDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.startLeaveDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item prop="endLeaveDays"> </el-form-item> <el-form-item prop="endTripDays"> </el-form-item>
<el-form-item prop="endLeaveDays"> <el-form-item prop="endTripDays">
<el-input v-model="queryParams.endLeaveDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.endTripDays" placeholder="请输入出差天数" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -34,7 +34,7 @@
<el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="主键" align="center" prop="id" /> <el-table-column v-if="false" label="主键" align="center" prop="id" />
<el-table-column label="请假类型" align="center"> <el-table-column label="出差类型" align="center">
<template #default="scope"> <template #default="scope">
<el-tag>{{ options.find((e) => e.value === scope.row.leaveType)?.label }}</el-tag> <el-tag>{{ options.find((e) => e.value === scope.row.leaveType)?.label }}</el-tag>
</template> </template>
@ -49,8 +49,8 @@
<span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span> <span>{{ proxy.parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请假天数" align="center" prop="leaveDays" /> <el-table-column label="出差天数" align="center" prop="leaveDays" />
<el-table-column label="请假原因" align="center" prop="remark" /> <el-table-column label="出差原因" align="center" prop="remark" />
<el-table-column align="center" label="流程状态" min-width="70"> <el-table-column align="center" label="流程状态" min-width="70">
<template #default="scope"> <template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag> <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>

View File

@ -16,8 +16,8 @@
<el-card shadow="never" style="height: 78vh; overflow-y: auto"> <el-card shadow="never" style="height: 78vh; overflow-y: auto">
<el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px"> <el-form ref="leaveFormRef" v-loading="loading" :disabled="routeParams.type === 'view'" :model="form" :rules="rules" label-width="80px">
<el-form-item label="请假类型" prop="leaveType"> <el-form-item label="请假类型" prop="leaveType">
<el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%" clearable> <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%">
<el-option v-for="dict in opr_seal_type" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="请假时间"> <el-form-item label="请假时间">

View File

@ -42,7 +42,7 @@
<el-input v-model="form.reason" type="textarea" :rows="3" placeholder="请输入请假原因" /> <el-input v-model="form.reason" type="textarea" :rows="3" placeholder="请输入请假原因" />
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="attachment"> <el-form-item label="附件" prop="attachment">
<el-input v-model="form.attachment" type="textarea" :rows="3" placeholder="请输入请假原因" /> <imageUpload v-model="form.attachment" />
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" /> <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />