This commit is contained in:
weipengfei 2023-08-16 11:15:37 +08:00
parent 31e6dea192
commit 3d550219d3
5 changed files with 574 additions and 313 deletions
src
api
views
task_scheduling
task_template

@ -23,4 +23,9 @@ export function apiTaskSchedulingDelete(params: any) {
// 任务公司排期详情
export function apiTaskSchedulingDetail(params: any) {
return request.get({ url: '/task_scheduling.task_scheduling/detail', params })
}
// 任务公司排期详情
export function apiTaskSchedulingEditMoney(params: any) {
return request.post({ url: '/task_scheduling.task_scheduling/editMoney', params })
}

@ -63,6 +63,11 @@
prop="company_name"
show-overflow-tooltip
/>
<el-table-column
label="每日最大金额"
prop="money"
show-overflow-tooltip
/>
<el-table-column
label="公司类型"
prop="company_type_name"
@ -83,8 +88,32 @@
</template>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<el-table-column label="操作" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['task.task_calendar']"
@click="moneyAdd(row)"
type="primary"
link
>
金额
</el-button>
<el-button
v-perms="['task_template.task_template/lists']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('task_template.task_template/lists'),
query: {
id: row.id,
company_id: row.company_id,
},
}"
>任务模板</router-link
>
</el-button>
<el-button v-perms="['task.task_calendar']" type="primary" link>
<router-link
:to="{
@ -111,6 +140,12 @@
@success="getLists"
@close="showEdit = false"
/>
<money
ref="moneyRef"
v-if="moneyShow"
@success="getLists"
@close="moneyShow = false"
></money>
</div>
</template>
@ -126,11 +161,15 @@ import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
import { dictDataLists } from "@/api/setting/dict";
import { getRoutePath } from "@/router";
import money from "./money.vue";
const datalist = ref([]);
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
const moneyRef = shallowRef<InstanceType<typeof money>>();
//
const showEdit = ref(false);
//
const moneyShow = ref(false);
//
const queryParams = reactive({
@ -164,6 +203,15 @@ const handleAdd = async () => {
await nextTick();
editRef.value?.open("add");
};
//
const moneyAdd = async (obj: any) => {
moneyShow.value = true;
await nextTick();
moneyRef.value?.open(obj.money ? "edit" : "add");
moneyRef.value?.setFormData(obj);
};
const changeStatus = (data: any) => {
apiTaskSchedulingEdit({
id: data.id,

@ -0,0 +1,94 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="500px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" :rules="formRules">
<el-form-item label="金额" prop="money">
<el-input
v-model="formData.money"
type="number"
clearable
placeholder="请输入公司每天最多的金额"
>
<template #append></template>
</el-input>
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="taskSchedulingEdit">
import type { FormInstance } from "element-plus";
import Popup from "@/components/popup/index.vue";
import {
apiTaskSchedulingAdd,
apiTaskSchedulingEdit,
apiTaskSchedulingEditMoney,
} from "@/api/task_scheduling";
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: "",
money: "",
});
const setFormData = (e) => {
Object.keys(formData).forEach((key) => {
if (e[key] != null && e[key] != undefined) {
formData[key] = e[key];
}
});
};
//
const formRules = reactive<any>({
money: {
required: true,
message: "请输入正确金额",
trigger: "change",
},
});
//
const handleSubmit = async () => {
await formRef.value?.validate();
const data = { ...formData };
await apiTaskSchedulingEditMoney(data);
popupRef.value?.close();
emit("success");
};
//
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
};
//
const handleClose = () => {
emit("close");
};
defineExpose({
open,
setFormData,
});
</script>

@ -1,199 +1,251 @@
<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="moeny">
<el-input v-model="formData.money" clearable placeholder="请输入金额" />
</el-form-item>
<el-form-item label="一阶天数">
<el-input
v-model="formData.stage_day_one"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="一阶比例">
<el-input
v-model="formData.proportion_one"
clearable
placeholder="请输入比例"
type="number"
>
<template #append>%</template>
</el-input>
</el-form-item>
<el-form-item label="二阶天数">
<el-input
v-model="formData.stage_day_two"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶比例">
<el-input
v-model="formData.proportion_two"
clearable
placeholder="请输入比例"
type="number"
>
<template #append>%</template>
</el-input>
</el-form-item>
<el-form-item label="任务类型" prop="type">
<el-select v-model="formData.type" clearable placeholder="请输入任务类型">
<el-option
v-for="item in datalist"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="1">显示</el-radio>
<el-radio :label="0">隐藏</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="任务描述" prop="content">
<el-input v-model="formData.content" clearable placeholder="请输入任务描述" />
</el-form-item>
</el-form>
</popup>
</div>
<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="types">
<el-select
v-model="formData.types"
clearable
placeholder="请输入阶段类型"
>
<el-option
v-for="item in [
{ label: 1, name: '循环' },
{ label: 2, name: '长期' },
{ label: 3, name: '单次' },
]"
:key="item.label"
:value="item.label"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label="一阶段天数">
<el-input
v-model="formData.stage_day_one"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="一阶段金额">
<el-input
v-model="formData.money"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶段天数">
<el-input
v-model="formData.stage_day_two"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶段金额">
<el-input
v-model="formData.money_two"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="长期金额" v-if="+formData.types == 2">
<el-input
v-model="formData.money_three"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="任务类型" prop="type">
<el-select
v-model="formData.type"
clearable
placeholder="请输入任务类型"
>
<el-option
v-for="item in datalist"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="1">显示</el-radio>
<el-radio :label="0">隐藏</el-radio>
</el-radio-group>
</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'
import { dictDataLists } from '@/api/setting/dict'
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";
import { dictDataLists } from "@/api/setting/dict";
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 datalist = ref([])
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 datalist = ref([]);
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑任务模板' : '新增任务模板'
})
return mode.value == "edit" ? "编辑任务模板" : "新增任务模板";
});
//
const formData = reactive({
id: '',
title: '',
admin_id: '',
money: '',
type: '',
status: '',
content: '',
stage_day_one: 0,
proportion_one: 0,
stage_day_two: 9999,
proportion_two: 0
})
id: "",
company_id: "",
title: "",
admin_id: "",
type: "",
status: "",
content: "",
stage_day_one: 0,
money: 0, //
stage_day_two: 0,
money_two: 0, //
money_three: 0, //
types: "", //
});
//
dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists
})
datalist.value = res.lists;
});
//
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']
}
]
})
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]
}
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 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')
}
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 open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
};
//
const handleClose = () => {
emit('close')
}
emit("close");
};
defineExpose({
open,
setFormData,
getDetail
})
open,
setFormData,
getDetail,
});
</script>

