This commit is contained in:
XaoLi717 2024-10-29 15:07:04 +08:00
parent 27ecb2445e
commit 712573dc13
4 changed files with 509 additions and 157 deletions

View File

@ -376,40 +376,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
}
]
},
// {
// path: '/Home',
// component: Layout,
// name: 'car',
// meta: {
// hidden: true
// },
// children: [
// {
// path: 'clgl/ClglCreate',
// component: () => import('@/views/Home/clgl/ClglCreate.vue'),
// name: 'ClglCreate',
// meta: {
// noCache: true,
// hidden: true,
// canTo: true,
// title: '发起车辆管理流程',
// activeMenu: '/Home/clgl/Clglflow'
// }
// },
// // {
// // path: 'clgl/ClglDetail',
// // component: () => import('@/views/Home/clgl/ClglDetail.vue'),
// // name: 'ClglCreate',
// // meta: {
// // noCache: true,
// // hidden: true,
// // canTo: true,
// // title: '发起车辆管理流程',
// // activeMenu: '/Home/clgl/Clglflow'
// // }
// // },
// ]
// },
{
path: '/mall/product', // 商品中心
component: Layout,
@ -685,9 +651,33 @@ const remainingRouter: AppRouteRecordRaw[] = [
title: '发起请假流程',
activeMenu: '/qjgl/qjglflow'
}
}
},
{
path: 'clgl/ClglCreate',
component: () => import('@/views/Home/clgl/ClglCreate.vue'),
name: 'ClglCreate',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '发起车辆管理流程',
activeMenu: '/Home/clgl/Clglflow'
}
},
{
path: 'clgl/ClglDetail',
component: () => import('@/views/Home/clgl/ClglDetail.vue'),
name: 'ClglDetail',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '发起车辆管理流程',
activeMenu: '/Home/clgl/Clglflow'
}
},
]
}
},
]
export default remainingRouter

View File

