diff --git a/src/api/task.ts b/src/api/task.ts index 200b2c9..9e90a1f 100644 --- a/src/api/task.ts +++ b/src/api/task.ts @@ -17,5 +17,5 @@ export function apiTaskAdd(params: any) { } //任务日程-列表 export function apiTaskList(params: any) { - return request.get({ url: "/task_scheduling.task_scheduling/lists", params }); -} + return request.get({ url: "/task_scheduling_plan.task_scheduling_plan/lists", params }); +} \ No newline at end of file diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue index 44e50b1..506037e 100644 --- a/src/views/contract/contractDetil.vue +++ b/src/views/contract/contractDetil.vue @@ -7,7 +7,7 @@ :inline="true" ref="formRef" :model="compeny" - label-width="90px" + label-width="91.5px" :rules="formRules" class="select" > @@ -21,6 +21,9 @@ placeholder="请输入社会代码" /> + + + @@ -90,7 +93,7 @@ :inline="true" ref="formRef" :model="compenyB" - label-width="90px" + label-width="91.5px" :rules="formRules" class="select" > @@ -113,6 +116,9 @@ + + + diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue index a3d493a..74e91e4 100644 --- a/src/views/task/taskCalendar.vue +++ b/src/views/task/taskCalendar.vue @@ -18,6 +18,7 @@ {{ data.day.split("-").slice(1).join("-") }}

+
{{dateNow(data.day)}}
{{ item.title }} @@ -61,14 +61,14 @@ import { reactive, watch } from "vue"; import { apiTaskList } from '@/api/task' const dateValue = ref(new Date()); -watch( - () => dateValue, - (newValue, oldValue) => { - initShowDate(timeFormat(newValue.value.getTime())); +watch(() => dateValue,(newValue, oldValue) => { + initShowDate(timeFormat(newValue.value.getTime())); + console.log(taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime()))); + }, { deep: true } ); -// apiTaskList() + // 加载 const loading = ref(true); @@ -81,7 +81,6 @@ const showEdit = ref(false); const queryParams = reactive({ start_time: "", end_time: "", - day: 1, page_no: 1, pageSize: 150, }); @@ -92,6 +91,9 @@ const taskList = ref([]); const loadTask = async () => { // let res: any = await apiTaskIndex(queryParams); // taskList.value = res.lists; + apiTaskList(queryParams).then((res)=>{ + taskList.value = res.lists + }) loading.value = false; }; @@ -121,6 +123,11 @@ const initShowDate = (dateStr = "") => { }; initShowDate(); +const dateNow = (day)=>{ + return taskList.value.find((item)=>item.start_time.split(' ')[0]==day)?.template_name; +} + + // 获取字典数据 // const { dictData } = useDictData("");