mkm/TaskSystem-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-12 16:05:13 +08:00
parent 434165994b
commit efd4824abd
9 changed files with 955 additions and 1076 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/api/task.ts
View File

@ -1,25 +1,14 @@
import request from "@/utils/request"; import request from '@/utils/request'
//任务详情
export function apiTaskView(params: any) {
return request.get({ url: "/task/view", params });
}
//任务列表
export function apiTaskIndex(params: any) {
return request.get({ url: "/task/index", params });
}
//添加和修改
export function apiTaskCreat(params: any) {
return request.post({ url: "/task/create", params });
}
//添加任务 //添加任务
export function apiTaskAdd(params: any) { export function apiTaskAdd(params: any) {
return request.post({ url: "/task.task/add", params }); return request.post({ url: '/task_scheduling_plan.task_scheduling_plan/add', params })
} }
//任务日程-列表 //任务日程-列表
export function apiTaskList(params: any) { export function apiTaskList(params: any) {
return request.get({ url: "/task_scheduling_plan.task_scheduling_plan/lists", params }); return request.get({ url: '/task_scheduling_plan.task_scheduling_plan/lists', params })
} }
//任务日程-详情 //任务日程-详情
export function apiTaskDetails(params: any) { export function apiTaskDetails(params: any) {
return request.get({ url: "/task_scheduling_plan.task_scheduling_plan/detail", params }); return request.get({ url: '/task_scheduling_plan.task_scheduling_plan/detail', params })
} }

539
src/views/permission/admin/index.vue
View File

