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

src/views/task/taskCalendar.vue

@@ -2,11 +2,7 @@
     <div>
         <el-card class="!border-none" v-loading="loading" shadow="never">
             <div style="display: flex; justify-content: space-between">
-        <el-button
+                <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
-          v-perms="['flow_type/add']"
-          type="primary"
-          @click="handleAdd"
-        >
                     <template #icon>
                         <icon name="el-icon-Plus" />
                     </template>
@@ -57,125 +53,124 @@
 </template>
 
 <script lang="ts" setup name="task">
-import { timeFormat } from "@/utils/util";
+import { timeFormat } from '@/utils/util'
-import feedback from "@/utils/feedback";
+import feedback from '@/utils/feedback'
 // import { getRoutePath } from "router";
-import EditPopup from "./edit.vue";
+import EditPopup from './edit.vue'
-import EditTowPopup from "./editTow.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 calendar from "./calendar.vue";
+import calendar from './calendar.vue'
 
-const route = useRoute();
+const route = useRoute()
 
-const dateValue = ref(new Date());
+const dateValue = ref(new Date())
 
 // 当前点击的任务
 const task = ref({
     create_user_id: 0,
-  end_time: "",
+    end_time: '',
     id: 0,
     scheduling_id: 0,
-  start_time: "",
+    start_time: '',
     status: 0,
     template_id: 0,
-  template_name: "",
+    template_name: ''
-});
+})
-const popupType = ref("add");
+const popupType = ref('add')
 const clickTask = (e: any) => {
-  popupType.value = "show";
+    popupType.value = 'show'
     // task.value = e;
-  task.value = taskList.value.find((item: any) => item.id == e);
+    task.value = taskList.value.find((item: any) => item.id == e)
-  handleSelect();
+    handleSelect()
-};
+}
 
 // 加载
-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 editTowRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
-const showEdit = ref(false);
+const showEdit = ref(false)
-const showEditTow = ref(false);
+const showEditTow = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-  start_time: "",
+    scheduling_id: '',
-  end_time: "",
+    start_time: '',
+    end_time: '',
     page_no: 1,
-  pageSize: 150,
+    pageSize: 150
-});
+})
-
+if (route.query.id) {
-const taskList = ref<any>([]);
+    queryParams.scheduling_id = route.query.id.toString()
+}
+const taskList = ref<any>([])
 
 // 查询
 const loadTask = async () => {
     apiTaskList(queryParams).then((res) => {
-    taskList.value = res.lists;
+        taskList.value = res.lists
-    loading.value = false;
+        loading.value = false
-  });
+    })
-};
+}
 
-const start_date = ref("");
+const start_date = ref('')
-const end_date = ref("");
+const end_date = ref('')
 // 计算当前显示的第一天和最后一天
-const initShowDate = (dateStr = "") => {
+const initShowDate = (dateStr = '') => {
-  const currentDate = dateStr ? new Date(dateStr) : new Date();
+    const currentDate = dateStr ? new Date(dateStr) : new Date()
-  const currentYear = currentDate.getFullYear();
+    const currentYear = currentDate.getFullYear()
-  const currentMonth = currentDate.getMonth();
+    const currentMonth = currentDate.getMonth()
-  const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay(); //获取第一天星期
+    const lastDay = new Date(currentYear, currentMonth + 1, 0).getDay() //获取第一天星期
-  const startDay = new Date(currentYear, currentMonth, 1).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(
+    start_date.value = timeFormat(new Date(currentYear, currentMonth, 1 - startDay).getTime()) //获取第一天时间
-    new Date(currentYear, currentMonth, 1 - startDay).getTime()
+    end_date.value = timeFormat(new Date(currentYear, currentMonth + 1, 6 - lastDay).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.start_time = start_date.value
-    queryParams.end_time = end_date.value;
+        queryParams.end_time = end_date.value
-    loading.value = true;
+        loading.value = true
-    loadTask();
+        loadTask()
     }
-};
+}
-initShowDate();
+initShowDate()
 
 // 过滤的任务列表
 const taskListFilter = (e: any) => {
     return taskList.value
         .filter((item: any) => {
-      let now = new Date(e).getTime() / 1000;
+            const now = new Date(e).getTime() / 1000
-      let start = new Date(item.start_time).getTime() / 1000;
+            const start = new Date(item.start_time).getTime() / 1000
-      let end = new Date(item.end_time).getTime() / 1000;
+            const end = new Date(item.end_time).getTime() / 1000
-      return now - start >= 0 && now - end <= 0;
+            return now - start >= 0 && now - end <= 0
         })
-    .slice(0, 5);
+        .slice(0, 5)
-};
+}
 
 // 添加
 const handleAdd = async () => {
-  popupType.value = "add";
+    popupType.value = 'add'
-  showEditTow.value = true;
+    showEditTow.value = true
-  await nextTick();
+    await nextTick()
-  editTowRef.value?.open("add");
+    editTowRef.value?.open('add')
-  editTowRef.value?.updatedForm();
+    editTowRef.value?.updatedForm()
-};
+}
 // 查询
 const handleSelect = async () => {
-  popupType.value = "show";
+    popupType.value = 'show'
-  showEditTow.value = true;
+    showEditTow.value = true
-  await nextTick();
+    await nextTick()
-  editTowRef.value?.open("show");
+    editTowRef.value?.open('show')
-  editTowRef.value?.updatedForm();
+    editTowRef.value?.updatedForm()
-};
+}
 
 // 当前选择类型
-const nowType = ref(0);
+const nowType = ref(0)
 const handleTypeClick = (e) => {
-  console.log(e);
+    console.log(e)
-};
+}
 </script>
 
 <style lang="scss">