8.8修改
This commit is contained in:
parent
8a41b12fef
commit
9c4d2ae856
@ -15,7 +15,7 @@ export function apiTaskCreat(params: any) {
|
||||
export function apiTaskAdd(params: any) {
|
||||
return request.post({ url: "/task.task/add", params });
|
||||
}
|
||||
//任务排期-任务添加
|
||||
export function apiTaskScheduling(params: any) {
|
||||
return request.post({ url: "/task_scheduling.task_scheduling/add", params });
|
||||
//任务日程-列表
|
||||
export function apiTaskList(params: any) {
|
||||
return request.get({ url: "/task_scheduling.task_scheduling/lists", params });
|
||||
}
|
||||
|
@ -410,7 +410,8 @@
|
||||
</el-row>
|
||||
</el-col>
|
||||
<!-- <div style="font-size: 1.2rem; margin: 10px 0">电子合同</div> -->
|
||||
<el-col v-if="isshow" :span="24" class="el-card pt-6">
|
||||
<!-- <el-col v-if="isshow" :span="24" class="el-card pt-6"> -->
|
||||
<el-col v-if="false" :span="24" class="el-card pt-6">
|
||||
<div class="tit">电子合同</div>
|
||||
|
||||
<el-row>
|
||||
|
@ -1,13 +1,19 @@
|
||||
<template>
|
||||
<el-card class="edit-popup">
|
||||
<el-form :rules="rules" ref="formRef" :model="formData" label-width="84px">
|
||||
<el-col class="pt-6 !border-none">
|
||||
<el-form
|
||||
class="fromtabel"
|
||||
:rules="rules"
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-col class="!border-none">
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="任务主题" prop="title">
|
||||
<el-input
|
||||
v-model="formData.title"
|
||||
placeholder="请输入任务主题"
|
||||
placeholder="请输入主题"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
@ -24,21 +30,10 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="状态" prop="state">
|
||||
<el-input
|
||||
v-model="formData.state"
|
||||
placeholder="请选择负责人"
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="任务类型" prop="type">
|
||||
<el-select v-model="formData.type" placeholder="请选择工作类型">
|
||||
<el-select v-model="formData.type" placeholder="请选择任务类型">
|
||||
<el-option
|
||||
v-for="item in datalist"
|
||||
:key="item.label"
|
||||
@ -49,23 +44,32 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row> </el-row>
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="任务描述" prop="describe">
|
||||
<editor v-model="formData.describe" :height="400" />
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item >
|
||||
<el-button @click="handleSubmit" type="primary">提交</el-button>
|
||||
<el-form-item label="状态" prop="state">
|
||||
<el-radio-group v-model="formData.state">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item label="任务描述" prop="describe">
|
||||
<el-input type="textarea" v-model="formData.describe" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-row>
|
||||
<el-col :span="18">
|
||||
<el-form-item>
|
||||
<el-button @click="handleClose(formRef)">取消</el-button>
|
||||
<el-button @click="handleSubmit" type="primary">提交</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</template>
|
||||
@ -75,10 +79,10 @@ import { ref } from "vue";
|
||||
import { dictDataLists } from "@/api/setting/dict";
|
||||
import { apiTaskAdd } from "@/api/task";
|
||||
const rules = reactive({
|
||||
title: { required: true, message: "请输入标题", trigger: "blur" },
|
||||
title: { required: true, message: "请输入主题", trigger: "blur" },
|
||||
money: { required: true, message: "请输入金额", trigger: "blur" },
|
||||
type: { required: true, message: "请输入类型", trigger: "blur" },
|
||||
state: { required: true, message: "请输入状态", trigger: "blur" },
|
||||
type: { required: true, message: "请选择任务类型", trigger: "blur" },
|
||||
state: { required: true, message: "请选择状态", trigger: "blur" },
|
||||
});
|
||||
const formData = ref({
|
||||
title: "",
|
||||
@ -97,6 +101,7 @@ const formData = ref({
|
||||
});
|
||||
|
||||
const datalist = ref([]);
|
||||
|
||||
dictDataLists({ type_id: 10 }).then((res) => {
|
||||
datalist.value = res.lists;
|
||||
});
|
||||
@ -110,6 +115,19 @@ function handleSubmit() {
|
||||
}
|
||||
});
|
||||
}
|
||||
const handleClose = (formRef) => {
|
||||
if (!formRef) return;
|
||||
formRef.resetFields();
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss"></style>
|
||||
<style scoped lang="scss">
|
||||
.fromtabel {
|
||||
.el-form-item {
|
||||
width: 50%;
|
||||
.el-select {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -8,7 +8,7 @@
|
||||
@confirm="handleSubmit"
|
||||
@close="handleClose"
|
||||
>
|
||||
<el-form ref="formRef" :model="formData" label-width="84px">
|
||||
<el-form class="formdata" ref="formRef" :model="formData" label-width="120px">
|
||||
<el-col class="pt-6 !border-none">
|
||||
<el-row>
|
||||
<el-col :span="16">
|
||||
@ -49,8 +49,9 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-col :span="14">
|
||||
<el-form-item
|
||||
style="margin-left:50px;"
|
||||
label="是否为修复BUG"
|
||||
label-width="auto"
|
||||
prop="icon"
|
||||
@ -303,3 +304,13 @@ defineExpose({
|
||||
getDetail,
|
||||
});
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.formdata{
|
||||
.el-form-item{
|
||||
.el-date-picker{
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
@ -58,7 +58,7 @@ import feedback from "@/utils/feedback";
|
||||
// import { getRoutePath } from "router";
|
||||
import EditPopup from "./edit.vue";
|
||||
import { reactive, watch } from "vue";
|
||||
|
||||
import { apiTaskList } from '@/api/task'
|
||||
const dateValue = ref(new Date());
|
||||
|
||||
watch(
|
||||
@ -68,6 +68,7 @@ watch(
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
// apiTaskList()
|
||||
|
||||
const test = (e: any) => {
|
||||
console.log(e);
|
||||
|
@ -4,11 +4,11 @@
|
||||
ref="popupRef"
|
||||
:title="popupTitle"
|
||||
:async="true"
|
||||
width="550px"
|
||||
width="500px"
|
||||
@confirm="handleSubmit"
|
||||
@close="handleClose"
|
||||
>
|
||||
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
|
||||
<el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
|
||||
<el-form-item label="创建人id" prop="create_user_id">
|
||||
<el-input v-model="formData.create_user_id" clearable placeholder="请输入创建人id" />
|
||||
</el-form-item>
|
||||
@ -22,14 +22,18 @@
|
||||
<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-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>
|
||||
</popup>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup name="taskSchedulingEdit">
|
||||
// <el-input v-model="formData.status" clearable placeholder="请输入状态" />
|
||||
import type { FormInstance } from 'element-plus'
|
||||
import Popup from '@/components/popup/index.vue'
|
||||
import { apiTaskSchedulingAdd, apiTaskSchedulingEdit, apiTaskSchedulingDetail } from '@/api/task_scheduling'
|
||||
|
@ -2,9 +2,10 @@
|
||||
<div>
|
||||
<el-card class="!border-none mb-4" shadow="never">
|
||||
<el-form
|
||||
class="mb-[-16px]"
|
||||
class="mb-[-16px] formtabel"
|
||||
:model="queryParams"
|
||||
inline
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="创建人id" prop="create_user_id">
|
||||
<el-input class="w-[280px]" v-model="queryParams.create_user_id" clearable placeholder="请输入创建人id" />
|
||||
@ -22,7 +23,7 @@
|
||||
<el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="resetPage">查询</el-button>
|
||||
<el-button class="el-btn" type="primary" @click="resetPage">查询</el-button>
|
||||
<el-button @click="resetParams">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@ -142,4 +143,15 @@ const handleDelete = async (id: number | any[]) => {
|
||||
|
||||
getLists()
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.formtabel{
|
||||
.el-form-item{
|
||||
width: 20%;
|
||||
.el-btn{
|
||||
margin-left: 100px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
@ -19,10 +19,20 @@
|
||||
<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-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-input v-model="formData.status" clearable placeholder="请输入状态" />
|
||||
<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="请输入任务描述" />
|
||||
@ -38,6 +48,7 @@ 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[]>>,
|
||||
@ -48,7 +59,7 @@ 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(() => {
|
||||
@ -65,7 +76,10 @@ const formData = reactive({
|
||||
status: '',
|
||||
content: '',
|
||||
})
|
||||
|
||||
//任务类型接口
|
||||
dictDataLists({ type_id: 10 }).then((res) => {
|
||||
datalist.value = res.lists;
|
||||
});
|
||||
|
||||
// 表单验证
|
||||
const formRules = reactive<any>({
|
||||
@ -86,7 +100,7 @@ const formRules = reactive<any>({
|
||||
}],
|
||||
status: [{
|
||||
required: true,
|
||||
message: '请输入状态',
|
||||
message: '请选择状态',
|
||||
trigger: ['blur']
|
||||
}]
|
||||
})
|
||||
|
@ -2,30 +2,37 @@
|
||||
<div>
|
||||
<el-card class="!border-none mb-4" shadow="never">
|
||||
<el-form
|
||||
class="mb-[-16px]"
|
||||
class="mb-[-16px] formtabel"
|
||||
:model="queryParams"
|
||||
inline
|
||||
>
|
||||
<el-form-item label="主题" prop="title">
|
||||
<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="创建人" prop="admin_id">
|
||||
<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="金额" prop="moeny">
|
||||
<el-form-item label-width="100px" 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 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="状态" prop="status">
|
||||
<el-form-item label-width="100px" label="状态" prop="status">
|
||||
<el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务描述" prop="content">
|
||||
<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>
|
||||
<el-button type="primary" @click="resetPage">查询</el-button>
|
||||
<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>
|
||||
@ -50,7 +57,7 @@
|
||||
<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="type_name" 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">
|
||||
@ -90,8 +97,9 @@ 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)
|
||||
|
||||
@ -122,7 +130,6 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
|
||||
fetchFun: apiTaskTemplateLists,
|
||||
params: queryParams
|
||||
})
|
||||
|
||||
// 添加
|
||||
const handleAdd = async () => {
|
||||
showEdit.value = true
|
||||
@ -144,7 +151,21 @@ const handleDelete = async (id: number | any[]) => {
|
||||
await apiTaskTemplateDelete({ id })
|
||||
getLists()
|
||||
}
|
||||
|
||||
//任务类型接口
|
||||
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>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user