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

Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

Browse Source
This commit is contained in:
jiangyouyi 2023-08-08 12:04:16 +08:00
commit efbc38b229
6 changed files with 512 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/task_template.ts Normal file
View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 任务模板列表
export function apiTaskTemplateLists(params: any) {
return request.get({ url: '/task_template.task_template/lists', params })
}
// 添加任务模板
export function apiTaskTemplateAdd(params: any) {
return request.post({ url: '/task_template.task_template/add', params })
}
// 编辑任务模板
export function apiTaskTemplateEdit(params: any) {
return request.post({ url: '/task_template.task_template/edit', params })
}
// 删除任务模板
export function apiTaskTemplateDelete(params: any) {
return request.post({ url: '/task_template.task_template/delete', params })
}
// 任务模板详情
export function apiTaskTemplateDetail(params: any) {
return request.get({ url: '/task_template.task_template/detail', params })
}

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

@ -10,7 +10,9 @@
<div class="mt-4">
<el-calendar v-model="dateValue">
<template #dateCell="{ data }">
<div style="width: 100%; height: 100%">
<div
style="width: 100%; height: 100%; background-color: aquamarine"
>
<p :class="data.isSelected ? 'is-selected' : ''">
{{ data.day.split("-").slice(1).join("-") }}
<!-- {{ data.isSelected ? '✔️' : '' }} -->
@ -92,7 +94,6 @@ const taskList = ref<any>([]);
const loadTask = async () => {
let res: any = await apiTaskIndex(queryParams);
taskList.value = res.lists;
// console.log(taskList.value);
loading.value = false;
};

181
src/views/task/taskCalendar.vue Normal file
View File

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

144
src/views/task_template/edit.vue Normal file
View File

@ -0,0 +1,144 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="主题" prop="title">
<el-input v-model="formData.title" clearable placeholder="请输入主题" />
</el-form-item>
<el-form-item label="创建人" prop="admin_id">
<el-input v-model="formData.admin_id" clearable placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="金额" prop="moeny">
<el-input v-model="formData.moeny" clearable placeholder="请输入金额" />
</el-form-item>
<el-form-item label="任务类型" prop="type">
<el-input v-model="formData.type" clearable placeholder="请输入任务类型" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-input v-model="formData.status" clearable placeholder="请输入状态" />
</el-form-item>
<el-form-item label="任务描述" prop="content">
<el-input v-model="formData.content" clearable placeholder="请输入任务描述" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="taskTemplateEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiTaskTemplateAdd, apiTaskTemplateEdit, apiTaskTemplateDetail } from '@/api/task_template'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
// 弹窗标题
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑任务模板' : '新增任务模板'
})
// 表单数据
const formData = reactive({
id: '',
title: '',
admin_id: '',
moeny: '',
type: '',
status: '',
content: '',
})
// 表单验证
const formRules = reactive<any>({
title: [{
required: true,
message: '请输入主题',
trigger: ['blur']
}],
admin_id: [{
required: true,
message: '请输入创建人',
trigger: ['blur']
}],
type: [{
required: true,
message: '请输入任务类型',
trigger: ['blur']
}],
status: [{
required: true,
message: '请输入状态',
trigger: ['blur']
}]
})
// 获取详情
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiTaskTemplateDetail({
id: row.id
})
setFormData(data)
}
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiTaskTemplateEdit(data)
: await apiTaskTemplateAdd(data)
popupRef.value?.close()
emit('success')
}
//打开弹窗
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
// 关闭回调
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

150
src/views/task_template/index.vue Normal file
View File

@ -0,0 +1,150 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form-item label="主题" prop="title">
<el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入主题" />
</el-form-item>
<el-form-item label="创建人" prop="admin_id">
<el-input class="w-[280px]" v-model="queryParams.admin_id" clearable placeholder="请输入创建人" />
</el-form-item>
<el-form-item label="金额" prop="moeny">
<el-input class="w-[280px]" v-model="queryParams.moeny" clearable placeholder="请输入金额" />
</el-form-item>
<el-form-item label="任务类型" prop="type">
<el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入任务类型" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
</el-form-item>
<el-form-item label="任务描述" prop="content">
<el-input class="w-[280px]" v-model="queryParams.content" clearable placeholder="请输入任务描述" />
</el-form-item>
<el-form-item>
<el-button 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_template.task_template/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['task_template.task_template/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="title" show-overflow-tooltip />
<el-table-column label="创建人" prop="admin_id" show-overflow-tooltip />
<el-table-column label="金额" prop="moeny" show-overflow-tooltip />
<el-table-column label="任务类型" prop="type" show-overflow-tooltip />
<el-table-column label="状态" prop="status" show-overflow-tooltip />
<el-table-column label="任务描述" prop="content" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['task_template.task_template/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['task_template.task_template/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>
<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'
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 是否显示编辑框
const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
title: '',
admin_id: '',
moeny: '',
type: '',
status: '',
content: ''
})
// 选中数据
const selectData = ref<any[]>([])
// 表格选择后回调事件
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id)
}
// 获取字典数据
const { dictData } = useDictData('')
// 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiTaskTemplateLists,
params: queryParams
})
// 添加
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.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 apiTaskTemplateDelete({ id })
getLists()
}
getLists()
</script>

48
src/views/user_informationg/details.vue
View File

@ -310,34 +310,13 @@
</el-form>
</el-card>
<!-- <component
<component
v-for="(item, card_index) in formData.datas"
:key="item.id"
:is="isComponent(item.category_child || item.category_id)"
:datas="item.datas"
:update_time="item.update_time"
></component> -->
<template
v-for="(item, card_index) in formData.datas"
:key="'card' + item.id"
>
<store
v-if="item.category_child == 8"
:datas="item.datas"
:update_time="item.update_time"
></store>
<plant
v-if="item.category_child == 7"
:datas="item.datas"
:update_time="item.update_time"
></plant>
<breeding
v-if="item.category_child == 32"
:datas="item.datas"
:update_time="item.update_time"
></breeding>
</template>
></component>
</template>
<script lang="ts" setup name="test">
@ -349,25 +328,14 @@ import plant from "./component/plant.vue";
import { fileManagelist, fileManageDetil } from "@/api/informationg";
const route = useRoute();
const componentList = ref([
{
id: 8,
name: "store",
},
{
id: 7,
name: "plant",
},
{
id: 32,
name: "breeding",
},
]);
const componentList = reactive(new Map());
componentList.set(7, plant);
componentList.set(8, store);
componentList.set(32, breeding);
const isComponent = (id: any) => {
console.log(componentList.value.find((item) => item.id == id)?.name);
return componentList.value.find((item) => item.id == id)?.name;
return componentList.get(id);
};
const formData = reactive({