@ -1,143 +1,124 @@
<template> <template>
<div class="admin"> <div class="admin">
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-form class="mb-[-16px]" :model="formData" inline> <el-form class="mb-[-16px]" :model="formData" inline>
<el-form-item label="管理员名称"> <el-form-item label="管理员名称">
<el-input <el-input
v-model="formData.name" v-model="formData.name"
class="w-[280px]" class="w-[280px]"
clearable clearable
@keyup.enter="resetPage" @keyup.enter="resetPage"
/> />
</el-form-item> </el-form-item>
<el-form-item label="管理员角色"> <el-form-item label="管理员角色">
<el-select class="w-[280px]" v-model="formData.role_id"> <el-select class="w-[280px]" v-model="formData.role_id">
<el-option label="全部" value /> <el-option label="全部" value />
<el-option <el-option
v-for="(item, index) in optionsData.role" v-for="(item, index) in optionsData.role"
:key="index" :key="index"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
<export-data <export-data
class="ml-2.5" class="ml-2.5"
:fetch-fun="adminLists" :fetch-fun="adminLists"
:params="formData" :params="formData"
:page-size="pager.size" :page-size="pager.size"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never"> <el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never">
<el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd"> <el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
新增 新增
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" size="large"> <el-table :data="pager.lists" size="large">
<el-table-column label="ID" prop="id" min-width="60" />> <el-table-column label="ID" prop="id" min-width="60" />>
<el-table-column label="头像" min-width="100"> <el-table-column label="头像" min-width="100">
<template #default="{ row }"> <template #default="{ row }">
<el-avatar :size="50" :src="row.avatar"></el-avatar> <el-avatar :size="50" :src="row.avatar"></el-avatar>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" prop="name" min-width="100" /> <el-table-column label="姓名" prop="name" min-width="100" />
<el-table-column label="联系方式" prop="account" min-width="130" /> <el-table-column label="联系方式" prop="account" min-width="130" />
<el-table-column <el-table-column
label="隶属公司" label="隶属公司"
prop="company.company_name" prop="company.company_name"
min-width="120" min-width="120"
align="center" align="center"
> >
<template #default="{ row }"> <template #default="{ row }">
{{ row.company.company_name || "/" }} {{ row.company.company_name || '/' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
label="所在乡镇" <el-table-column label="授权身份" prop="role_name" min-width="120" />
prop="street_name" <el-table-column
min-width="120" label="是否签约"
/> prop="is_contract"
<el-table-column label="授权身份" prop="role_name" min-width="120" /> align="center"
<el-table-column min-width="120"
label="是否签约" >
prop="is_contract" <template #default="{ row }">
align="center" <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
min-width="120" <span v-else style="color: #fe0000">未签约</span>
> </template>
<template #default="{ row }"> </el-table-column>
<span v-if="row.is_contract == 1" style="color: #67c23a" <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
>已签约</span <el-table-column
> label="创建时间"
<span v-else style="color: #fe0000">未签约</span> prop="create_time"
</template> min-width="180"
</el-table-column> align="center"
<el-table-column />
label="最近登录时间" <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
prop="login_time" <el-table-column label="账号状态" min-width="100" v-perms="['auth.admin/edit']">
min-width="180" <template #default="{ row }">
/> <el-switch
<el-table-column v-if="row.root != 1"
label="创建时间" v-model="row.disable"
prop="create_time" :active-value="0"
min-width="180" :inactive-value="1"
align="center" @change="changeStatus(row)"
/> />
<el-table-column label="最近登录IP" prop="login_ip" min-width="120" /> </template>
<el-table-column </el-table-column>
label="账号状态"
min-width="100"
v-perms="['auth.admin/edit']"
>
<template #default="{ row }">
<el-switch
v-if="row.root != 1"
v-model="row.disable"
:active-value="0"
:inactive-value="1"
@change="changeStatus(row)"
/>
</template>
</el-table-column>
<el-table-column <el-table-column label="操作" width="230" align="center" fixed="right">
label="操作" <template #default="{ row }">
width="230" <div style="display: flex">
align="center" <el-button
fixed="right" v-perms="['auth.admin/view']"
> type="primary"
<template #default="{ row }"> link
<div style="display: flex"> @click="handleView(row)"
<el-button >查看</el-button
v-perms="['auth.admin/view']" >
type="primary" <el-button
link v-perms="['auth.admin/edit']"
@click="handleView(row)" type="primary"
>查看</el-button link
> @click="handleEdit(row)"
<el-button >编辑</el-button
v-perms="['auth.admin/edit']" >
type="primary" <el-button
link v-if="row.root != 1"
@click="handleEdit(row)" v-perms="['auth.admin/delete']"
>编辑</el-button type="danger"
> link
<el-button @click="handleDelete(row.id)"
v-if="row.root != 1" >删除</el-button
v-perms="['auth.admin/delete']" >
type="danger" <!-- <el-button
link
@click="handleDelete(row.id)"
>删除</el-button
>
<!-- <el-button
v-if="row.is_contract == 1" v-if="row.is_contract == 1"
v-perms="['auth.admin/abolition']" v-perms="['auth.admin/abolition']"
type="danger" type="danger"
@ -145,7 +126,7 @@
@click="handleAbolition(row.id)" @click="handleAbolition(row.id)"
>废除合同</el-button >废除合同</el-button
> --> > -->
<!-- <template v-if="row.company_id != 0 && row.is_contract == 0"> <!-- <template v-if="row.company_id != 0 && row.is_contract == 0">
<el-button <el-button
v-perms="['auth.admin/Draftingcontracts']" v-perms="['auth.admin/Draftingcontracts']"
type="primary" type="primary"
@ -165,188 +146,182 @@
>重新短信</el-button >重新短信</el-button
> >
</template> --> </template> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
<edit-popup <edit-popup
v-if="showEdit" v-if="showEdit"
ref="editRef" ref="editRef"
:isCheck="isCheck" :isCheck="isCheck"
@success="getLists" @success="getLists"
@close="showEdit = false" @close="showEdit = false"
/> />
<el-dialog v-model="showPop" @close="offPop"> <el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1> <h1>重要提醒</h1>
<div class="content" v-if="showConctactPop"> <div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送. 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div> </div>
<div class="content" v-else> <div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div> </div>
<p class="btn_menu"> <p class="btn_menu">
<el-button <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
type="primary" >确认创建</el-button
size="large" >
v-if="showConctactPop" <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
@click="creContct" <el-button type="info" size="large" @click="offPop">返回</el-button>
>确认创建</el-button </p>
> </el-dialog>
<el-button type="primary" size="large" v-else @click="sendMsg" </div>
>确认</el-button
>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</div>
</template> </template>
<script lang="ts" setup name="admin"> <script lang="ts" setup name="admin">
import { import {
adminEdit, adminEdit,
adminLists, adminLists,
adminDelete, adminDelete,
generateGontract, generateGontract,
sendMsgApi, sendMsgApi,
abolition, abolition
} from "@/api/perms/admin"; } from '@/api/perms/admin'
import { roleAll } from "@/api/perms/role"; import { roleAll } from '@/api/perms/role'
import { useDictOptions } from "@/hooks/useDictOptions"; import { useDictOptions } from '@/hooks/useDictOptions'
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from '@/hooks/usePaging'
import feedback from "@/utils/feedback"; import feedback from '@/utils/feedback'
import EditPopup from "./edit.vue"; import EditPopup from './edit.vue'
const route = useRoute(); const route = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
name: "", name: '',
role_id: "", role_id: '',
company_id: "", company_id: ''
}); })
const contractId = ref(""); const contractId = ref('')
// 弹窗 // 弹窗
const showPop = ref(false); const showPop = ref(false)
const showConctactPop = ref(false); const showConctactPop = ref(false)
const offPop = () => { const offPop = () => {
showPop.value = false; showPop.value = false
showConctactPop.value = false; showConctactPop.value = false
}; }
const creContct = () => { const creContct = () => {
// feedback.msgSuccess("复制成功"); // feedback.msgSuccess("复制成功");
generateGontract({ id: contractId.value }).then(() => { generateGontract({ id: contractId.value }).then(() => {
feedback.msgSuccess("发送成功"); feedback.msgSuccess('发送成功')
}); })
offPop(); offPop()
}; }
const sendMsg = () => { const sendMsg = () => {
sendMsgApi({ id: contractId.value }).then((res) => { sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess("发送成功"); feedback.msgSuccess('发送成功')
}); })
offPop(); offPop()
}; }
// //
const showEdit = ref(false); const showEdit = ref(false)
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: adminLists, fetchFun: adminLists,
params: formData, params: formData
}); })
const changeStatus = (data: any) => { const changeStatus = (data: any) => {
adminEdit({ adminEdit({
id: data.id, id: data.id,
account: data.account, account: data.account,
name: data.name, name: data.name,
role_id: data.role_id, role_id: data.role_id,
disable: data.disable, disable: data.disable,
multipoint_login: data.multipoint_login, multipoint_login: data.multipoint_login
}).finally(() => { }).finally(() => {
getLists(); getLists()
}); })
}; }
// 查看 // 查看
const isCheck = ref(false); const isCheck = ref(false)
const handleCheck = async (data: any) => { const handleCheck = async (data: any) => {
isCheck.value = true; isCheck.value = true
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; }
const handleAdd = async () => { const handleAdd = async () => {
isCheck.value = false; isCheck.value = false
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("add"); editRef.value?.open('add')
}; }
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
isCheck.value = false; isCheck.value = false
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; }
const handleView = async (data: any) => { const handleView = async (data: any) => {
isCheck.value = false; isCheck.value = false
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("view"); editRef.value?.open('view')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; }
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
await feedback.confirm("确定要删除？"); await feedback.confirm('确定要删除？')
await adminDelete({ id }); await adminDelete({ id })
getLists(); getLists()
}; }
const handleAbolition = async (id: number) => { const handleAbolition = async (id: number) => {
await feedback.confirm("确定要废除合同？"); await feedback.confirm('确定要废除合同？')
await abolition({ id }); await abolition({ id })
getLists(); getLists()
}; }
const { optionsData } = useDictOptions<{ const { optionsData } = useDictOptions<{
role: any[]; role: any[]
}>({ }>({
role: { role: {
api: roleAll, api: roleAll
}, }
}); })
if (route.query.company_id) { if (route.query.company_id) {
formData.company_id = route.query.company_id?.toString(); formData.company_id = route.query.company_id?.toString()
} }
onMounted(() => { onMounted(() => {
getLists(); getLists()
}); })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
h1 { h1 {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 30px; font-size: 30px;
color: red; color: red;
margin-bottom: 10px; margin-bottom: 10px;
} }
.content { .content {
font-size: 20px; font-size: 20px;
} }
.info { .info {
color: red; color: red;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
display: inline-block; display: inline-block;
margin: 0 5px; margin: 0 5px;
} }
.btn_menu { .btn_menu {
margin-top: 10vh; margin-top: 10vh;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
</style> </style>

235
src/views/task/calendar.vue
View File

@ -1,145 +1,136 @@
<template> <template>
<div> <div>
<el-card class="!border-none" v-loading="loading" shadow="never"> <el-card class="!border-none" v-loading="loading" shadow="never">
<el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd"> <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
新增 新增
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-calendar v-model="dateValue"> <el-calendar v-model="dateValue">
<template #dateCell="{ data }"> <template #dateCell="{ data }">
<div <div style="width: 100%; height: 100%; background-color: aquamarine">
style="width: 100%; height: 100%; background-color: aquamarine" <p :class="data.isSelected ? 'is-selected' : ''">
> {{ data.day.split('-').slice(1).join('-') }}
<p :class="data.isSelected ? 'is-selected' : ''"> <!-- {{ data.isSelected ? '✔️' : '' }} -->
{{ data.day.split("-").slice(1).join("-") }} </p>
<!-- {{ data.isSelected ? '✔️' : '' }} --> <div
</p> class="task"
<div :class="{
class="task" fou: item.priority == 4,
:class="{ tow: item.priority == 2,
fou: item.priority == 4, the: item.priority == 3
tow: item.priority == 2, }"
the: item.priority == 3, v-if="taskList[data.day]"
}" @click="handleEdit(item)"
v-if="taskList[data.day]" v-for="(item, index) in taskList[data.day]"
@click="handleEdit(item)" :key="index"
v-for="(item, index) in taskList[data.day]" >
:key="index" {{ item.title }}
> </div>
{{ item.title }} </div>
</div> </template>
</el-calendar>
</div> </div>
<!-- <div class="task" style="color: var(--el-color-primary);">完成BUG测试</div> </el-card>
<div class="task" style="color: var(--el-color-danger);">完成BUG测试</div> --> <edit-popup
</template> v-if="showEdit"
</el-calendar> ref="editRef"
</div> :dict-data="dictData"
</el-card> :dateValue="dateValue"
<edit-popup @success="loadTask"
v-if="showEdit" @close="showEdit = false"
ref="editRef" />
:dict-data="dictData" </div>
:dateValue="dateValue"
@success="loadTask"
@close="showEdit = false"
/>
</div>
</template> </template>
<script lang="ts" setup name="task"> <script lang="ts" setup name="task">
import { useDictData } from "@/hooks/useDictOptions"; import { useDictData } from '@/hooks/useDictOptions'
import { apiTaskIndex } from "@/api/task"; import { timeFormat } from '@/utils/util'
import { timeFormat } from "@/utils/util"; import feedback from '@/utils/feedback'
import feedback from "@/utils/feedback";
// import { getRoutePath } from "router"; // import { getRoutePath } from "router";
import EditPopup from "./edit.vue"; import EditPopup from './edit.vue'
import { reactive, watch } from "vue"; import { reactive, watch } from 'vue'
const route = useRoute()
const dateValue = ref(new Date()); const dateValue = ref(new Date())
watch( watch(
() => dateValue, () => dateValue,
(newValue, oldValue) => { (newValue, oldValue) => {
initShowDate(timeFormat(newValue.value.getTime())); initShowDate(timeFormat(newValue.value.getTime()))
}, },
{ deep: true } { deep: true }
); )
const test = (e: any) => { const test = (e: any) => {
console.log(e); console.log(e)
}; }
// 加载 // 加载
const loading = ref(true); const loading = ref(true)
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框
const showEdit = ref(false); const showEdit = ref(false)
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
start_time: "", start_time: '',
end_time: "", end_time: '',
day: 1, day: 1,
page_no: 1, page_no: 1,
pageSize: 150, pageSize: 150
}); })
const taskList = ref<any>([]); const taskList = ref<any>([])
// 查询 // 查询
const loadTask = async () => { const start_date = ref('')
let res: any = await apiTaskIndex(queryParams); const end_date = ref('')
taskList.value = res.lists;
loading.value = false;
};
const start_date = ref("");
const end_date = ref("");
// 计算当前显示的第一天和最后一天 // 计算当前显示的第一天和最后一天
const initShowDate = (dateStr = "") => { const initShowDate = (dateStr = '') => {
const currentDate = dateStr ? new Date(dateStr) : new Date(); const currentDate = dateStr ? new Date(dateStr) : new Date()
const currentYear = currentDate.getFullYear(); const currentYear = currentDate.getFullYear()
const currentMonth = currentDate.getMonth(); const currentMonth = currentDate.getMonth()
const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay(); //获取第一天星期 const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay() //获取第一天星期
const startDay = new Date(currentYear, currentMonth, 1).getDay(); //获取最后一天星期 const startDay = new Date(currentYear, currentMonth, 1).getDay() //获取最后一天星期
// console.log(new Date(currentYear, currentMonth, 1-startDay).getDate()); // console.log(new Date(currentYear, currentMonth, 1-startDay).getDate());
// console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate()); // console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate());
start_date.value = timeFormat( start_date.value = timeFormat(new Date(currentYear, currentMonth, 1 - startDay).getTime()) //获取第一天时间
new Date(currentYear, currentMonth, 1 - startDay).getTime() end_date.value = timeFormat(new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime()) //获取最后一天时间
); //获取第一天时间 if (queryParams.start_time != start_date.value) {
end_date.value = timeFormat( queryParams.start_time = start_date.value
new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime() queryParams.end_time = end_date.value
); //获取最后一天时间 loading.value = true
if (queryParams.start_time != start_date.value) { }
queryParams.start_time = start_date.value; }
queryParams.end_time = end_date.value; initShowDate()
loading.value = true;
loadTask();
}
};
initShowDate();
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData(""); const { dictData } = useDictData('')
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true; console.log(2232)
await nextTick(); showEdit.value = true
editRef.value?.open("add"); await nextTick()
}; editRef.value?.open('add')
if (route.query.id) {
console.log(22)
const emits = defineEmits(['scheduling_id'])
emits('scheduling_id', route.query.id)
}
}
// 编辑 // 编辑
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; }
// 删除 // 删除
// const handleDelete = async (id: number | any[]) => { // const handleDelete = async (id: number | any[]) => {
@ -153,25 +144,25 @@ const handleEdit = async (data: any) => {
<style lang="scss"> <style lang="scss">
.is-selected { .is-selected {
color: #1989fa; color: #1989fa;
} }
.el-calendar-table .el-calendar-day { .el-calendar-table .el-calendar-day {
height: 6.2rem; height: 6.2rem;
} }
.task { .task {
font-size: 0.8rem; font-size: 0.8rem;
color: #f7ba2a; color: #f7ba2a;
white-space: nowrap; /* 设置文本不换行 */ white-space: nowrap; /* 设置文本不换行 */
overflow: hidden; /* 隐藏溢出的部分 */ overflow: hidden; /* 隐藏溢出的部分 */
text-overflow: ellipsis; /* 在溢出的部分显示省略号 */ text-overflow: ellipsis; /* 在溢出的部分显示省略号 */
} }
.the { .the {
color: #ff5100; color: #ff5100;
} }
.tow { .tow {
color: #f38200; color: #f38200;
} }
.fou { .fou {
color: red; color: red;
} }
</style> </style>

266
src/views/task/edit.vue
View File

@ -1,203 +1,115 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup
ref="popupRef" ref="popupRef"
title="创建日程安排" title="创建日程安排"
:async="true" :async="true"
width="800px" width="800px"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
> >
<el-form class="formdata" :model="detailsdt" label-width="120px"> <el-form class="formdata" :model="detailsdt" label-width="120px">
<el-form-item class="datatime" label="时间日程范围"> <el-form-item class="datatime" label="时间日程范围">
<el-date-picker <el-date-picker
v-model="datetime" v-model="datetime"
type="datetimerange" type="datetimerange"
range-separator="至" range-separator="至"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
/> />
</el-form-item> </el-form-item>
<el-form-item label="日程内容"> <el-form-item label="日程内容">
<el-input v-model="detailsdt.task_info.content"/> <el-input v-model="detailsdt.task_info.content" disabled />
</el-form-item> </el-form-item>
<el-form-item label="日程描述"> <el-form-item label="日程描述">
<el-input type="textarea" v-model="detailsdt.task_info.title"/> <el-input type="textarea" v-model="detailsdt.task_info.title" disabled />
</el-form-item> </el-form-item>
</el-form> </el-form>
</popup>
</popup> </div>
</div>
</template> </template>
<script lang="ts" setup name="taskEidt"> <script lang="ts" setup name="taskEidt">
import type { FormInstance } from "element-plus"; import type { FormInstance } from 'element-plus'
import Popup from "@/components/popup/index.vue"; import Popup from '@/components/popup/index.vue'
import { apiTaskCreat, apiTaskView } from "@/api/task"; import { reactive, onUpdated, type PropType } from 'vue'
import { timeFormat } from "@/utils/util";
import { reactive,onUpdated , type PropType } from "vue";
import DialogIndexMan from "./dialog_index_man.vue";
const props = defineProps({ const props = defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}), default: () => ({})
}, },
dateValue: { dateValue: {
type: Date, type: Date,
default: () => null, default: () => null
}, },
detailsdata:{ detailsdata: {
type:Object, type: Object,
default:{} default: {}
} }
}); })
const emit = defineEmits(["success", "close"]); const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>(); const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>(); const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref("add"); const mode = ref('add')
const detailsdt = ref({}); const detailsdt = ref({})
const datetime = ref([]); const datetime = ref([])
// 弹窗标题 // 弹窗标题
// const popupTitle = computed(() => { // const popupTitle = computed(() => {
// return mode.value == "edit" ? "创建日程安排" : "新增任务"; // return mode.value == "edit" ? "创建日程安排" : "新增任务";
// }); // });
onUpdated(() => { onUpdated(() => {
watchEffect(()=>{ watchEffect(() => {
detailsdt.value=props.detailsdata detailsdt.value = props.detailsdata
const startTime=new Date(props.detailsdata.start_time) const startTime = new Date(props.detailsdata.start_time)
const endTime=new Date(props.detailsdata.end_time) const endTime = new Date(props.detailsdata.end_time)
datetime.value=[startTime,endTime] datetime.value = [startTime, endTime]
}) })
}); })
const priorityList = reactive([
{
value: 1,
label: "低",
},
{
value: 2,
label: "中",
},
{
value: 3,
label: "高",
},
{
value: 4,
label: "紧急",
},
]);
const taskTypeList = reactive([
{
value: 0,
label: "测试",
},
{
value: 1,
label: "修复",
},
{
value: 2,
label: "新增",
},
]);
// const timeList = reactive([1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24])
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
id: "", id: '',
title: "", //任务名称 title: '', //任务名称
priority: "", //任务优先级 type: '', //任务类型
type: "", //任务类型 start_time: '', //预计开始时间
is_bug: "", //是否为修复bug end_time: '', //预计结束时间
start_time: "", //预计开始时间 check_time: '', //预计验收时间
end_time: "", //预计结束时间 content: '' //任务描述
check_time: "", //预计验收时间 })
director_name: "", //负责人
director_uid: "", //负责人id
assist_admin_names: "", //协作人
assist_admin_ids: "", //协作人id
assist_check_names: "", //审查人
assist_check_ids: "", //审查人id
content: "", //任务描述
project_id: "", //项目id
});
// 获取详情 // 获取详情
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data: Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = data[key]; formData[key] = data[key]
}
} }
}
};
const getDetail = async (id: number) => {
const data = await apiTaskView({
id,
});
setFormData(data.detail);
};
// 选择负责人
const isMan = ref(false);
// 选择协作人
const isManTow = ref(false);
// 选择审查人
const isManThe = ref(false);
function customEvent(data: any) {
isMan.value = false;
formData.director_name = data.name;
formData.director_uid = data.id;
} }
function customEventMan(data: any) {
isManTow.value = false;
formData.assist_admin_names = data.name;
formData.assist_admin_ids = data.id;
}
function customEventManThe(data: any) {
isManThe.value = false;
formData.assist_check_names = data.name;
formData.assist_check_ids = data.id;
}
// 提交按钮
// const handleSubmit = async () => {
// const data = { ...formData };
// mode.value == "edit" ? await apiTaskCreat(data) : await apiTaskCreat(data);
// popupRef.value?.close();
// emit("success");
// };
//打开弹窗 //打开弹窗
const open = (type = "add") => { const open = (type = 'add') => {
mode.value = type; mode.value = type
popupRef.value?.open(); popupRef.value?.open()
}; }
// 关闭回调 // 关闭回调
const handleClose = () => { const handleClose = () => {
emit("close"); emit('close')
};
defineExpose({
open,
setFormData,
getDetail,
});
</script>
<style lang="scss" scoped>
.formdata{
.el-form-item{
.el-date-picker{
width: 100%;
}
}
} }
defineExpose({
open,
setFormData
})
</script>
<style lang="scss" scoped>
.formdata {
.el-form-item {
.el-date-picker {
width: 100%;
}
}
}
</style> </style>

