新建任务
zy
parent
4804d4e146
commit
f99a823ca9
|
|
@ -850,7 +850,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
|
|||
component: () => import('@/views/project/project/components/TaskDetail.vue')
|
||||
},
|
||||
{
|
||||
path: 'components/ProjectTaskForm',
|
||||
path: 'components/TaskAdd',
|
||||
name: 'ProComAdd',
|
||||
meta: {
|
||||
title: '任务新增',
|
||||
|
|
@ -858,7 +858,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
|
|||
hidden: true,
|
||||
activeMenu: '/project/project'
|
||||
},
|
||||
component: () => import('@/views/project/project/components/ProjectTaskForm.vue')
|
||||
component: () => import('@/views/project/project/components/TaskAdd.vue')
|
||||
},
|
||||
{
|
||||
path: 'online/OnlineApplicationForm',
|
||||
|
|
|
|||
|
|
@ -134,7 +134,6 @@ const submitForm = async () => {
|
|||
formLoading.value = true
|
||||
try {
|
||||
const data = formData.value as unknown as BriefWorkVO
|
||||
console.log('%csrc/views/project/briefWeekWork/BriefWorkWeekForm.vue:137 customerFormRef.value.getData()', 'color: #007acc;', customerFormRef.value);
|
||||
if(customerFormRef.value) {
|
||||
let customerData = customerFormRef.value.getData()
|
||||
data.customerIds = customerData.map( v=> v.id)
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
<el-option
|
||||
v-for="dict in userOptions"
|
||||
:key="dict.id"
|
||||
:label="dict.name"
|
||||
:value="dict.userId"
|
||||
:label="dict.nickname"
|
||||
:value="dict.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
@ -103,11 +103,13 @@
|
|||
import { ProjectTaskApi, ProjectTaskVO } from '@/api/task/task'
|
||||
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { propTypes } from '@/utils/propTypes'
|
||||
import * as UserApi from '@/api/system/user'
|
||||
|
||||
/** 任务 表单 */
|
||||
defineOptions({ name: 'ProjectTaskForm' })
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
// const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
|
||||
const message = useMessage() // 消息弹窗
|
||||
const props = defineProps({
|
||||
userOptions: propTypes.object.def([]),
|
||||
|
|
@ -157,9 +159,9 @@ const formRules = reactive({
|
|||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (data: Object) => {
|
||||
console.log('%csrc/views/task/components/ProjectTaskForm.vue:143 data', 'color: #007acc;', data);
|
||||
const open = async (data: Object, list: any) => {
|
||||
dialogVisible.value = true
|
||||
// userOptions.value = list
|
||||
// formData.value.projectName = data.name
|
||||
// formData.value.projectUser = data.userId
|
||||
formType.value = data.type
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ import * as UserApi from '@/api/system/user'
|
|||
defineOptions({ name: 'ProjectTask' })
|
||||
import { propTypes } from '@/utils/propTypes'
|
||||
|
||||
const TaskOptions = ref<UserApi.UserVO[]>([]) // 用户列表
|
||||
const TaskOptions = ref<UserApi.UserVO[]>([]) // 负责人列表
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
const props = defineProps({
|
||||
|
|
@ -159,7 +159,6 @@ const resetQuery = () => {
|
|||
/** 添加/修改操作 */
|
||||
const formRef = ref()
|
||||
const openForm = (type: string, taskId?: number) => {
|
||||
console.log('%csrc/views/task/components/Task.vue:149 object', 'color: #007acc;', props.name, props.id, props.userId);
|
||||
let data = {
|
||||
name: props.name,
|
||||
id: props.id,
|
||||
|
|
@ -167,7 +166,7 @@ const openForm = (type: string, taskId?: number) => {
|
|||
type: type,
|
||||
taskId: taskId || '',
|
||||
}
|
||||
formRef.value.open(data)
|
||||
formRef.value.open(data, props.userOptions)
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,262 @@
|
|||
<template>
|
||||
<ContentWrap style="margin-right:10px">
|
||||
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="项目名称" prop="projectName">
|
||||
<!-- <el-input v-model="formData.projectName" disabled placeholder="请输入任务名称" /> -->
|
||||
<el-select v-model="formData.projectId" filterable clearable @change="changeProject" placeholder="请选择项目名称">
|
||||
<el-option
|
||||
v-for="dict in projectList"
|
||||
:key="dict.id"
|
||||
:label="dict.name"
|
||||
:value="dict.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="项目负责人" prop="projectUser">
|
||||
<el-select v-model="formData.projectUser" disabled placeholder="">
|
||||
<el-option
|
||||
v-for="dict in userOptions"
|
||||
:key="dict.id"
|
||||
:label="dict.nickname"
|
||||
:value="dict.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="任务标题" prop="taskName">
|
||||
<el-input v-model="formData.taskName" placeholder="请输入任务名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="任务负责人" prop="userId">
|
||||
<el-select v-model="formData.userId" placeholder="请选择成员姓名">
|
||||
<el-option
|
||||
v-for="dict in TaskOptions"
|
||||
:key="dict.id"
|
||||
:label="dict.nickname"
|
||||
:value="dict.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="开始日期" prop="startDate">
|
||||
<el-date-picker
|
||||
style="width: 100%"
|
||||
v-model="formData.startDate"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="选择开始日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="截止日期" prop="endDate">
|
||||
<el-date-picker
|
||||
v-model="formData.endDate"
|
||||
style="width: 100%"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="选择截止日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="任务优先级" prop="taskLevel">
|
||||
<el-select v-model="formData.taskLevel" filterable clearable placeholder="请输入任务优先级" class="w-1/1">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.TTS_TASK_LEVEL)"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="formType === 'update'">
|
||||
<el-form-item label="任务进度" prop="taskProgress">
|
||||
<el-input v-model="formData.taskProgress" oninput = "value=value.replace(/[^\d]/g,'')" placeholder="请输入任务进度" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="任务附件" prop="attachment">
|
||||
<UploadFile v-model="formData.attachment" :limit="1" :fileType="['doc','docx']"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="任务描述" prop="taskDescribe">
|
||||
<el-input v-model="formData.taskDescribe" type="textarea" :rows="5" placeholder="请输入任务描述" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div style="text-align: right" v-if="!type">
|
||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||
<el-button @click="goBack">取 消</el-button>
|
||||
</div>
|
||||
</ContentWrap>
|
||||
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { ProjectTaskApi, ProjectTaskVO } from '@/api/task/task'
|
||||
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||
import { propTypes } from '@/utils/propTypes'
|
||||
import * as DeptApi from '@/api/system/dept'
|
||||
import * as UserApi from '@/api/system/user'
|
||||
import { ProjectApi, ProjectVO } from '@/api/task/project'
|
||||
import { ProjectBonusApi, ProjectBonusVO } from '@/api/task/bonus'
|
||||
|
||||
const { proxy }: any = getCurrentInstance();
|
||||
/** 任务 表单 */
|
||||
defineOptions({ name: 'ProjectTaskForm' })
|
||||
const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
|
||||
const projectList = ref<UserApi.UserVO[]>([]) // 项目列表
|
||||
const TaskOptions = ref<UserApi.UserVO[]>([]) // 负责人列表
|
||||
|
||||
const { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
const props = defineProps({
|
||||
id: propTypes.number.def(undefined),
|
||||
})
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
||||
const validateProgress = (_: any, __: any, callback: any) => {
|
||||
const num = Number(formData.value.taskProgress)
|
||||
|
||||
if (num <= 0 || num >100) {
|
||||
callback(new Error('请输入正确的任务进度'))
|
||||
return
|
||||
}
|
||||
|
||||
callback()
|
||||
}
|
||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
||||
const formData = ref({
|
||||
id: undefined,
|
||||
taskName: undefined,
|
||||
userId: undefined,
|
||||
taskLevel: undefined,
|
||||
startDate: undefined,
|
||||
endDate: undefined,
|
||||
attachment: undefined,
|
||||
taskDescribe: undefined,
|
||||
taskProgress: undefined,
|
||||
projectId: undefined,
|
||||
taskState: undefined,
|
||||
processInstanceId: undefined,
|
||||
auditStatus: undefined,
|
||||
projectUser: undefined,
|
||||
projectName: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
|
||||
userId: [{ required: true, message: '任务负责人不能为空', trigger: 'blur' }],
|
||||
taskLevel: [{ required: true, message: '任务优先级不能为空', trigger: 'blur' }],
|
||||
startDate: [{ required: true, message: '开始日期不能为空', trigger: 'blur' }],
|
||||
endDate: [{ required: true, message: '截止日期不能为空', trigger: 'blur' }],
|
||||
taskDescribe: [{ required: true, message: '任务描述不能为空', trigger: 'blur' }],
|
||||
projectId: [{ required: true, message: '项目Id不能为空', trigger: 'blur' }],
|
||||
taskProgress: [{ validator: validateProgress, trigger: 'blur' }],
|
||||
})
|
||||
const formRef = ref() // 表单 Ref
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (id) => {
|
||||
dialogVisible.value = true
|
||||
// formData.value.projectName = data.name
|
||||
// formData.value.projectUser = data.userId
|
||||
// resetForm()
|
||||
// // 修改时，设置数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
formData.value = await ProjectTaskApi.getProjectTask(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 ProjectTaskVO
|
||||
await ProjectTaskApi.createProjectTask(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success')
|
||||
goBack()
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
const goBack = ()=> {
|
||||
proxy.$router.go(-1)
|
||||
}
|
||||
|
||||
const changeProject = async (val) => {
|
||||
const arr = projectList.value.filter(v => v.id == val)
|
||||
formData.value.projectUser = arr.length ? arr[0]['userId'] : ''
|
||||
|
||||
const data = await ProjectBonusApi.getProjectBonusPage({
|
||||
projectId: val,
|
||||
pageNo: 1,
|
||||
pageSize: 999,
|
||||
})
|
||||
TaskOptions.value = data.list
|
||||
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
taskName: undefined,
|
||||
userId: undefined,
|
||||
taskLevel: undefined,
|
||||
startDate: undefined,
|
||||
endDate: undefined,
|
||||
attachment: undefined,
|
||||
taskDescribe: undefined,
|
||||
taskProgress: undefined,
|
||||
projectId: undefined,
|
||||
taskState: undefined,
|
||||
processInstanceId: undefined,
|
||||
auditStatus: undefined,
|
||||
projectUser: undefined,
|
||||
projectName: undefined,
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
const data = await ProjectApi.getProjectPage({
|
||||
pageNo: 1,
|
||||
pageSize: 999,
|
||||
})
|
||||
projectList.value = data.list
|
||||
// 获得用户列表
|
||||
userOptions.value = await UserApi.getSimpleUserList()
|
||||
|
||||
})
|
||||
</script>
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
编辑
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item
|
||||
command="handleAddTask"
|
||||
command="openFormEdit"
|
||||
v-if="checkPermi(['task:project:create']) && scope.row.auditStatus === 2"
|
||||
>
|
||||
新增任务
|
||||
|
|
|
|||
Loading…
Reference in New Issue