@ -0,0 +1,190 @@
<template>
<ContentWrap>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="申请人" prop="carUser">
<el-input v-model="formData.carUser" placeholder="请输入申请人" />
</el-form-item>
<el-form-item label="部门" prop="dept">
<el-input v-model="formData.dept" placeholder="请输入部门" />
</el-form-item>
<el-form-item label="用车类型" prop="carType">
<el-select v-model="formData.carType" placeholder="请选择用车类型">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="驾驶员" prop="carDriver">
<el-input v-model="formData.carDriver" placeholder="请输入驾驶员" />
</el-form-item>
<el-form-item label="用车开始时间" prop="carStart">
<el-date-picker
v-model="formData.carStart"
type="date"
value-format="x"
placeholder="选择用车开始时间"
/>
</el-form-item>
<el-form-item label="用车结束时间" prop="carEnd">
<el-date-picker
v-model="formData.carEnd"
type="date"
value-format="x"
placeholder="选择用车结束时间"
/>
</el-form-item>
<el-form-item label="目的地" prop="carAddress">
<el-input v-model="formData.carAddress" placeholder="请输入目的地" />
</el-form-item>
<el-form-item label="车辆信息" prop="carInfo">
<el-input v-model="formData.carInfo" placeholder="请输入车辆信息" />
</el-form-item>
<el-form-item label="车辆开始里程" prop="carStartMileage">
<el-input v-model="formData.carStartMileage" placeholder="请输入车辆开始里程" />
</el-form-item>
<el-form-item label="车辆结束里程" prop="carEndMileage">
<el-input v-model="formData.carEndMileage" placeholder="请输入车辆结束里程" />
</el-form-item>
<el-form-item label="用车状态" prop="carStatus">
<el-radio-group v-model="formData.carStatus">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="用车原因" prop="carReason">
<el-input v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" />
</el-form-item>
<el-form-item label="备注" prop="carRemark">
<el-input v-model="formData.carRemark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { ClglApi, ClglVO } from '@/api/home/clgl'
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView"
/** 车辆管理 表单 */
defineOptions({ name: 'ClglCreate' })
const { t } = useI18n() //
const message = useMessage() //
const { delView } = useTagsViewStore()//
const { push, currentRoute } = useRouter()
// const dialogVisible = ref(false) //
// const dialogTitle = ref('') //
const formLoading = ref(false) // 12
// const formType = ref('') // create - update -
const formData = ref({
id: undefined,
carUser: undefined,
dept: undefined,
carType: undefined,
carDriver: undefined,
carStart: undefined,
carEnd: undefined,
carAddress: undefined,
carInfo: undefined,
carStartMileage: undefined,
carEndMileage: undefined,
carStatus: undefined,
carReason: undefined,
carRemark: undefined,
})
const formRules = reactive({
carUser: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
dept: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
carType: [{ required: true, message: '用车类型不能为空', trigger: 'change' }],
carDriver: [{ required: true, message: '驾驶员不能为空', trigger: 'blur' }],
carStart: [{ required: true, message: '用车开始时间不能为空', trigger: 'blur' }],
carEnd: [{ required: true, message: '用车结束时间不能为空', trigger: 'blur' }],
carAddress: [{ required: true, message: '目的地不能为空', trigger: 'blur' }],
carStatus: [{ required: true, message: '用车状态不能为空', trigger: 'blur' }],
carReason: [{ required: true, message: '用车原因不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
//
const processDefineKey = 'test-001' // Key
const startUserSelectTasks = ref([]) //
const startUserSelectAssignees = ref({}) //
const startUserSelectAssigneesFormRef = ref() // Ref
const startUserSelectAssigneesFormRules = ref({}) // Rules
const userList = ref<any[]>([]) //
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
// ++
if(startUserSelectTasks.value?.length > 0){
await startUserSelectAssigneesFormRef.value.validate()
}
//
formLoading.value = true
try {
const data = formData.value as unknown as ClglVO
if(startUserSelectTasks.value?.length > 0){
data.startUserSelectAssignees = startUserSelectAssignees.value
}
await ClglApi.createClgl(data)
message.success(t('common.createSuccess'))
delView(unref(currentRoute))
await push({name: 'ClglCreate'})
} finally {
formLoading.value = false
}
}
/** 初始化 */
onMounted(async () => {
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
undefined,
processDefineKey
)
if (!processDefinitionDetail) {
message.error('车辆管理流程模型未配置,请检查!')
return
}
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
//
if (startUserSelectTasks.value?.length > 0) {
//
for (const userTask of startUserSelectTasks.value) {
startUserSelectAssignees.value[userTask.id] = []
startUserSelectAssigneesFormRules.value[userTask.id] = [
{ required: true, message: '请选择审批人', trigger: 'blur' }
]
}
//
userList.value = await UserApi.getSimpleUserList()
}
})
</script>

View File

@ -0,0 +1,200 @@
<template>
<ContentWrap>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="申请人" prop="carUser">
<el-input v-model="formData.carUser" placeholder="请输入申请人" disabled />
</el-form-item>
<el-form-item label="部门" prop="dept">
<el-input v-model="formData.dept" placeholder="请输入部门" disabled/>
</el-form-item>
<el-form-item label="用车类型" prop="carType">
<el-select v-model="formData.carType" placeholder="请选择用车类型" disabled>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
disabled
/>
</el-select>
</el-form-item>
<el-form-item label="驾驶员" prop="carDriver">
<el-input v-model="formData.carDriver" placeholder="请输入驾驶员" disabled />
</el-form-item>
<el-form-item label="用车开始时间" prop="carStart">
<el-date-picker
v-model="formData.carStart"
type="date"
value-format="x"
placeholder="选择用车开始时间"
disabled
/>
</el-form-item>
<el-form-item label="用车结束时间" prop="carEnd">
<el-date-picker
v-model="formData.carEnd"
type="date"
value-format="x"
placeholder="选择用车结束时间"
disabled
/>
</el-form-item>
<el-form-item label="目的地" prop="carAddress">
<el-input v-model="formData.carAddress" placeholder="请输入目的地" disabled/>
</el-form-item>
<el-form-item label="车辆信息" prop="carInfo">
<el-input v-model="formData.carInfo" placeholder="请输入车辆信息" disabled />
</el-form-item>
<el-form-item label="车辆开始里程" prop="carStartMileage">
<el-input v-model="formData.carStartMileage" placeholder="请输入车辆开始里程" disabled />
</el-form-item>
<el-form-item label="车辆结束里程" prop="carEndMileage">
<el-input v-model="formData.carEndMileage" placeholder="请输入车辆结束里程" disabled />
</el-form-item>
<el-form-item label="用车状态" prop="carStatus">
<el-radio-group v-model="formData.carStatus" disabled>
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
:key="dict.value"
:label="dict.value"
disabled
>
{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="用车原因" prop="carReason">
<el-input v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" disabled />
</el-form-item>
<el-form-item label="备注" prop="carRemark">
<el-input v-model="formData.carRemark" type="textarea" placeholder="请输入备注" disabled />
</el-form-item>
</el-form>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { ClglApi } from '@/api/home/clgl'
import {propTypes} from "@/utils/propTypes";
/** 车辆管理 表单 */
defineOptions({ name: 'ClglDetail' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
carUser: undefined,
dept: undefined,
carType: undefined,
carDriver: undefined,
carStart: undefined,
carEnd: undefined,
carAddress: undefined,
carInfo: undefined,
carStartMileage: undefined,
carEndMileage: undefined,
carStatus: undefined,
carReason: undefined,
carRemark: undefined,
})
const { query } = useRoute() //
const props = defineProps({
id: propTypes.number.def(undefined)
})
const detailLoading = ref(false) //
const queryId = query.id as unknown as number // URL id
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
try {
formData.value = await ClglApi.getClgl(props.id || queryId)
} finally {
detailLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getInfo()
})
const formRules = reactive({
// carUser: [{ required: true, message: '', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
// dialogTitle.value = t('action.' + type)
// formType.value = type
// resetForm()
// //
// if (id) {
// formLoading.value = true
// try {
// formData.value = await ClglApi.getClgl(id)
// } finally {
// formLoading.value = false
// }
// }
// }
defineExpose({ open }) // open
/** 提交表单 */
// const emit = defineEmits(['success']) // success
// const submitForm = async () => {
// //
// await formRef.value.validate()
// //
// formLoading.value = true
// try {
// const data = formData.value as unknown as ClglVO
// if (formType.value === 'create') {
// await ClglApi.createClgl(data)
// message.success(t('common.createSuccess'))
// } else {
// await ClglApi.updateClgl(data)
// message.success(t('common.updateSuccess'))
// }
// dialogVisible.value = false
// //
// emit('success')
// } finally {
// formLoading.value = false
// }
// }
/** 重置表单 */
// const resetForm = () => {
// formData.value = {
// id: undefined,
// carUser: undefined,
// dept: undefined,
// carType: undefined,
// carDriver: undefined,
// carStart: undefined,
// carEnd: undefined,
// carAddress: undefined,
// carInfo: undefined,
// carStartMileage: undefined,
// carEndMileage: undefined,
// carStatus: undefined,
// carReason: undefined,
// carRemark: undefined,
// }
// formRef.value?.resetFields()
// }
</script>

View File

@ -8,24 +8,6 @@
:inline="true"
label-width="68px"
>
<!-- <el-form-item label="id" prop="id">-->
<!-- <el-input-->
<!-- v-model="queryParams.id"-->
<!-- placeholder="请输入id"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="申请人" prop="carUser">-->
<!-- <el-input-->
<!-- v-model="queryParams.carUser"-->
<!-- placeholder="请输入申请人"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="部门" prop="dept">
<el-input
v-model="queryParams.dept"
@ -50,62 +32,6 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="驾驶员" prop="carDriver">-->
<!-- <el-input-->
<!-- v-model="queryParams.carDriver"-->
<!-- placeholder="请输入驾驶员"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用车开始时间" prop="carStart">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.carStart"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- type="date"-->
<!-- placeholder="选择用车开始时间"-->
<!-- clearable-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="用车结束时间" prop="carEnd">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.carEnd"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- type="date"-->
<!-- placeholder="选择用车结束时间"-->
<!-- clearable-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="目的地" prop="carAddress">-->
<!-- <el-input-->
<!-- v-model="queryParams.carAddress"-->
<!-- placeholder="请输入目的地"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="车辆开始里程" prop="carStartMileage">-->
<!-- <el-input-->
<!-- v-model="queryParams.carStartMileage"-->
<!-- placeholder="请输入车辆开始里程"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="车辆结束里程" prop="carEndMileage">-->
<!-- <el-input-->
<!-- v-model="queryParams.carEndMileage"-->
<!-- placeholder="请输入车辆结束里程"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="用车状态" prop="carStatus">
<el-select
v-model="queryParams.carStatus"
@ -121,28 +47,9 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="创建时间" prop="createTime">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.createTime"-->
<!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- type="daterange"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['home:clgl:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@ -152,6 +59,15 @@
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
<el-button
type="success"
plain
@click="handleCreate()"
:loading="exportLoading"
v-hasPermi="['home:clgl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 发起流程
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
@ -168,40 +84,61 @@
</template>
</el-table-column>
<el-table-column label="驾驶员" align="center" prop="carDriver" />
<el-table-column
label="用车开始时间"
align="center"
prop="carStart"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="用车结束时间"
align="center"
prop="carEnd"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="目的地" align="center" prop="carAddress" />
<el-table-column label="车辆信息" align="center" prop="carInfo" />
<el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />
<el-table-column label="车辆结束里程" align="center" prop="carEndMileage" />
<el-table-column align="center" label="审批状态" prop="flowStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.flowStatus" />
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="用车开始时间"-->
<!-- align="center"-->
<!-- prop="carStart"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="用车结束时间"-->
<!-- align="center"-->
<!-- prop="carEnd"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<!-- <el-table-column label="目的地" align="center" prop="carAddress" />-->
<!-- <el-table-column label="车辆信息" align="center" prop="carInfo" />-->
<!-- <el-table-column label="车辆开始里程" align="center" prop="carStartMileage" />-->
<!-- <el-table-column label="车辆结束里程" align="center" prop="carEndMileage" />-->
<el-table-column label="用车状态" align="center" prop="carStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CLGL_CAR_STATUS" :value="scope.row.carStatus" />
</template>
</el-table-column>
<el-table-column label="用车原因" align="center" prop="carReason" />
<el-table-column label="备注" align="center" prop="carRemark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<!-- <el-table-column label="用车原因" align="center" prop="carReason" />-->
<!-- <el-table-column label="备注" align="center" prop="carRemark" />-->
<!-- <el-table-column-->
<!-- label="创建时间"-->
<!-- align="center"-->
<!-- prop="createTime"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
v-hasPermi="['bpm:oa-leave:query']"
link
type="primary"
@click="handleProcessDetail(scope.row)"
>
进度
</el-button>
<el-button
v-hasPermi="['bpm:oa-leave:query']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
<el-button
link
type="primary"
@ -236,10 +173,11 @@
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { ClglApi, ClglVO } from '@/api/home/clgl'
import ClglForm from './ClglForm.vue'
import router from "@/router";
import * as LeaveApi from '@/api/bpm/leave'
/** 车辆管理 列表 */
defineOptions({ name: 'Clgl' })
@ -271,6 +209,40 @@ const queryParams = reactive({
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 添加操作 */
const handleCreate = () => {
router.push({ name: 'ClglCreate' })
}
/** 详情操作 */
const handleDetail = (row: LeaveApi.LeaveVO) => {
router.push({
name: 'ClglDetail',
query: {
id: row.id
}
})
}
/** 审批进度 */
const handleProcessDetail = (row) => {
router.push({
name: 'BpmProcessInstanceDetail',
query: {
id: row.processInstanceId
}
})
}
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
/** 查询列表 */
const getList = async () => {
loading.value = true