141
src/views/task/editTow.vue
View File

@ -1,93 +1,92 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup
ref="popupRef" ref="popupRef"
title="创建日程安排" title="创建日程安排"
:async="true" :async="true"
width="800px" width="800px"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
> >
<el-form class="formdata" :model="detailsdt" label-width="120px"> <el-form class="formdata" :model="detailsdt" label-width="120px">
<el-form-item label="任务日期"> <el-form-item label="任务日期">
<el-date-picker <el-date-picker v-model="formData.time" type="date" placeholder="选择日期" />
v-model="formData.time" </el-form-item>
type="date" <el-form-item label="任务模板">
placeholder="选择日期" <el-input
/> v-model="formData.template_name"
</el-form-item> @click="isShow = true"
<el-form-item label="任务模板"> clearable
<el-input v-model="formData.template_id" /> placeholder="请输入任务模板"
</el-form-item> />
<el-form-item label="任务排期"> </el-form-item>
<el-input v-model="formData.scheduling_id" /> </el-form>
</el-form-item> </popup>
</el-form> <el-dialog v-model="isShow" title="选择任务" width="60%">
</popup> <DialogIndex @customEvent="customEvent" />
</div> </el-dialog>
</div>
</template> </template>
<script lang="ts" setup name="taskEidt"> <script lang="ts" setup name="taskEidt">
import type { FormInstance } from "element-plus"; import type { FormInstance } from 'element-plus'
import Popup from "@/components/popup/index.vue"; import Popup from '@/components/popup/index.vue'
import { apiTaskCreat, apiTaskView } from "@/api/task"; import { apiTaskAdd } from '@/api/task'
import { apiTaskTemplateLists } from "@/api/task_template"; import { reactive, onUpdated, type PropType } from 'vue'
import { timeFormat } from "@/utils/util"; import DialogIndex from '@/views/task_template/list_two.vue'
import { reactive, onUpdated, type PropType } from "vue"; const route = useRoute()
import DialogIndexMan from "./dialog_index_man.vue";
const emit = defineEmits(["success", "close"]); const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>(); const popupRef = shallowRef<InstanceType<typeof Popup>>()
const popupRef = shallowRef<InstanceType<typeof Popup>>(); const mode = ref('add')
const mode = ref("add"); const detailsdt = ref({})
const detailsdt = ref({}); const isShow = ref(false)
const datetime = ref([]);
const templateList = ref([]);
const getTemplateList = () => {
apiTaskTemplateLists().then((res) => {
templateList.value = res;
console.log(templateList.value);
});
};
getTemplateList();
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
time: "", time: '',
template_id: "", template_id: '',
scheduling_id: "", scheduling_id: '',
}); template_name: ''
})
function customEvent(data: any) {
isShow.value = false
formData.template_id = data.id
formData.template_name = data.title
}
if (route.query.id) {
formData.scheduling_id = route.query.id.toString()
}
// 提交按钮 // 提交按钮
// const handleSubmit = async () => { const handleSubmit = async () => {
// const data = { ...formData }; const data = { ...formData }
// mode.value == "edit" ? await apiTaskCreat(data) : await apiTaskCreat(data); console.log(data)
// popupRef.value?.close(); mode.value == 'edit' ? await apiTaskAdd(data) : await apiTaskAdd(data)
// emit("success"); popupRef.value?.close()
// }; emit('success')
}
//打开弹窗 //打开弹窗
const open = (type = "add") => { const open = (type = 'add') => {
mode.value = type; mode.value = type
popupRef.value?.open(); popupRef.value?.open()
}; }
// 关闭回调 // 关闭回调
const handleClose = () => { const handleClose = () => {
emit("close"); emit('close')
}; }
defineExpose({ defineExpose({
open, open
}); })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.formdata { .formdata {
.el-form-item { .el-form-item {
.el-date-picker { .el-date-picker {
width: 100%; width: 100%;
}
} }
}
} }
</style> </style>

