Merge remote-tracking branch 'origin/master'

This commit is contained in:
pch 2024-12-25 10:25:52 +08:00
commit d92d889dca
33 changed files with 2105 additions and 121 deletions

View File

@ -51,4 +51,12 @@ export const BgypApi = {
exportBgyp: async (params) => {
return await request.download({ url: `/home/bgyp/export-excel`, params })
},
// 保存为草稿
saveDraft: async (data: BgypVO) => {
return await request.post({ url: `/home/bgyp/saveDraft`, data })
},
// 查询草稿
getDraft: async (params: any) => {
return await request.get({ url: `/home/bgyp/draft`, params })
},
}

View File

@ -56,4 +56,12 @@ export const ClglApi = {
exportClgl: async (params) => {
return await request.download({ url: `/home/clgl/export-excel`, params })
},
// 保存为草稿
saveDraft: async (data: ClglVO) => {
return await request.post({ url: `/home/clgl/saveDraft`, data })
},
// 查询草稿
getDraft: async (params: any) => {
return await request.get({ url: `/home/clgl/draft`, params })
},
}

View File

@ -63,4 +63,12 @@ export const HyglApi = {
exportHygl: async (params) => {
return await request.download({ url: `/home/hygl/export-excel`, params })
},
// 保存为草稿
saveDraft: async (data: HyglVO) => {
return await request.post({ url: `/home/hygl/saveDraft`, data })
},
// 查询草稿
getDraft: async (params: any) => {
return await request.get({ url: `/home/hygl/draft`, params })
},
}

View File

@ -51,4 +51,12 @@ export const JbglApi = {
exportJbgl: async (params) => {
return await request.download({ url: `/home/jbgl/export-excel`, params })
},
// 保存为草稿
saveDraft: async (data: JbglVO) => {
return await request.post({ url: `/home/jbgl/saveDraft`, data })
},
// 查询草稿
getDraft: async (params: any) => {
return await request.get({ url: `/home/jbgl/draft`, params })
},
}

View File

@ -45,4 +45,12 @@ export const KqglApi = {
exportKqgl: async (params) => {
return await request.download({ url: `/home/kqgl/export-excel`, params })
},
// 保存为草稿
saveDraft: async (data: KqglVO) => {
return await request.post({ url: `/home/kqgl/saveDraft`, data })
},
// 查询草稿
getDraft: async (params: any) => {
return await request.get({ url: `/home/kqgl/draft`, params })
},
}

View File

@ -57,4 +57,12 @@ export const XjglApi = {
exportXjgl: async (params) => {
return await request.download({ url: `/home/xjgl/export-excel`, params })
},
// 保存为草稿
saveDraft: async (data: XjglVO) => {
return await request.post({ url: `/home/xjgl/saveDraft`, data })
},
// 查询草稿
getDraft: async (params: any) => {
return await request.get({ url: `/home/xjgl/draft`, params })
},
}

View File

@ -713,27 +713,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
}
},
{
path: 'jbgl/JbglCreate',
component: () => import('@/views/Home/jbgl/JbglCreate.vue'),
path: 'jbnr/jbgl/JbglCreate',
component: () => import('@/views/Home/jbnr/jbgl/JbglCreate.vue'),
name: 'JbglCreate',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '发起加班管理流程',
activeMenu: '/Home/jbgl/Jbglflow'
activeMenu: '/Home/jbnr/jbgl/Jbglflow'
}
},
{
path: 'jbgl/JbglDetail',
component: () => import('@/views/Home/jbgl/JbglDetail.vue'),
path: 'jbnr/jbgl/JbglDetail',
component: () => import('@/views/Home/jbnr/jbgl/JbglDetail.vue'),
name: 'JbglDetail',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '查看加班管理流程',
activeMenu: '/Home/jbgl/Jbglflow'
activeMenu: '/Home/jbnr/jbgl/Jbglflow'
}
},
{
@ -785,27 +785,27 @@ const remainingRouter: AppRouteRecordRaw[] = [
}
},
{
path: 'xjgl/XjglCreate',
component: () => import('@/views/Home/xjgl/XjglCreate.vue'),
path: 'xjnr/xjgl/XjglCreate',
component: () => import('@/views/Home/xjnr/xjgl/XjglCreate.vue'),
name: 'XjglCreate',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '发起销假管理流程',
activeMenu: '/Home/xjgl/Xjglflow'
activeMenu: '/Home/xjnr/xjgl/Xjglflow'
}
},
{
path: '/xjgl/KqglDetail',
component: () => import('@/views/Home/xjgl/XjglDetail.vue'),
path: 'xjnr/xjgl/KqglDetail',
component: () => import('@/views/Home/xjnr/xjgl/XjglDetail.vue'),
name: 'XjglDetail',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '查看销假管理流程',
activeMenu: '/Home/xjgl/Xjglflow'
activeMenu: '/Home/xjnr/xjgl/Xjglflow'
}
}
]

View File

@ -106,49 +106,49 @@
<el-tabs type="border-card" class="demo-tabs" @tab-click="moreName">
<el-tab-pane label="待办">
<el-table v-loading="loading" :data="TodoList" height="250">
<el-table-column align="center" label="流程" prop="processInstance.name" style="width: 10%;" />
<el-table-column align="center" label="标题" prop="title" style="width: 20%;" />
<el-table-column align="center" label="流程" prop="processInstance.name" width="197"/>
<el-table-column align="center" label="标题" prop="title" width="197"/>
<el-table-column
align="center"
label="发起人"
prop="processInstance.startUser.nickname"
style="width: 20%;"
width="100"
/>
<el-table-column align="center" label="当前任务" prop="name" style="width: 20%;" />
<el-table-column align="center" label="当前任务" prop="name" width="100"/>
<el-table-column
:formatter="dateFormatter2"
align="center"
label="任务时间"
prop="createTime"
width="180"
width="100"
/>
<el-table-column align="center" label="操作" fixed="right" style="width: 20%;">
<el-table-column align="center" label="操作" fixed="right" width="60">
<template #default="scope">
<el-button link type="primary" @click="handleAudit(scope.row)">办理</el-button>
</template>
</el-table-column>
</el-table>
<!-- <el-col v-for="(item,index) in TodoList" :key="`card-${index}`">-->
<!-- <span style="display: inline-block; margin-bottom: 10px;font-size: 15px;" >* {{item.processInstance.name}}</span>-->
<!-- </el-col>-->
</el-tab-pane>
<!-- <el-col v-for="(item,index) in TodoList" :key="`card-${index}`">-->
<!-- <span style="display: inline-block; margin-bottom: 10px;font-size: 15px;" >* {{item.processInstance.name}}</span>-->
<!-- </el-col>-->
<el-tab-pane label="已办" name="BpmDoneTask">
<el-table v-loading="loading" :data="DoneList" height="250">
<el-table-column align="center" label="流程" prop="processInstance.name" style="width: 10%;" />
<el-table-column align="center" label="标题" prop="title" style="width: 20%;" />
<el-table-column align="center" label="流程" prop="processInstance.name" width="197"/>
<el-table-column align="center" label="标题" prop="title" width="197"/>
<el-table-column
align="center"
label="发起人"
prop="processInstance.startUser.nickname"
style="width: 20%;"
width="100"
/>
<el-table-column align="center" label="当前任务" prop="name" style="width: 20%;" />
<el-table-column align="center" label="审批状态" prop="status" style="width: 20%;" >
<el-table-column align="center" label="当前任务" prop="name" width="100"/>
<el-table-column align="center" label="审批状态" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_TASK_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" style="width: 20%;">
<el-table-column align="center" label="操作" fixed="right" width="60">
<template #default="scope">
<el-button link type="primary" @click="handleAudit(scope.row)">历史</el-button>
</template>
@ -157,12 +157,12 @@
</el-tab-pane>
<el-tab-pane label="抄送" name="BpmProcessInstanceCopy">
<el-table v-loading="loading" :data="CopyList" height="250">
<el-table-column align="center" label="流程" prop="processInstanceName" style="width: 10%;" />
<el-table-column align="center" label="标题" prop="title" style="width: 20%;" />
<el-table-column align="center" label="发起人" prop="startUserName" style="width: 20%;" />
<el-table-column align="center" label="抄送任务" prop="taskName" style="width: 20%;" />
<el-table-column align="center" label="抄送人" prop="creatorName" style="width: 20%;" />
<el-table-column align="center" label="操作" fixed="right" style="width: 20%;">
<el-table-column align="center" label="流程" prop="processInstanceName" width="197"/>
<el-table-column align="center" label="标题" prop="title" width="197"/>
<el-table-column align="center" label="发起人" prop="startUserName" width="100"/>
<el-table-column align="center" label="抄送任务" prop="taskName" width="100"/>
<el-table-column align="center" label="抄送人" prop="creatorName" width="100"/>
<el-table-column align="center" label="操作" fixed="right" width="60">
<template #default="scope">
<el-button link type="primary" @click="handleAudit2(scope.row)">详情</el-button>
</template>