@ -1,186 +1,248 @@
<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="创建人" prop="admin_id">
<el-input class="w-[280px]" v-model="queryParams.admin_id" clearable placeholder="请输入创建人" />
</el-form-item>
<el-form-item label-width="100px" label="金额" prop="money">
<el-input class="w-[280px]" v-model="queryParams.money" clearable placeholder="请输入金额" />
</el-form-item>
<el-form-item label-width="100px" label="任务类型" prop="type">
<el-select v-model="queryParams.type" clearable placeholder="请输入任务类型" >
<el-option
v-for="item in datalist"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label-width="100px" label="状态" prop="status">
<el-select v-model="queryParams.status" clearable placeholder="请选择状态">
<el-option
v-for="item in statusdata"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label-width="100px" label="任务描述" prop="content">
<el-input class="w-[280px]" v-model="queryParams.content" 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">
<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
<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="创建人" prop="admin_id">
<el-input
class="w-[280px]"
v-model="queryParams.admin_id"
clearable
placeholder="请输入创建人"
/>
</el-form-item>
<el-form-item label-width="100px" label="金额" prop="money">
<el-input
class="w-[280px]"
v-model="queryParams.money"
clearable
placeholder="请输入金额"
/>
</el-form-item>
<el-form-item label-width="100px" label="任务类型" prop="type">
<el-select
v-model="queryParams.type"
clearable
placeholder="请输入任务类型"
>
<el-option
v-for="item in datalist"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label-width="100px" label="状态" prop="status">
<el-select
v-model="queryParams.status"
clearable
placeholder="请选择状态"
>
<el-option
v-for="item in statusdata"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label-width="100px" label="任务描述" prop="content">
<el-input
class="w-[280px]"
v-model="queryParams.content"
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">
<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="ID"
width="80"
prop="id"
show-overflow-tooltip
/>
<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-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']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</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_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-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>
</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'
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 editRef = shallowRef<InstanceType<typeof EditPopup>>();
const datalist = ref([]);
//
const showEdit = ref(false)
const showEdit = ref(false);
const route = useRoute();
//
const queryParams = reactive({
title: '',
admin_id: '',
money: '',
type: '',
status: '',
content: ''
})
const statusdata=reactive([
{id:1,name:"显示"},
{id:2,name:"隐藏"}
])
id: "", //id
company_id: "",
title: "",
admin_id: "",
money: "",
type: "",
status: "",
content: "",
});
if (route.query?.id) queryParams.id = route.query.id;
if (route.query?.company_id) queryParams.company_id = route.query.company_id;
const statusdata = reactive([
{ id: 1, name: "显示" },
{ id: 2, name: "隐藏" },
]);
//
const selectData = ref<any[]>([])
const selectData = ref<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: apiTaskTemplateLists,
params: queryParams
})
fetchFun: apiTaskTemplateLists,
params: queryParams,
});
//
const handleAdd = async () => {
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
showEdit.value = true;
await nextTick();
editRef.value?.open("add");
editRef.value?.setFormData({ company_id: queryParams.company_id });
};
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
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()
}
await feedback.confirm("确定要删除?");
await apiTaskTemplateDelete({ id });
getLists();
};
//
dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists;
});
getLists()
getLists();
</script>
<style lang="scss" scoped>
.formtabel{
.el-form-item{
width: 20%;
.el-btn{
margin-left: 60px;
}
.formtabel {
.el-form-item {
width: 20%;
.el-btn {
margin-left: 60px;
}
}
}
</style>