364
src/views/task/taskCalendar.vue
View File

@ -1,235 +1,205 @@
<template> <template>
<div> <div>
<el-card class="!border-none" v-loading="loading" shadow="never"> <el-card class="!border-none" v-loading="loading" shadow="never">
<el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd"> <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
新增 新增
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-calendar v-model="dateValue"> <el-calendar v-model="dateValue">
<template #dateCell="{ data }"> <template #dateCell="{ data }">
<div style="width: 100%; height: 100%"> <div style="width: 100%; height: 100%">
<p <p
:class="data.isSelected ? 'is-selected' : ''" :class="data.isSelected ? 'is-selected' : ''"
style="padding: 8px 8px 0 8px" style="padding: 8px 8px 0 8px"
> >
{{ data.day.split("-").slice(1).join("-") }} {{ data.day.split('-').slice(1).join('-') }}
<!-- {{ data.isSelected ? '✔️' : '' }} --> <!-- {{ data.isSelected ? '✔️' : '' }} -->
</p> </p>
<div>{{ dateNow(data.day) }}</div> <div>{{ dateNow(data.day) }}</div>
<div <div
class="task" class="task"
:class="{ :class="{
fou: item.priority == 4, fou: item.priority == 4,
tow: item.priority == 2, tow: item.priority == 2,
the: item.priority == 3, the: item.priority == 3
}" }"
@click="handleEdit(item)" @click="handleEdit(item)"
v-for="(item, index) in taskList" v-for="(item, index) in taskList"
:key="index" :key="index"
> >
{{ item.title }} {{ item.title }}
</div> </div>
</div> </div>
<!-- <div class="task" style="color: var(--el-color-primary);">完成BUG测试</div> <!-- <div class="task" style="color: var(--el-color-primary);">完成BUG测试</div>
<div class="task" style="color: var(--el-color-danger);">完成BUG测试</div> --> <div class="task" style="color: var(--el-color-danger);">完成BUG测试</div> -->
</template> </template>
</el-calendar> </el-calendar>
</div> </div>
</el-card> </el-card>
<edit-popup <edit-popup
ref="editRef" ref="editRef"
:dict-data="dictData" :dict-data="dictData"
:dateValue="dateValue" :dateValue="dateValue"
:detailsdata="detailsdata" :detailsdata="detailsdata"
@success="loadTask" @success="loadTask"
@close="showEdit = false" @close="showEdit = false"
/> />
<EditTowPopup <EditTowPopup
ref="editTowRef" ref="editTowRef"
:dict-data="dictData" :dict-data="dictData"
:dateValue="dateValue" :dateValue="dateValue"
:detailsdata="detailsdata" :detailsdata="detailsdata"
@success="loadTask" @success="loadTask"
@close="showEditTow = false" @close="showEditTow = false"
/> />
</div> </div>
</template> </template>
<script lang="ts" setup name="task">
import { useDictData } from "@/hooks/useDictOptions";
import { apiTaskIndex } from "@/api/task";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
// import { getRoutePath } from "router";
import EditPopup from "./edit.vue";
import EditTowPopup from "./editTow.vue";
import { reactive, watch } from "vue";
import { apiTaskList, apiTaskDetails } from "@/api/task";
import { apiTaskSchedulingPlanAdd } from "@/api/task_scheduling_plan";
const dateValue = ref(new Date()); <script lang="ts" setup name="task">
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
// import { getRoutePath } from "router";
import EditPopup from './edit.vue'
import EditTowPopup from './editTow.vue'
import { reactive, watch } from 'vue'
import { apiTaskList, apiTaskDetails } from '@/api/task'
import { apiTaskSchedulingPlanAdd } from '@/api/task_scheduling_plan'
const route = useRoute()
const dateValue = ref(new Date())
const detailsdata = reactive({ const detailsdata = reactive({
create_time: "", create_time: '',
create_user_id: 0, create_user_id: 0,
delete_time: "", delete_time: '',
end_time: "", end_time: '',
extend: "", extend: '',
id: "", id: '',
scheduling_id: "", scheduling_id: '',
sn: "", sn: '',
start_time: "", start_time: '',
status: "", status: '',
task_id: "", task_id: '',
task_info: { task_info: {
admin_id: 0, admin_id: 0,
content: "", content: '',
create_time: "", create_time: '',
delete_time: "", delete_time: '',
id: 0, id: 0,
money: "", money: '',
status: 0, status: 0,
title: "", title: '',
type: 0, type: 0,
type_name: "", type_name: '',
update_time: "", update_time: ''
}, },
template_id: 0, template_id: 0,
update_time: "", update_time: ''
}); })
watch( watch(
() => dateValue, () => dateValue,
async (newValue, oldValue) => { async (newValue, oldValue) => {
const id = taskList.value.find( const id = taskList.value.find(
(item) => (item) => item.start_time.split(' ')[0] == timeFormat(newValue.value.getTime())
item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime()) )?.id
)?.id; if (id) {
if (id) { const res = await apiTaskDetails({ id })
const res = await apiTaskDetails({ id }); Object.keys(detailsdata).forEach((key) => {
Object.keys(detailsdata).forEach((key) => { res[key] ? (detailsdata[key] = res[key]) : null
res[key] ? (detailsdata[key] = res[key]) : null; })
}); editRef.value?.open('add')
editRef.value?.open("add"); initShowDate(timeFormat(newValue.value.getTime()))
initShowDate(timeFormat(newValue.value.getTime())); }
} },
}, { deep: true }
{ deep: true } )
);
// 加载 // 加载
const loading = ref(true); const loading = ref(true)
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const editTowRef = shallowRef<InstanceType<typeof EditPopup>>(); const editTowRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框
const showEdit = ref(false); const showEdit = ref(false)
const showEditTow = ref(false); const showEditTow = ref(false)
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
start_time: "", start_time: '',
end_time: "", end_time: '',
page_no: 1, page_no: 1,
pageSize: 150, pageSize: 150
}); })
const taskList = ref<any>([]); const taskList = ref<any>([])
// 查询 // 查询
const loadTask = async () => { const loadTask = async () => {
// let res: any = await apiTaskIndex(queryParams); apiTaskList(queryParams).then((res) => {
// taskList.value = res.lists; taskList.value = res.lists
apiTaskList(queryParams).then((res) => { })
taskList.value = res.lists; loading.value = false
}); }
loading.value = false;
};
const start_date = ref(""); const start_date = ref('')
const end_date = ref(""); const end_date = ref('')
// 计算当前显示的第一天和最后一天 // 计算当前显示的第一天和最后一天
const initShowDate = (dateStr = "") => { const initShowDate = (dateStr = '') => {
const currentDate = dateStr ? new Date(dateStr) : new Date(); const currentDate = dateStr ? new Date(dateStr) : new Date()
const currentYear = currentDate.getFullYear(); const currentYear = currentDate.getFullYear()
const currentMonth = currentDate.getMonth(); const currentMonth = currentDate.getMonth()
const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay(); //获取第一天星期 const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay() //获取第一天星期
const startDay = new Date(currentYear, currentMonth, 1).getDay(); //获取最后一天星期 const startDay = new Date(currentYear, currentMonth, 1).getDay() //获取最后一天星期
// console.log(new Date(currentYear, currentMonth, 1-startDay).getDate()); // console.log(new Date(currentYear, currentMonth, 1-startDay).getDate());
// console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate()); // console.log(new Date(currentYear, currentMonth + 1, 6-lastDay).getDate());
start_date.value = timeFormat( start_date.value = timeFormat(new Date(currentYear, currentMonth, 1 - startDay).getTime()) //获取第一天时间
new Date(currentYear, currentMonth, 1 - startDay).getTime() end_date.value = timeFormat(new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime()) //获取最后一天时间
); //获取第一天时间 if (queryParams.start_time != start_date.value) {
end_date.value = timeFormat( queryParams.start_time = start_date.value
new Date(currentYear, currentMonth + 1, 6 - lastDay).getTime() queryParams.end_time = end_date.value
); //获取最后一天时间 loading.value = true
if (queryParams.start_time != start_date.value) { loadTask()
queryParams.start_time = start_date.value; }
queryParams.end_time = end_date.value; }
loading.value = true; initShowDate()
loadTask();
}
};
initShowDate();
const dateNow = (day) => { const dateNow = (day) => {
return taskList.value.find((item) => item.start_time.split(" ")[0] == day) return taskList.value.find((item) => item.start_time.split(' ')[0] == day)?.template_name
?.template_name; }
};
// 获取字典数据
// const { dictData } = useDictData("");
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {
showEditTow.value = true; showEditTow.value = true
await nextTick(); await nextTick()
editTowRef.value?.open("add"); editTowRef.value?.open('add')
}; }
// 编辑
// const handleEdit = async (data: any) => {
// showEdit.value = true;
// await nextTick();
// editRef.value?.open("edit");
// editRef.value?.setFormData(data);
// };
// 删除
// const handleDelete = async (id: number | any[]) => {
// await feedback.confirm("确定要删除？");
// await apiFlowTypeDelete({ id });
// getLists();
// };
// getLists();
</script> </script>
<style lang="scss"> <style lang="scss">
.is-selected { .is-selected {
color: #1989fa; color: #1989fa;
} }
.el-calendar-table .el-calendar-day { .el-calendar-table .el-calendar-day {
height: auto; height: auto;
min-height: 6.2rem; min-height: 6.2rem;
padding: 0; padding: 0;
} }
.task { .task {
font-size: 0.8rem; font-size: 0.8rem;
color: #f7ba2a; color: #f7ba2a;
white-space: nowrap; /* 设置文本不换行 */ white-space: nowrap; /* 设置文本不换行 */
overflow: hidden; /* 隐藏溢出的部分 */ overflow: hidden; /* 隐藏溢出的部分 */
text-overflow: ellipsis; /* 在溢出的部分显示省略号 */ text-overflow: ellipsis; /* 在溢出的部分显示省略号 */
} }
.the { .the {
color: #ff5100; color: #ff5100;
} }
.tow { .tow {
color: #f38200; color: #f38200;
} }
.fou { .fou {
color: red; color: red;
} }
</style> </style>