View File

@ -86,6 +86,7 @@
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
</template>
</el-card>
<!-- 办公用品信息选择 -->
@ -164,6 +165,23 @@ const userList = ref<any[]>([]) // 用户列表
const deptInfo = ref('') //
const userInfo = ref('') //
const draftButton = ref(false)
const saveDraft = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as BgypVO
await BgypApi.saveDraft(data)
message.success(t('存为草稿成功!'))
// Tab
delView(unref(currentRoute))
await push({ name: 'Bgyp' })
} finally {
formLoading.value = false
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // success
@ -183,11 +201,14 @@ const submitForm = async () => {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if( curFullPath ) {
data.curfullpath = curFullPath
}
if (curFullPath.includes("?")) {
curFullPath = curFullPath.split("?")[0];
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( processKey) {
data.processDefinitionKey = processKey
@ -215,8 +236,18 @@ const formRules = reactive({
onMounted(async () => {
await getUserInfo()
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if (curFullPath.includes("?")) {
// 使 URLSearchParams
const params = new URLSearchParams(curFullPath.split("?")[1]);
const id = params.get("id") ;
//
curFullPath = curFullPath.split("?")[0];
if ( id != "") {
formData.value = await BgypApi.getBgyp(Number( id) )
draftButton.value= true
}
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( !processKey ) {

View File

@ -26,25 +26,25 @@
<el-row>
<el-col :span="24">
<el-form-item label="标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled/>
<el-input v-model="formData.title" placeholder="请输入申请标题" :disabled="!isEditable('title')"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请物品" prop="usageId">
<el-input v-model="formData.usageName" placeholder="请输入物品名字" disabled/>
<el-input v-model="formData.usageName" placeholder="请输入物品名字" :disabled="!isEditable('usageId')"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物品分类" prop="unit">
<el-select v-model="formData.unit" placeholder="请选择申请物品分类" disabled>
<el-select v-model="formData.unit" placeholder="请选择申请物品分类" :disabled="!isEditable('unit')">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BGYP_UNIT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
disabled
:disabled="!isEditable('unit')"
/>
</el-select>
</el-form-item>
@ -53,7 +53,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="物品数量" prop="usageQuantity">
<el-input v-model="formData.usageQuantity" placeholder="请输入申请物品数量" disabled/>
<el-input v-model="formData.usageQuantity" placeholder="请输入申请物品数量" :disabled="!isEditable('usageQuantity')"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -63,22 +63,24 @@
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
:disabled="!isEditable('usageDate')"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="用途" prop="usagePurpose">
<el-input autosize v-model="formData.usagePurpose" type="textarea" placeholder="请输入申请用途" disabled />
<el-input autosize v-model="formData.usagePurpose" type="textarea" placeholder="请输入申请用途" :disabled="!isEditable('usagePurpose')" />
</el-form-item>
</el-form>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { BgypApi } from '@/api/home/bgyp'
import {BgypApi, BgypVO} from '@/api/home/bgyp'
import {propTypes} from "@/utils/propTypes";
import {getUserProfile} from "@/api/system/user/profile";
import * as TaskApi from "@/api/bpm/task";
import {useUserStore} from "@/store/modules/user";
/** 办公用品管理 表单 */
defineOptions({ name: 'BgypDetail' })
@ -134,8 +136,61 @@ const getInfo = async () => {
detailLoading.value = false
}
}
const updateForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as BgypVO
await BgypApi.updateBgyp(data)
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
defineExpose({ updateForm }) // open
const editableFields = ref<string[]>([])
const isEditable = (field:string) => {
return editableFields.value.includes(field); // editableFields true
}
const userId = useUserStore().getUser.id //
const itemControl = async () => {
let flag = false
let itemType = ""
let itemContent = ""
if (queryId.length > 33 ) { //
const taskids = await TaskApi.getTaskIdsForProcessInstance( queryId ) //id
// const token = getAccessToken();
for (const taskid of taskids) {
// for...of 使 await
const assignee = await TaskApi.getTaskAssignee(taskid); //id
if ( assignee == userId ) {
flag = true
itemType = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemType")
if ( itemType == "1") {
itemContent = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemContent")
}
}
}
if ( flag ) { //
if ( itemType == "1") { //0:,1:
const parsedObject = JSON.parse(itemContent);
Object.entries(parsedObject).forEach(([key]) => {
editableFields.value.push( key )
});
}
}
}
}
onMounted(async ()=> {
await getUserInfo()
await getInfo()
await itemControl()
})
</script>

View File

@ -125,7 +125,6 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { BgypApi, BgypVO } from '@/api/home/bgyp'
import router from "@/router";
import * as LeaveApi from '@/api/bpm/leave'
/** 办公用品管理 列表 */
@ -170,6 +169,7 @@ const getList = async () => {
}
}
const router = useRouter() //
/**发起操作 */
const handleCreate =async () => {
await router.push({name: 'BgypCreate'})

View File

@ -0,0 +1,212 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="物品分类" prop="unit">
<el-select
v-model="queryParams.unit"
placeholder="请选择物品分类"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BGYP_UNIT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:bgyp:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="申请人" align="center" prop="userName" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="物品名" align="center" prop="usageId">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BGYP_USAGE_NAME" :value="scope.row.usageId" />
</template>
</el-table-column>
<el-table-column label="物品分类" align="center" prop="unit">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BGYP_UNIT" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column
label="申请时间"
align="center"
prop="usageDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
v-hasPermi="['home:clgl:update']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { BgypApi, BgypVO } from '@/api/home/bgyp'
import * as LeaveApi from '@/api/bpm/leave'
/** 办公用品管理 列表 */
defineOptions({ name: 'Bgyp' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<BgypVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
title: undefined,
userName: undefined,
deptName: undefined,
deptId: undefined,
usageName: undefined,
usageId: undefined,
usageQuantity: undefined,
unit: undefined,
usagePurpose: undefined,
usageDate: [],
status: undefined,
userId: undefined,
processInstanceId: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await BgypApi.getDraft(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
const router = useRouter() //
/**发起操作 */
// const handleCreate =async () => {
// await router.push({name: 'BgypCreate'})
// }
/** 审批进度 */
// const handleProcessDetail =async (row) => {
// await router.push({
// name: 'BpmProcessInstanceDetail',
// query: {
// id: row.processInstanceId
// }
// })
// }
/** 详情操作 */
const handleDetail =async (row: LeaveApi.LeaveVO) => {
await router.push({
name: 'BgypCreate',
query: {
id: row.id
}
})
}
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await BgypApi.exportBgyp(queryParams)
download.excel(data, '办公用品.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>

View File

@ -145,6 +145,7 @@
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
</template>
</el-card>
<SelectCarForm ref="selectRef" @success="changeForm"/>
@ -262,6 +263,24 @@ const changeDriverForm = (val:any) => {
form.carDriverInfo = val.contactInfo
}
const draftButton = ref(false)
const saveDraft = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as ClglVO
await ClglApi.saveDraft(data)
message.success(t('存为草稿成功!'))
// Tab
delView(unref(currentRoute))
await push({ name: 'Clgl' })
} finally {
formLoading.value = false
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
@ -281,11 +300,14 @@ const submitForm = async () => {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if( curFullPath ) {
data.curfullpath = curFullPath
}
if (curFullPath.includes("?")) {
curFullPath = curFullPath.split("?")[0];
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( processKey) {
data.processDefinitionKey = processKey
@ -326,7 +348,18 @@ const getUserInfo = async () => {
onMounted(async () => {
await getUserInfo()
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if (curFullPath.includes("?")) {
// 使 URLSearchParams
const params = new URLSearchParams(curFullPath.split("?")[1]);
const id = params.get("id") ;
//
curFullPath = curFullPath.split("?")[0];
if ( id != "") {
formData.value = await ClglApi.getClgl(Number( id) )
draftButton.value= true
}
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )

View File

@ -25,15 +25,15 @@
</el-col>
</el-row>
<el-form-item label="标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入标题" disabled />
<el-input v-model="formData.title" placeholder="请输入标题" :disabled="!isEditable('title')" />
</el-form-item>
<el-form-item label="车辆状态" prop="carStatus">
<el-radio-group v-model="formData.carStatus" disabled>
<el-radio-group v-model="formData.carStatus" :disabled="!isEditable('carStatus')">
<el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
:key="dict.value"
:label="dict.value"
disabled
:disabled="!isEditable('carStatus')"
>
{{ dict.label }}
</el-radio>
@ -42,32 +42,32 @@
<el-row>
<el-col :span="12">
<el-form-item label="车辆类型" prop="carType">
<el-select v-model="formData.carType" placeholder="请选择用车类型" disabled>
<el-select v-model="formData.carType" placeholder="请选择用车类型" :disabled="!isEditable('carType')">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
disabled
:disabled="!isEditable('carType')"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车牌号" prop="carInfo">
<el-input v-model="formData.carInfo" placeholder="请输入车牌号" disabled />
<el-input v-model="formData.carInfo" placeholder="请输入车牌号" :disabled="!isEditable('carInfo')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="驾驶员" prop="carDriver">
<el-input v-model="formData.carDriver" placeholder="请输入驾驶员" disabled />
<el-input v-model="formData.carDriver" placeholder="请输入驾驶员" :disabled="!isEditable('carDriver')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="驾驶员手机号" prop="carDriverInfo">
<el-input v-model="formData.carDriverInfo" placeholder="请输入驾驶员手机号" disabled />
<el-input v-model="formData.carDriverInfo" placeholder="请输入驾驶员手机号" :disabled="!isEditable('carDriverInfo')" />
</el-form-item>
</el-col>
</el-row>
@ -79,7 +79,7 @@
type="date"
value-format="x"
placeholder="选择用车开始时间"
disabled
:disabled="!isEditable('carStart')"
/>
</el-form-item>
</el-col>
@ -90,7 +90,7 @@
type="date"
value-format="x"
placeholder="选择用车结束时间"
disabled
:disabled="!isEditable('carEnd')"
/>
</el-form-item>
</el-col>
@ -98,29 +98,31 @@
<el-row>
<el-col :span="12">
<el-form-item label="目的地" prop="carAddress">
<el-input v-model="formData.carAddress" placeholder="请输入目的地" disabled/>
<el-input v-model="formData.carAddress" placeholder="请输入目的地" :disabled="!isEditable('carAddress')"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总里程" prop="carMileage">
<el-input v-model="formData.carMileage" placeholder="请输入总里程" disabled />
<el-input v-model="formData.carMileage" placeholder="请输入总里程" :disabled="!isEditable('carMileage')" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="用车原因" prop="carReason">
<el-input autosize v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" disabled />
<el-input autosize v-model="formData.carReason" type="textarea" placeholder="请输入用车原因" :disabled="!isEditable('carReason')" />
</el-form-item>
<el-form-item label="备注" prop="carRemark">
<el-input autosize v-model="formData.carRemark" type="textarea" placeholder="请输入备注" disabled />
<el-input autosize v-model="formData.carRemark" type="textarea" placeholder="请输入备注" :disabled="!isEditable('carRemark')" />
</el-form-item>
</el-form>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { ClglApi } from '@/api/home/clgl'
import {ClglApi, ClglVO} from '@/api/home/clgl'
import {propTypes} from "@/utils/propTypes";
import {getUserProfile} from "@/api/system/user/profile";
import * as TaskApi from "@/api/bpm/task";
import {useUserStore} from "@/store/modules/user";
/** 车辆管理 表单 */
defineOptions({ name: 'ClglDetail' })
@ -193,10 +195,63 @@ const getUserInfo = async () => {
userInfo.value = formData.value.carUserName
}
}
const userId = useUserStore().getUser.id //
const itemControl = async () => {
let flag = false
let itemType = ""
let itemContent = ""
if (queryId.length > 33 ) { //
const taskids = await TaskApi.getTaskIdsForProcessInstance( queryId ) //id
// const token = getAccessToken();
for (const taskid of taskids) {
// for...of 使 await
const assignee = await TaskApi.getTaskAssignee(taskid); //id
if ( assignee == userId ) {
flag = true
itemType = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemType")
if ( itemType == "1") {
itemContent = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemContent")
}
}
}
if ( flag ) { //
if ( itemType == "1") { //0:,1:
const parsedObject = JSON.parse(itemContent);
Object.entries(parsedObject).forEach(([key]) => {
editableFields.value.push( key )
});
}
}
}
}
const editableFields = ref<string[]>([])
const isEditable = (field:string) => {
return editableFields.value.includes(field); // editableFields true
}
const updateForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as ClglVO
await ClglApi.updateClgl(data)
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
defineExpose({ updateForm }) // open
/** 初始化 **/
onMounted(async () => {
await getUserInfo()
await getInfo()
await itemControl()
})
const formRules = reactive({
// carUser: [{ required: true, message: '', trigger: 'blur' }],

View File

@ -161,7 +161,6 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
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'
import {dateFormatter2} from "@/utils/formatTime";
@ -198,6 +197,7 @@ const queryParams = reactive({
const queryFormRef = ref() //
const exportLoading = ref(false) //
const router = useRouter() //
/**发起操作 */
const handleCreate =async () => {
await router.push({name: 'ClglCreate'})

View File

@ -0,0 +1,247 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="部门" prop="dept">
<el-input
v-model="queryParams.dept"
placeholder="请输入部门"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="用车类型" prop="carType">
<el-select
v-model="queryParams.carType"
placeholder="请选择用车类型"
clearable
class="!w-240px"
>
<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="carStatus">
<el-select
v-model="queryParams.carStatus"
placeholder="请选择用车状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CLGL_CAR_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:clgl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column width="70" label="序号" align="center" type="index" />
<el-table-column label="申请人" align="center" prop="carUserName" />
<el-table-column label="部门" align="center" prop="deptName" />
<el-table-column label="车辆类型" align="center" prop="carType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CLGL_CAR_TYPE" :value="scope.row.carType" />
</template>
</el-table-column>
<el-table-column label="驾驶员" align="center" prop="carDriver" />
<el-table-column
label="用车开始时间"
align="center"
prop="carStart"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column
label="用车结束时间"
align="center"
prop="carEnd"
:formatter="dateFormatter2"
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="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">
<template #default="scope">
<el-button
v-hasPermi="['home:clgl:update']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<ClglForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download'
import { ClglApi, ClglVO } from '@/api/home/clgl'
import ClglForm from "@/views/Home/clnr/clgl/ClglForm.vue";
import * as LeaveApi from '@/api/bpm/leave'
import {dateFormatter2} from "@/utils/formatTime";
/** 车辆管理 列表 */
defineOptions({ name: 'Clgl' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<ClglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
title: undefined,
carUserId: undefined,
carUserName: undefined,
dept: undefined,
deptName: undefined,
carType: undefined,
carDriver: undefined,
carStart: null,
// carStart: [],
carEnd: undefined,
// carEnd: [],
carAddress: undefined,
carDriverInfo: undefined,
carMileage: undefined,
carStatus: null,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const router = useRouter() //
/**发起操作 */
// const handleCreate =async () => {
// await router.push({name: 'ClglCreate'})
// }
/** 详情操作 */
const handleDetail =async (row: LeaveApi.LeaveVO) => {
await router.push({
name: 'ClglCreate',
//id
query: {
id: row.id
}
})
}
/** 审批进度 */
// const handleProcessDetail =async (row) => {
// await router.push({
// name: 'BpmProcessInstanceDetail',
// //id
// query: {
// id: row.processInstanceId
// }
// })
// }
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ClglApi.getDraft(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ClglApi.exportClgl(queryParams)
download.excel(data, '车辆管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>

View File

@ -0,0 +1,265 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="100px"
>
<el-form-item label="会议类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择会议类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HYGL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="会议主题" prop="theme">
<el-input
v-model="queryParams.theme"
placeholder="请输入会议主题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="持续时间" prop="duration">
<el-input
v-model="queryParams.duration"
placeholder="请输入持续时间"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="会议室名字" prop="roomName">
<el-input
v-model="queryParams.roomName"
placeholder="请输入会议室名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="组织者" prop="organizer">
<el-input
v-model="queryParams.organizer"
placeholder="请输入组织者"
clearable
@keyup.enter="handleQuery"
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="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:hygl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column label="会议标题" align="center" prop="title" />
<el-table-column
label="申请时间"
align="center"
prop="time"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="会议类型" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HYGL_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column
label="开始时间"
align="center"
prop="startDate"
:formatter="dateFormatter2"
width="100px"
/>
<el-table-column
label="结束时间"
align="center"
prop="endDate"
:formatter="dateFormatter2"
width="100px"
/>
<el-table-column label="组织者" align="center" prop="organizer" />
<el-table-column label="参会人数" align="center" prop="number" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
v-hasPermi="['home:clgl:update']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { HyglApi, HyglVO } from '@/api/home/hygl'
import * as LeaveApi from '@/api/bpm/leave'
/** 会议管理 列表 */
defineOptions({ name: 'Hygl' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<HyglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
title: undefined,
userName: undefined,
userId: undefined,
deptName: undefined,
deptId: undefined,
time: [],
depict: undefined,
type: undefined,
theme: undefined,
target: undefined,
startDate: [],
endDate: [],
duration: undefined,
roomId: undefined,
roomName: undefined,
roomAddress: undefined,
organizer: undefined,
speaker: undefined,
meetingTaker: undefined,
number: undefined,
equipmentList: undefined,
network: undefined,
status: undefined,
processInstanceId: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 详情操作 */
const handleDetail = (row: LeaveApi.LeaveVO) => {
router.push({
name: 'HyglCreate',
query: {
id: row.id
}
})
}
const router = useRouter() //
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await HyglApi.getDraft(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
// const formRef = ref()
// const openForm = (type: string, id?: number) => {
// formRef.value.open(type, id)
// }
/** 删除按钮操作 */
// const handleDelete = async (id: number) => {
// try {
// //
// await message.delConfirm()
// //
// await HyglApi.deleteHygl(id)
// message.success(t('common.delSuccess'))
// //
// await getList()
// } catch {}
// }
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await HyglApi.exportHygl(queryParams)
download.excel(data, '会议管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@ -153,6 +153,7 @@
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
</template>
</el-card>
</template>
@ -260,6 +261,24 @@
userInfo.value = formData.value.userName ?? '';
};
const draftButton = ref(false)
const saveDraft = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as HyglVO
await HyglApi.saveDraft(data)
message.success(t('存为草稿成功!'))
// Tab
delView(unref(currentRoute))
await push({ name: 'Hygl' })
} finally {
formLoading.value = false
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
@ -279,11 +298,14 @@
data.startUserSelectAssignees = startUserSelectAssignees.value
}
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if( curFullPath ) {
data.curfullpath = curFullPath
}
if (curFullPath.includes("?")) {
curFullPath = curFullPath.split("?")[0];
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( processKey) {
data.processDefinitionKey = processKey
@ -329,8 +351,18 @@
await getUserInfo()
await getList()
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if (curFullPath.includes("?")) {
// 使 URLSearchParams
const params = new URLSearchParams(curFullPath.split("?")[1]);
const id = params.get("id") ;
//
curFullPath = curFullPath.split("?")[0];
if ( id != "") {
formData.value = await HyglApi.getHygl(Number( id) )
draftButton.value= true
}
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( !processKey ) {

View File

@ -25,13 +25,13 @@
</el-col>
</el-row>
<el-form-item label="会议标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入会议标题" disabled />
<el-input v-model="formData.title" placeholder="请输入会议标题" :disabled="!isEditable('title')" />
</el-form-item>
<el-form-item label="会议主题" prop="theme">
<el-input v-model="formData.theme" placeholder="请输入会议主题" disabled />
<el-input v-model="formData.theme" placeholder="请输入会议主题" :disabled="!isEditable('theme')" />
</el-form-item>
<el-form-item label="会议目标" prop="target">
<el-input v-model="formData.target" placeholder="请输入会议目标" disabled />
<el-input v-model="formData.target" placeholder="请输入会议目标" :disabled="!isEditable('target')" />
</el-form-item>
<el-row>
<el-col :span="12">
@ -41,7 +41,7 @@
type="datetime"
value-format="x"
placeholder="选择会议开始时间"
disabled
:disabled="!isEditable('startDate')"
/>
</el-form-item>
</el-col>
@ -52,7 +52,7 @@
type="datetime"
value-format="x"
placeholder="选择会议结束时间"
disabled
:disabled="!isEditable('endDate')"
/>
</el-form-item>
</el-col>
@ -65,13 +65,13 @@
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
:disabled="!isEditable('time')"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="会议类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择会议类型" disabled>
<el-select v-model="formData.type" placeholder="请选择会议类型" :disabled="!isEditable('type')">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HYGL_TYPE)"
:key="dict.value"
@ -85,24 +85,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="组织者" prop="organizer">
<el-input v-model="formData.organizer" placeholder="请输入组织者" disabled />
<el-input v-model="formData.organizer" placeholder="请输入组织者" :disabled="!isEditable('organizer')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主讲人" prop="speaker">
<el-input v-model="formData.speaker" placeholder="请输入主讲人" disabled />
<el-input v-model="formData.speaker" placeholder="请输入主讲人" :disabled="!isEditable('speaker')" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="记录人员" prop="meetingTaker">
<el-input v-model="formData.meetingTaker" placeholder="请输入记录人员" disabled />
<el-input v-model="formData.meetingTaker" placeholder="请输入记录人员" :disabled="!isEditable('meetingTaker')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参会人数" prop="number">
<el-input v-model.number="formData.number" placeholder="请输入参会人数" disabled />
<el-input v-model.number="formData.number" placeholder="请输入参会人数" :disabled="!isEditable('number')" />
</el-form-item>
</el-col>
</el-row>
@ -113,7 +113,7 @@
v-model="formData.roomId"
placeholder="请选择会议室"
@change="getAddress()"
disabled
:disabled="!isEditable('roomId')"
>
<el-option
v-for="dict in listHysgl"
@ -139,17 +139,17 @@
type="textarea"
v-model="formData.roomAddress"
placeholder="请输入会议室地址"
disabled
:disabled="!isEditable('roomAddress')"
/>
</el-form-item>
<el-form-item label="描述" prop="depict">
<el-input autosize type="textarea" v-model="formData.depict" placeholder="请输入描述" disabled />
<el-input autosize type="textarea" v-model="formData.depict" placeholder="请输入描述" :disabled="!isEditable('depict')" />
</el-form-item>
<el-form-item label="设备需求" prop="equipmentList">
<el-input autosize type="textarea" v-model="formData.equipmentList" placeholder="请输入设备需求" disabled />
<el-input autosize type="textarea" v-model="formData.equipmentList" placeholder="请输入设备需求" :disabled="!isEditable('equipmentList')" />
</el-form-item>
<el-form-item label="网络需求" prop="network">
<el-input autosize type="textarea" v-model="formData.network" placeholder="请输入网络需求" disabled />
<el-input autosize type="textarea" v-model="formData.network" placeholder="请输入网络需求" :disabled="!isEditable('network')" />
</el-form-item>
</el-form>
<template #footer>
@ -158,10 +158,12 @@
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { HyglApi, } from '@/api/home/hygl'
import {HyglApi, HyglVO,} from '@/api/home/hygl'
import {getUserProfile} from "@/api/system/user/profile";
import {propTypes} from "@/utils/propTypes";
import {HysglApi, HysglVO} from "@/api/home/hysgl";
import * as TaskApi from "@/api/bpm/task";
import {useUserStore} from "@/store/modules/user";
/** 会议管理 表单 */
defineOptions({ name: 'HyglDetail' })
@ -277,11 +279,64 @@ const getAddress = async ()=>{
formLoading.value = false
}
}
const userId = useUserStore().getUser.id //
const itemControl = async () => {
let flag = false
let itemType = ""
let itemContent = ""
if (queryId.length > 33 ) { //
const taskids = await TaskApi.getTaskIdsForProcessInstance( queryId ) //id
// const token = getAccessToken();
for (const taskid of taskids) {
// for...of 使 await
const assignee = await TaskApi.getTaskAssignee(taskid); //id
if ( assignee == userId ) {
flag = true
itemType = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemType")
if ( itemType == "1") {
itemContent = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemContent")
}
}
}
if ( flag ) { //
if ( itemType == "1") { //0:,1:
const parsedObject = JSON.parse(itemContent);
Object.entries(parsedObject).forEach(([key]) => {
editableFields.value.push( key )
});
}
}
}
}
const editableFields = ref<string[]>([])
const isEditable = (field:string) => {
return editableFields.value.includes(field); // editableFields true
}
const updateForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as HyglVO
await HyglApi.updateHygl(data)
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
defineExpose({ updateForm }) // open
onMounted(async ()=>{
await getUserInfo()
await getInfo()
await getList()
await getAddress()
await itemControl()
})
const formRules = reactive({
title: [{ required: true, message: '会议标题不能为空', trigger: 'blur' }],

View File

@ -171,7 +171,6 @@ import { dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { HyglApi, HyglVO } from '@/api/home/hygl'
import * as LeaveApi from '@/api/bpm/leave'
import router from "@/router";
/** 会议管理 列表 */
defineOptions({ name: 'Hygl' })
@ -234,6 +233,7 @@ const handleDetail = (row: LeaveApi.LeaveVO) => {
})
}
const router = useRouter() //
/**发起操作 */
const handleCreate = () => {
router.push({ name: 'HyglCreate' })

View File

@ -0,0 +1,223 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="名字" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入申请人名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="部门名字" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入申请部门名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择加班类型"
clearable
class="!w-240px"
>
<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-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="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:jbgl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" align="center" type="index" width="60" />
<el-table-column label="名字" align="center" prop="userName" />
<el-table-column label="部门名字" align="center" prop="deptName" />
<el-table-column
label="申请时间"
align="center"
prop="usageDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="加班类型" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.JBGL_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column
label="开始时间"
align="center"
prop="startDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column
label="结束时间"
align="center"
prop="endDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="总时长" align="center" prop="duration" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
v-hasPermi="['home:clgl:update']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<JbglForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { JbglApi, JbglVO } from '@/api/home/jbgl'
import JbglForm from "@/views/Home/jbnr/jbgl/JbglForm.vue";
import * as LeaveApi from '@/api/bpm/leave'
/** 加班管理 列表 */
defineOptions({ name: 'Jbgl' })
const message = useMessage() //
const loading = ref(true) //
const list = ref<JbglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
title: undefined,
userName: undefined,
userId: undefined,
deptName: undefined,
deptId: undefined,
usageDate: [],
type: undefined,
startDate: [],
endDate: [],
duration: undefined,
reason: undefined,
status: undefined,
processInstanceId: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const router = useRouter() //
/** 详情操作 */
const handleDetail = (row: LeaveApi.LeaveVO) => {
router.push({
name: 'JbglCreate',
query: {
id: row.id
}
})
}
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await JbglApi.getDraft(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await JbglApi.exportJbgl(queryParams)
download.excel(data, '加班管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>

View File

@ -93,6 +93,7 @@
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
</template>
</el-card>
</template>
@ -175,6 +176,25 @@ const getUserInfo = async () => {
deptInfo.value = formData.value.deptName ?? '';
userInfo.value = formData.value.userName ?? '';
};
const draftButton = ref(false)
const saveDraft = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as JbglVO
await JbglApi.saveDraft(data)
message.success(t('存为草稿成功!'))
// Tab
delView(unref(currentRoute))
await push({ name: 'Jbgl' })
} finally {
formLoading.value = false
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
@ -193,11 +213,14 @@ const submitForm = async () => {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if( curFullPath ) {
data.curfullpath = curFullPath
}
if (curFullPath.includes("?")) {
curFullPath = curFullPath.split("?")[0];
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( processKey) {
data.processDefinitionKey = processKey
@ -215,8 +238,18 @@ const submitForm = async () => {
onMounted(async () => {
await getUserInfo()
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if (curFullPath.includes("?")) {
// 使 URLSearchParams
const params = new URLSearchParams(curFullPath.split("?")[1]);
const id = params.get("id") ;
//
curFullPath = curFullPath.split("?")[0];
if ( id != "") {
formData.value = await JbglApi.getJbgl(Number( id) )
draftButton.value= true
}
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( !processKey ) {

View File

@ -26,7 +26,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="申请标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled />
<el-input v-model="formData.title" placeholder="请输入申请标题" :disabled="!isEditable('title')" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
@ -35,13 +35,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="加班类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择加班类型" disabled>
<el-select v-model="formData.type" placeholder="请选择加班类型" :disabled="!isEditable('type')">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
disabled
:disabled="!isEditable('type')"
/>
</el-select>
</el-form-item>
@ -53,7 +53,7 @@
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
:disabled="!isEditable('usageDate')"
/>
</el-form-item>
</el-col>
@ -66,7 +66,7 @@
type="datetime"
value-format="x"
placeholder="选择加班开始时间"
disabled
:disabled="!isEditable('startDate')"
/>
</el-form-item>
</el-col>
@ -77,27 +77,29 @@
type="datetime"
value-format="x"
placeholder="选择加班结束时间"
disabled
:disabled="!isEditable('endDate')"
/>
</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-input v-model="formData.duration" placeholder="请输入加班总时长" :disabled="!isEditable('duration')" />
</el-form-item>
</el-col>
<el-form-item label="加班原因" prop="reason">
<el-input autosize v-model="formData.reason" type="textarea" placeholder="请输入加班原因" disabled />
<el-input autosize v-model="formData.reason" type="textarea" placeholder="请输入加班原因" :disabled="!isEditable('reason')" />
</el-form-item>
</el-form>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { JbglApi } from '@/api/home/jbgl'
import {JbglApi, JbglVO} from '@/api/home/jbgl'
import {propTypes} from "@/utils/propTypes";
import {getUserProfile} from "@/api/system/user/profile";
import * as TaskApi from "@/api/bpm/task";
import {useUserStore} from "@/store/modules/user";
/** 加班管理 表单 */
defineOptions({ name: 'JbglDetail' })
@ -156,8 +158,59 @@ const getInfo = async () => {
}
const formRef = ref() // Ref
const userId = useUserStore().getUser.id //
const itemControl = async () => {
let flag = false
let itemType = ""
let itemContent = ""
if (queryId.length > 33 ) { //
const taskids = await TaskApi.getTaskIdsForProcessInstance( queryId ) //id
// const token = getAccessToken();
for (const taskid of taskids) {
// for...of 使 await
const assignee = await TaskApi.getTaskAssignee(taskid); //id
if ( assignee == userId ) {
flag = true
itemType = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemType")
if ( itemType == "1") {
itemContent = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemContent")
}
}
}
if ( flag ) { //
if ( itemType == "1") { //0:,1:
const parsedObject = JSON.parse(itemContent);
Object.entries(parsedObject).forEach(([key]) => {
editableFields.value.push( key )
});
}
}
}
}
const editableFields = ref<string[]>([])
const isEditable = (field:string) => {
return editableFields.value.includes(field); // editableFields true
}
const updateForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as JbglVO
await JbglApi.updateJbgl(data)
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
defineExpose({ updateForm }) // open
onMounted(async ()=>{
await getUserInfo()
await getInfo()
await itemControl()
})
</script>

View File

@ -156,7 +156,6 @@ import download from '@/utils/download'
import { JbglApi, JbglVO } from '@/api/home/jbgl'
import JbglForm from './JbglForm.vue'
import * as LeaveApi from '@/api/bpm/leave'
import router from "@/router";
/** 加班管理 列表 */
defineOptions({ name: 'Jbgl' })
@ -189,6 +188,7 @@ const queryParams = reactive({
const queryFormRef = ref() //
const exportLoading = ref(false) //
const router = useRouter() //
/**发起操作 */
const handleCreate = () => {
router.push({ name: 'JbglCreate' })

View File

@ -0,0 +1,209 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="用户名字" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="部门名字" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名字"
clearable
@keyup.enter="handleQuery"
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="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:kqgl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column label="用户名字" align="center" prop="userName" />
<el-table-column label="部门名字" align="center" prop="deptName" />
<el-table-column
label="考勤日期"
align="center"
prop="date"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
v-hasPermi="['home:clgl:update']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<KqglForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { KqglApi, KqglVO } from '@/api/home/kqgl'
import KqglForm from "@/views/Home/kqnr/kqgl/KqglForm.vue";
import * as LeaveApi from '@/api/bpm/leave'
/** 考勤管理 列表 */
defineOptions({ name: 'KqglDraft' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<KqglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
title: undefined,
userId: undefined,
userName: undefined,
deptId: undefined,
deptName: undefined,
status: undefined,
date: [],
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const router = useRouter() //
/**发起操作 */
// const handleCreate = () => {
// router.push({ name: 'KqglCreate' })
// }
/** 详情操作 */
const handleDetail = (row: LeaveApi.LeaveVO) => {
router.push({
name: 'KqglCreate',
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
try {
const data = await KqglApi.getDraft(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
// const formRef = ref()
// const openForm = (type: string, id?: number) => {
// formRef.value.open(type, id)
// }
/** 删除按钮操作 */
// const handleDelete = async (id: number) => {
// try {
// //
// await message.delConfirm()
// //
// await KqglApi.deleteKqgl(id)
// message.success(t('common.delSuccess'))
// //
// await getList()
// } catch {}
// }
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await KqglApi.exportKqgl(queryParams)
download.excel(data, '考勤管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@ -76,6 +76,7 @@
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
</template>
</el-card>
</template>
@ -297,6 +298,10 @@ const changeStatus = async ()=>{
}
};
//
const { query } = useRoute() //
const queryId = query.id as unknown as number // URL id
/** 打开弹窗 设置时间戳为固定信息 */
const open = async () => {
pop.value=false//span
@ -306,9 +311,15 @@ const open = async () => {
formLoading.value = true
try {
await getUserInfo() //,
//,,
await createUser()
await getList(dateKey.value)
// queryId 稿稿
if (queryId){
formData.value = await KqglApi.getKqgl(queryId)
await getList() //使
} else {
//,,
await createUser()
await getList(dateKey.value)
}
await changeStatus()//
await getWorkDay()//
} finally {
@ -336,19 +347,29 @@ const submitForm = async () => {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if( curFullPath ) {
data.curfullpath = curFullPath
}
if (curFullPath.includes("?")) {
curFullPath = curFullPath.split("?")[0];
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( processKey) {
data.processDefinitionKey = processKey
}
data.date = dateKey.value //
await KqglApi.createKqgl(data)
await updateUser() //
// ,稿key,稿key,,
// key
if (queryId){
await KqglApi.createKqgl(data)
await updateUser() //
}else {
data.date = dateKey.value //
await KqglApi.createKqgl(data)
await updateUser() //
}
message.success(t('common.createSuccess'))
delView(unref(currentRoute))
@ -357,13 +378,44 @@ const submitForm = async () => {
formLoading.value = false
}
}
const draftButton = ref(false)
const saveDraft = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as KqglVO
// key
data.date = dateKey.value //
await KqglApi.saveDraft(data)
await updateUser() //
message.success(t('存为草稿成功!'))
// Tab
delView(unref(currentRoute))
await push({ name: 'Kqgl' })
} finally {
formLoading.value = false
}
}
/** 初始化 */
onMounted(async () => {
await open()
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if (curFullPath.includes("?")) {
// 使 URLSearchParams
const params = new URLSearchParams(curFullPath.split("?")[1]);
const id = params.get("id") ;
//
curFullPath = curFullPath.split("?")[0];
if ( id != "") {
formData.value = await KqglApi.getKqgl(Number( id) )
draftButton.value= true
}
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( !processKey ) {

View File

@ -11,7 +11,7 @@
v-loading="formLoading"
>
<el-form-item label="标题" prop="title">
<el-input autosize v-model="formData.title" type="text" placeholder="请输入标题" disabled />
<el-input autosize v-model="formData.title" type="text" placeholder="请输入标题" :disabled="!isEditable('title')" />
</el-form-item>
<eL-row>
<el-col :span="12">
@ -33,7 +33,7 @@
type="date"
value-format="x"
placeholder="选择考勤日期"
disabled
:disabled="!isEditable('date')"
/>
</el-form-item>
<el-form-item label="考勤表单" >
@ -78,11 +78,13 @@
</template>
<script setup lang="ts">
// import { KqglApi, KqglVO } from '@/api/home/kqgl'
import { KqglApi } from '@/api/home/kqgl'
import {KqglApi, KqglVO} from '@/api/home/kqgl'
import {getUserProfile} from "@/api/system/user/profile";
import {KqdataApi, KqdataVO} from "@/api/home/kqdata";
// import {getUserPageKQ} from "@/api/system/user";
import {propTypes} from "@/utils/propTypes";
import {useUserStore} from "@/store/modules/user";
import * as TaskApi from "@/api/bpm/task";
/** 考勤管理 表单 */
defineOptions({ name: 'KqglDetail' })
@ -175,6 +177,7 @@ const open = async () => {
}
}
onMounted(async ()=>{
await itemControl()
await open()
})
//
@ -244,6 +247,56 @@ const resetForm = () => {
}
formRef.value?.resetFields()
}
const userId = useUserStore().getUser.id //
const itemControl = async () => {
let flag = false
let itemType = ""
let itemContent = ""
if (queryId.length > 33 ) { //
const taskids = await TaskApi.getTaskIdsForProcessInstance( queryId ) //id
// const token = getAccessToken();
for (const taskid of taskids) {
// for...of 使 await
const assignee = await TaskApi.getTaskAssignee(taskid); //id
if ( assignee == userId ) {
flag = true
itemType = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemType")
if ( itemType == "1") {
itemContent = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemContent")
}
}
}
if ( flag ) { //
if ( itemType == "1") { //0:,1:
const parsedObject = JSON.parse(itemContent);
Object.entries(parsedObject).forEach(([key]) => {
editableFields.value.push( key )
});
}
}
}
}
const editableFields = ref<string[]>([])
const isEditable = (field:string) => {
return editableFields.value.includes(field); // editableFields true
}
const updateForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as KqglVO
await KqglApi.updateKqgl(data)
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
defineExpose({ updateForm }) // open
//
// const queryParamsUser = reactive({
// pageNo: 1,

View File

@ -193,7 +193,6 @@ import download from '@/utils/download'
import { KqglApi, KqglVO } from '@/api/home/kqgl'
import KqglForm from './KqglForm.vue'
import * as LeaveApi from '@/api/bpm/leave'
import router from "@/router";
import {DICT_TYPE} from "@/utils/dict";
/** 考勤管理 列表 */
@ -221,6 +220,7 @@ const queryParams = reactive({
const queryFormRef = ref() //
const exportLoading = ref(false) //
const router = useRouter() //
/**发起操作 */
const handleCreate = () => {
router.push({ name: 'KqglCreate' })

View File

@ -0,0 +1,240 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="80px"
>
<el-form-item label="标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入申请标题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="申请人" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入申请人名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="申请部门" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入申请部门名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="请假类型" prop="qjglType">
<el-select
v-model="queryParams.qjglType"
placeholder="请选择请假类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="销假天数" prop="day">
<el-input
v-model="queryParams.day"
placeholder="请输入销假天数"
clearable
@keyup.enter="handleQuery"
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="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:xjgl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="申请人" align="center" prop="userName" />
<el-table-column label="申请部门" align="center" prop="deptName" />
<el-table-column label="请假类型" align="center" prop="qjglType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="scope.row.qjglType" />
</template>
</el-table-column>
<el-table-column
label="开始时间"
align="center"
prop="startTime"
:formatter="dateFormatter2"
width="100px"
/>
<el-table-column
label="结束时间"
align="center"
prop="endTime"
:formatter="dateFormatter2"
width="100px"
/>
<el-table-column label="销假天数" align="center" prop="day" />
<el-table-column label="销假原因" align="center" prop="cancelReason" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter2"
width="100px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="handleDetail(scope.row)"
v-hasPermi="['home:xjgl:update']"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import {dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { XjglApi, XjglVO } from '@/api/home/xjgl'
/** 销假管理 列表 */
defineOptions({ name: 'Xjgl' })
const router = useRouter() //
const message = useMessage() //
const loading = ref(true) //
const list = ref<XjglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
title: undefined,
userName: undefined,
userId: undefined,
deptName: undefined,
deptId: undefined,
qjglId: undefined,
qjglType: undefined,
startTime: [],
endTime: [],
day: undefined,
cancelReason: undefined,
remarks: undefined,
status: undefined,
processInstanceId: undefined,
createTime: [],
test1: undefined,
test2: undefined,
test3: undefined,
test4: undefined,
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await XjglApi.getDraft(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 详情操作 */
const handleDetail = (row: XjglVO) => {
router.push({
name: 'XjglCreate',
query: {
id: row.id
}
})
}
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
// flowOver++++++++++++++++++
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await XjglApi.exportXjgl(queryParams)
download.excel(data, '销假管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@ -100,6 +100,7 @@
<template #footer>
<el-row justify="end">
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="saveDraft" type="warning" :disabled="draftButton">存为草稿</el-button>
</el-row>
</template>
</el-card>
@ -122,7 +123,7 @@ import {CalendarApi} from "@/api/home/calendar";
import {Edit} from "@element-plus/icons-vue";
/** 销假管理 表单 */
defineOptions({ name: 'XjglForm' })
defineOptions({ name: 'XjglCreate' })
const { t } = useI18n() //
const message = useMessage() //
@ -275,10 +276,13 @@ const submitForm = async () => {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if( curFullPath ) {
data.curfullpath = curFullPath
}
if (curFullPath.includes("?")) {
curFullPath = curFullPath.split("?")[0];
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( processKey) {
data.processDefinitionKey = processKey
@ -294,10 +298,40 @@ const submitForm = async () => {
formLoading.value = false
}
}
const draftButton = ref(false)
const saveDraft = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as XjglVO
await XjglApi.saveDraft(data)
message.success(t('存为草稿成功!'))
// Tab
delView(unref(currentRoute))
await push({ name: 'Xjgl' })
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
onMounted(async () => {
await getUserInfo()
const curFullPath = currentRoute.value.fullPath
let curFullPath = currentRoute.value.fullPath
if (curFullPath.includes("?")) {
// 使 URLSearchParams
const params = new URLSearchParams(curFullPath.split("?")[1]);
const id = params.get("id") ;
//
curFullPath = curFullPath.split("?")[0];
if ( id != "") {
formData.value = await XjglApi.getXjgl(Number( id) )
draftButton.value= true
}
}
const processKey = await FormProcessMappingApi.selectProcessKey( curFullPath )
if ( !processKey ) {

View File

@ -8,9 +8,10 @@
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled />
<el-input v-model="formData.title" placeholder="请输入申请标题" :disabled="!isEditable('title')" />
</el-form-item>
<el-row>
<el-col :span="12">
@ -39,7 +40,7 @@
type="date"
value-format="x"
placeholder="选择销假开始时间"
disabled
:disabled="!isEditable('startTime')"
/>
</el-form-item>
</el-col>
@ -50,7 +51,7 @@
type="date"
value-format="x"
placeholder="选择销假结束时间"
disabled
:disabled="!isEditable('endTime')"
/>
</el-form-item>
</el-col>
@ -60,14 +61,14 @@
<el-form-item label="销假天数" prop="day">
<el-row style="width: 100%; margin-bottom: 5px">
<el-col :span="24">
<el-input v-model="formData.day" placeholder="请输入销假天数" disabled />
<el-input v-model="formData.day" placeholder="请输入销假天数" :disabled="!isEditable('day')" />
</el-col>
</el-row>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="请假类型" prop="qjglType">
<el-select v-model="formData.qjglType" placeholder="请选择请假类型" disabled>
<el-select v-model="formData.qjglType" placeholder="请选择请假类型" :disabled="!isEditable('qjglType')">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
@ -79,10 +80,10 @@
</el-col>
</el-row>
<el-form-item label="销假原因" prop="cancelReason">
<el-input v-model="formData.cancelReason" type="textarea" placeholder="请输入销假原因" disabled />
<el-input v-model="formData.cancelReason" type="textarea" placeholder="请输入销假原因" :disabled="!isEditable('cancelReason')" />
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="formData.remarks" type="textarea" placeholder="请输入备注" disabled />
<el-input v-model="formData.remarks" type="textarea" placeholder="请输入备注" :disabled="!isEditable('remarks')" />
</el-form-item>
</el-form>
</el-card>
@ -91,12 +92,15 @@
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { propTypes } from '@/utils/propTypes'
import { XjglApi } from '@/api/home/xjgl'
import {XjglApi, XjglVO} from '@/api/home/xjgl'
import QjglViewForm from "@/views/Home/qjgl/QjglViewForm.vue";
import * as TaskApi from "@/api/bpm/task";
import {useUserStore} from "@/store/modules/user";
/** 销假管理 表单 */
defineOptions({ name: 'XjglForm' })
const formLoading = ref(false) // 12
const { query } = useRoute() //
const queryId = query.id as unknown as number // URL id
@ -141,8 +145,57 @@ const selectQjglRef = ref()
const openQjglForm = ()=> {
selectQjglRef.value.open(formData.value.qjglId);
}
const editableFields = ref<string[]>([])
const isEditable = (field:string) => {
return editableFields.value.includes(field); // editableFields true
}
const userId = useUserStore().getUser.id //
const itemControl = async () => {
let flag = false
let itemType = ""
let itemContent = ""
if (queryId.length > 33 ) { //
const taskids = await TaskApi.getTaskIdsForProcessInstance( queryId ) //id
// const token = getAccessToken();
for (const taskid of taskids) {
// for...of 使 await
const assignee = await TaskApi.getTaskAssignee(taskid); //id
if ( assignee == userId ) {
flag = true
itemType = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemType")
if ( itemType == "1") {
itemContent = await TaskApi.getTaskConfigFromBpmn( taskid ,"itemContent")
}
}
}
if ( flag ) { //
if ( itemType == "1") { //0:,1:
const parsedObject = JSON.parse(itemContent);
Object.entries(parsedObject).forEach(([key]) => {
editableFields.value.push( key )
});
}
}
}
}
const updateForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as XjglVO
await XjglApi.updateXjgl(data)
} finally {
formLoading.value = false
}
}
/** 打开弹窗 */
defineExpose({ open }) // open
defineExpose({ open, updateForm }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
@ -152,6 +205,7 @@ onMounted(async () => {
if (id) {
try {
formData.value = await XjglApi.getXjgl(id)
await itemControl()
} finally {
}
}