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

提交

Browse Source
This commit is contained in:
weipengfei 2023-08-11 18:23:36 +08:00
parent 269457045e
commit d654db7fff
3 changed files with 328 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/views/task/editTow.vue Normal file
View File

@ -0,0 +1,93 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
title="创建日程安排"
:async="true"
width="800px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form class="formdata" :model="detailsdt" label-width="120px">
<el-form-item label="任务日期">
<el-date-picker
v-model="formData.time"
type="date"
placeholder="选择日期"
/>
</el-form-item>
<el-form-item label="任务模板">
<el-input v-model="formData.template_id" />
</el-form-item>
<el-form-item label="任务排期">
<el-input v-model="formData.scheduling_id" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="taskEidt">
import type { FormInstance } from "element-plus";
import Popup from "@/components/popup/index.vue";
import { apiTaskCreat, apiTaskView } from "@/api/task";
import { apiTaskTemplateLists } from "@/api/task_template";
import { timeFormat } from "@/utils/util";
import { reactive, onUpdated, type PropType } from "vue";
import DialogIndexMan from "./dialog_index_man.vue";
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
const detailsdt = ref({});
const datetime = ref([]);
const templateList = ref([]);
const getTemplateList = () => {
apiTaskTemplateLists().then((res) => {
templateList.value = res;
console.log(templateList.value);
});
};
getTemplateList();
// 表单数据
const formData = reactive({
time: "",
template_id: "",
scheduling_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") => {
mode.value = type;
popupRef.value?.open();
};
// 关闭回调
const handleClose = () => {
emit("close");
};
defineExpose({
open,
});
</script>
<style lang="scss" scoped>
.formdata {
.el-form-item {
.el-date-picker {
width: 100%;
}
}
}
</style>

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

@ -1,12 +1,12 @@
<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 }">
@ -48,6 +48,14 @@
@success="loadTask" @success="loadTask"
@close="showEdit = false" @close="showEdit = false"
/> />
<EditTowPopup
ref="editTowRef"
:dict-data="dictData"
:dateValue="dateValue"
:detailsdata="detailsdata"
@success="loadTask"
@close="showEditTow = false"
/>
</div> </div>
</template> </template>
@ -58,8 +66,11 @@ 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 EditTowPopup from "./editTow.vue";
import { reactive, watch } from "vue"; import { reactive, watch } from "vue";
import { apiTaskList, apiTaskDetails } from "@/api/task"; import { apiTaskList, apiTaskDetails } from "@/api/task";
import { apiTaskSchedulingPlanAdd } from "@/api/task_scheduling_plan";
const dateValue = ref(new Date()); const dateValue = ref(new Date());
const detailsdata = reactive({ const detailsdata = reactive({
create_time: "", create_time: "",
@ -92,16 +103,18 @@ const detailsdata = reactive({
watch( watch(
() => dateValue, () => dateValue,
async (newValue, oldValue) => { async (newValue, oldValue) => {
const id = taskList.value.find((item) =>item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime()))?.id; const id = taskList.value.find(
if(id){ (item) =>
const res = await apiTaskDetails({ id }); item.start_time.split(" ")[0] == timeFormat(newValue.value.getTime())
Object.keys(detailsdata).forEach((key) => { )?.id;
res[key] ? (detailsdata[key] = res[key]) : null; if (id) {
}); const res = await apiTaskDetails({ id });
editRef.value?.open("add"); Object.keys(detailsdata).forEach((key) => {
initShowDate(timeFormat(newValue.value.getTime())); res[key] ? (detailsdata[key] = res[key]) : null;
});
editRef.value?.open("add");
initShowDate(timeFormat(newValue.value.getTime()));
} }
}, },
{ deep: true } { deep: true }
); );
@ -110,8 +123,10 @@ watch(
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 showEdit = ref(false); const showEdit = ref(false);
const showEditTow = ref(false);
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
@ -168,9 +183,9 @@ const dateNow = (day) => {
// 添加 // 添加
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true; showEditTow.value = true;
await nextTick(); await nextTick();
editRef.value?.open("add"); editTowRef.value?.open("add");
}; };
// 编辑 // 编辑

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

@ -1,186 +1,248 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form
class="mb-[-16px] formtabel" class="mb-[-16px] formtabel"
:model="queryParams" :model="queryParams"
inline inline
label-width="100px" label-width="100px"
> >
<el-form-item label="创建人" prop="create_user_id"> <el-form-item label="创建人" prop="create_user_id">
<el-input class="w-[280px]" v-model="queryParams.create_user_id" clearable placeholder="请输入创建人" /> <el-input
</el-form-item> class="w-[280px]"
<el-form-item label="模板" prop="template_id"> v-model="queryParams.create_user_id"
<el-select v-model="queryParams.template_id" clearable placeholder="请输入模板" > clearable
<el-option placeholder="请输入创建人"
v-for="item in datalist" />
:key="item.label" </el-form-item>
:value="item.id" <el-form-item label="模板" prop="template_id">
:label="item.name" <el-select
/> v-model="queryParams.template_id"
</el-select> clearable
</el-form-item> placeholder="请输入模板"
<el-form-item label="公司" prop="company_id"> >
<el-input class="w-[280px]" v-model="queryParams.company_id" clearable placeholder="请输入公司" /> <el-option
</el-form-item> v-for="item in datalist"
<el-form-item label="下发公司类型" prop="type"> :key="item.label"
<el-input class="w-[280px]" v-model="queryParams.template_id" clearable placeholder="请输入下发公司类型" /> :value="item.id"
</el-form-item> :label="item.name"
<el-form-item label="状态" prop="status"> />
<el-select v-model="queryParams.status" clearable placeholder="请选择状态"> </el-select>
<el-option </el-form-item>
v-for="item in statusdata" <el-form-item label="公司" prop="company_id">
:key="item.label" <el-input
:value="item.value" class="w-[280px]"
:label="item.label" v-model="queryParams.company_id"
/> clearable
</el-select> placeholder="请输入公司"
</el-form-item> />
<el-form-item> </el-form-item>
<el-button class="el-btn" type="primary" @click="resetPage">查询</el-button> <el-form-item label="下发公司类型" prop="type">
<el-button @click="resetParams">重置</el-button> <el-input
</el-form-item> class="w-[280px]"
</el-form> v-model="queryParams.template_id"
</el-card> clearable
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> placeholder="请输入下发公司类型"
<el-button v-perms="['task_scheduling.task_scheduling/add']" type="primary" @click="handleAdd"> />
<template #icon> </el-form-item>
<icon name="el-icon-Plus" /> <el-form-item label="状态" prop="status">
</template> <el-select
新增 v-model="queryParams.status"
</el-button> clearable
<el-button placeholder="请选择状态"
>
<el-option
v-for="item in statusdata"
:key="item.label"
:value="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item>
<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">
<el-button
v-perms="['task_scheduling.task_scheduling/add']"
type="primary"
@click="handleAdd"
>
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['task_scheduling.task_scheduling/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column
label="创建人"
prop="admin_name"
show-overflow-tooltip
/>
<el-table-column
label="模板"
prop="type_name"
show-overflow-tooltip
/>
<el-table-column
label="公司"
prop="company_name"
show-overflow-tooltip
/>
<el-table-column
label="下发公司类型"
prop="template_name"
show-overflow-tooltip
/>
<el-table-column label="状态" prop="status" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ row.status == "1" ? "显示" : "隐藏" }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button v-perms="['flow/edit']" type="primary" link>
<router-link
:to="{
path: 'calendar',
query: {
id: row.id,
},
}"
>任务日程</router-link
>
</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']" v-perms="['task_scheduling.task_scheduling/delete']"
:disabled="!selectData.length" type="danger"
@click="handleDelete(selectData)" link
> @click="handleDelete(row.id)"
>
删除 删除
</el-button> </el-button>
<div class="mt-4"> </template>
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> </el-table-column>
<el-table-column type="selection" width="55" /> </el-table>
<el-table-column label="创建人" prop="admin_name" show-overflow-tooltip /> </div>
<el-table-column label="模板" prop="type_name" show-overflow-tooltip /> <div class="flex mt-4 justify-end">
<el-table-column label="公司" prop="company_name" show-overflow-tooltip /> <pagination v-model="pager" @change="getLists" />
<el-table-column label="下发公司类型" prop="template_name" show-overflow-tooltip /> </div>
<el-table-column label="状态" prop="status" show-overflow-tooltip> </el-card>
<template #default="{row}"> <edit-popup
<span>{{row.status=="1"?"显示":"隐藏"}}</span> v-if="showEdit"
</template> ref="editRef"
</el-table-column> :dict-data="dictData"
<el-table-column label="操作" width="120" fixed="right"> @success="getLists"
<template #default="{ row }"> @close="showEdit = false"
<el-button />
v-perms="['task_scheduling.task_scheduling/edit']" </div>
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>
</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" 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 {
import { timeFormat } from '@/utils/util' apiTaskSchedulingLists,
import feedback from '@/utils/feedback' apiTaskSchedulingDelete,
import EditPopup from './edit.vue' } from "@/api/task_scheduling";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
import { dictDataLists } from "@/api/setting/dict"; import { dictDataLists } from "@/api/setting/dict";
const datalist=ref([]) import { getRoutePath } from "@/router";
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const datalist = ref([]);
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// 是否显示编辑框 // 是否显示编辑框
const showEdit = ref(false) const showEdit = ref(false);
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
create_user_id: '', create_user_id: "",
template_id: '', template_id: "",
company_id: '', company_id: "",
type: '', type: "",
status: '' status: "",
}) });
const statusdata=reactive( const statusdata = reactive([
[ { value: "1", label: "显示" },
{value:"1",label:'显示'}, { value: "0", label: "隐藏" },
{value:"0",label:"隐藏"}, ]);
]
)
// 选中数据 // 选中数据
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({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiTaskSchedulingLists, fetchFun: apiTaskSchedulingLists,
params: queryParams 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 apiTaskSchedulingDelete({ id }) await apiTaskSchedulingDelete({ id });
getLists() getLists();
} };
dictDataLists({ type_id: 10 }).then((res) => { dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists; datalist.value = res.lists;
}); });
getLists() getLists();
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.formtabel{ .formtabel {
.el-form-item{ .el-form-item {
width: 20%; width: 20%;
.el-btn{ .el-btn {
margin-left: 100px; margin-left: 100px;
}
} }
}
} }
</style> </style>