275
src/views/task/taskList.vue
View File

@ -1,196 +1,157 @@
<template> <template>
<div> <div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd"> <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
新增 新增
</el-button> </el-button>
<!-- <el-button <!-- <el-button
v-perms="['flow_type/delete']" v-perms="['flow_type/delete']"
:disabled="!selectData.length" :disabled="!selectData.length"
@click="handleDelete(selectData)" @click="handleDelete(selectData)"
> >
删除 删除
</el-button> --> </el-button> -->
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
{{ pager }} {{ pager }}
<el-table-column <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
label="id" <el-table-column label="名称" prop="title" show-overflow-tooltip />
prop="id" <el-table-column label="优先级" prop="title" width="90" show-overflow-tooltip>
show-overflow-tooltip <template #default="{ row }">
width="60" <span
/> :class="{
<el-table-column label="名称" prop="title" show-overflow-tooltip /> one: row.priority == 1,
<el-table-column tow: row.priority == 2,
label="优先级" the: row.priority == 3,
prop="title" fou: row.priority == 4
width="90" }"
show-overflow-tooltip >{{ row.priority_name }}</span
> >
<template #default="{ row }"> </template>
<span </el-table-column>
:class="{ <el-table-column
one: row.priority == 1, label="负责人"
tow: row.priority == 2, prop="director_name"
the: row.priority == 3, width="90"
fou: row.priority == 4, show-overflow-tooltip
}" />
>{{ row.priority_name }}</span <el-table-column
> label="协作人"
</template> prop="assist_admin_names"
</el-table-column> width="90"
<el-table-column show-overflow-tooltip
label="负责人" />
prop="director_name" <el-table-column
width="90" label="审查人"
show-overflow-tooltip prop="assist_check_names"
/> width="90"
<el-table-column show-overflow-tooltip
label="协作人" />
prop="assist_admin_names" <el-table-column label="开始时间" prop="start_time" show-overflow-tooltip />
width="90" <el-table-column label="结束时间" prop="end_time" show-overflow-tooltip />
show-overflow-tooltip <el-table-column label="审查时间" prop="check_time" show-overflow-tooltip />
/> <el-table-column label="状态" prop="status" show-overflow-tooltip>
<el-table-column <template #default="{ row }">
label="审查人" <span v-if="row.status == 1" style="color: #67c23a">正常</span>
prop="assist_check_names" <span v-else style="color: #fe0000">禁用</span>
width="90" </template>
show-overflow-tooltip </el-table-column>
/> <el-table-column label="操作" align="center" width="auto" fixed="right">
<el-table-column <template #default="{ row }">
label="开始时间" <el-button
prop="start_time" v-perms="['flow/edit']"
show-overflow-tooltip type="primary"
/> link
<el-table-column @click="handleEdit(row)"
label="结束时间" >
prop="end_time" 编辑
show-overflow-tooltip </el-button>
/> <el-button
<el-table-column v-perms="['flow/delete']"
label="审查时间" type="danger"
prop="check_time" link
show-overflow-tooltip @click="handleDelete(row.id)"
/> >
<el-table-column label="状态" prop="status" show-overflow-tooltip> 删除
<template #default="{ row }"> </el-button>
<span v-if="row.status == 1" style="color: #67c23a">正常</span> </template>
<span v-else style="color: #fe0000">禁用</span> </el-table-column>
</template> </el-table>
</el-table-column> </div>
<el-table-column <div class="flex mt-4 justify-end">
label="操作" <pagination v-model="pager" @change="getLists" />
align="center" </div>
width="auto" </el-card>
fixed="right" <edit-popup
> v-if="showEdit"
<template #default="{ row }"> ref="editRef"
<el-button :dict-data="dictData"
v-perms="['flow/edit']" @success="getLists"
type="primary" @close="showEdit = false"
link />
@click="handleEdit(row)" </div>
>
编辑
</el-button>
<el-button
v-perms="['flow/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template> </template>
<script lang="ts" >
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import { apiTaskIndex } from "@/api/task";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); <script lang="ts">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框 // 是否显示编辑框
const showEdit = ref(false); const showEdit = ref(false)
// 查询条件 // 查询条件
const queryParams = reactive({}); const queryParams = reactive({})
// 选中数据 // 选中数据
const selectData = ref<any[]>([]); const selectData = ref<any[]>([])
// 表格选择后回调事件 // 表格选择后回调事件
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id); selectData.value = val.map(({ id }) => id)
}; }
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData(""); const { dictData } = useDictData('')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiTaskIndex,
params: queryParams,
});
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("add"); editRef.value?.open('add')
}; }
// 编辑 // 编辑
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; }
// 删除 // 删除
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除？"); await feedback.confirm('确定要删除？')
await apiFlowTypeDelete({ id }); }
getLists();
};
getLists();
</script> </script>
<style lang="scss"> <style lang="scss">
.one { .one {
color: #f7ba2a; color: #f7ba2a;
} }
.the { .the {
color: #ff5100; color: #ff5100;
} }
.tow { .tow {
color: #f38200; color: #f38200;
} }
.fou { .fou {
color: red; color: red;
} }
</style> </style>

77
src/views/task_scheduling/index.vue
View File

@ -25,7 +25,7 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button <el-button
v-perms="['task_scheduling.task_scheduling/add']" v-perms="['task_scheduling.task_scheduling/add']"
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
@ -35,6 +35,7 @@
</template> </template>
新增 新增
</el-button> </el-button>
<!--
<el-button <el-button
v-perms="['task_scheduling.task_scheduling/delete']" v-perms="['task_scheduling.task_scheduling/delete']"
:disabled="!selectData.length" :disabled="!selectData.length"
@ -52,19 +53,24 @@
prop="company_type_name" prop="company_type_name"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="状态" prop="status" show-overflow-tooltip> <el-table-column
label="状态"
min-width="100"
v-perms="['task_scheduling.task_scheduling/edit']"
>
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.status == '1' ? '开启' : '关闭' }}</span> <el-switch
v-model="row.status"
:active-value="1"
:inactive-value="0"
@change="changeStatus(row)"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button v-perms="['task.calendar']" type="primary" link>
v-perms="['task.calendar']"
type="primary"
link
@click="handleCalendar(row)"
>
<router-link <router-link
:to="{ :to="{
path: getRoutePath('task.calendar'), path: getRoutePath('task.calendar'),
@ -75,22 +81,6 @@
>任务日程</router-link >任务日程</router-link
> >
</el-button> </el-button>
<!-- <el-button
v-perms="['task_scheduling.task_scheduling/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button> -->
<!-- <el-button
v-perms="['task_scheduling.task_scheduling/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -112,7 +102,7 @@
<script lang="ts" setup name="taskSchedulingLists"> <script lang="ts" setup name="taskSchedulingLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiTaskSchedulingLists, apiTaskSchedulingDelete } from '@/api/task_scheduling' import { apiTaskSchedulingLists, apiTaskSchedulingEdit } from '@/api/task_scheduling'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import EditPopup from './edit.vue' import EditPopup from './edit.vue'
@ -133,11 +123,6 @@ const queryParams = reactive({
status: '' status: ''
}) })
const statusdata = reactive([
{ value: '1', label: '显示' },
{ value: '0', label: '隐藏' }
])
// 选中数据 // 选中数据
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])
@ -161,28 +146,13 @@ const handleAdd = async () => {
await nextTick() await nextTick()
editRef.value?.open('add') editRef.value?.open('add')
} }
const changeStatus = (data: any) => {
// 编辑 apiTaskSchedulingEdit({
const handleEdit = async (data: any) => { id: data.id,
showEdit.value = true status: data.status
await nextTick() }).finally(() => {
editRef.value?.open('edit') getLists()
editRef.value?.setFormData(data) })
}
// 任务日程
const handleCalendar = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
// 删除
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？')
await apiTaskSchedulingDelete({ id })
getLists()
} }
dictDataLists({ type_id: 10 }).then((res) => { dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists datalist.value = res.lists
@ -194,6 +164,7 @@ getLists()
.formtabel { .formtabel {
.el-form-item { .el-form-item {
width: 20%; width: 20%;
.el-btn { .el-btn {
margin-left: 100px; margin-left: 100px;
} }

111
src/views/task_template/list_two.vue Normal file
View File

@ -0,0 +1,111 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px] formtabel" :model="queryParams" inline>
<el-form-item label-width="100px" label="主题" prop="title">
<el-input
class="w-[280px]"
v-model="queryParams.title"
clearable
placeholder="请输入主题"
/>
</el-form-item>
<el-form-item label-width="100px" label="">
<el-button class="el-btn" type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4">
<el-table :data="pager.lists" @cell-click="handleSelectionChange">
<el-table-column label="主题" prop="title" show-overflow-tooltip />
<el-table-column label="创建人" prop="admin_name" show-overflow-tooltip />
<el-table-column label="金额" prop="money" show-overflow-tooltip />
<el-table-column label="任务类型" prop="type_name" show-overflow-tooltip />
<el-table-column label="状态" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ row.status == 1 ? '显示' : '隐藏' }}</span>
</template>
</el-table-column>
<el-table-column label="任务描述" prop="content" show-overflow-tooltip />
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="taskTemplateLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiTaskTemplateLists, apiTaskTemplateDelete } from '@/api/task_template'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import { dictDataLists } from '@/api/setting/dict'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const datalist = ref([])
// 是否显示编辑框
const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
title: '',
admin_id: '',
money: '',
type: '',
status: '',
content: ''
})
const statusdata = reactive([
{ id: 1, name: '显示' },
{ id: 2, name: '隐藏' }
])
// 选中数据
const selectData = ref<any[]>([])
const emits = defineEmits(['customEvent'])
// 表格选择后回调事件
const handleSelectionChange = (value: any) => {
emits('customEvent', value)
// selectData.value = val.map(({ id }) => id)
}
// 获取字典数据
const { dictData } = useDictData('')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiTaskTemplateLists,
params: queryParams
})
//任务类型接口
// dictDataLists({ type_id: 10 }).then((res) => {
// datalist.value = res.lists
// })
getLists()
</script>
<style lang="scss" scoped>
.formtabel {
.el-form-item {
width: 20%;
.el-btn {
margin-left: 60px;
}
}
}
</style>