From 70484577fe0eace9de50b85714481bbba7616023 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 14 Aug 2023 18:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/Taskform.vue         | 133 -------------
 src/views/task/dialog_index_man.vue |  83 --------
 src/views/task/edit.vue             | 115 -----------
 src/views/task/taskCalendar.vue     | 299 ++++++++++++++--------------
 4 files changed, 153 insertions(+), 477 deletions(-)
 delete mode 100644 src/views/task/Taskform.vue
 delete mode 100644 src/views/task/dialog_index_man.vue
 delete mode 100644 src/views/task/edit.vue

diff --git a/src/views/task/Taskform.vue b/src/views/task/Taskform.vue
deleted file mode 100644
index 5176d4c..0000000
--- a/src/views/task/Taskform.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <el-card class="edit-popup">
-    <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="请输入主题"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="18">
-            <el-form-item label="金额" prop="money">
-              <el-input
-                v-model="formData.money"
-                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-option
-                  v-for="item in datalist"
-                  :key="item.label"
-                  :value="item.id"
-                  :label="item.name"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="18">
-            <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>
-
-<script lang="ts" setup>
-import { ref } from "vue";
-import { dictDataLists } from "@/api/setting/dict";
-import { apiTaskAdd } from "@/api/task";
-const rules = reactive({
-  title: { required: true, message: "请输入主题", trigger: "blur" },
-  money: { required: true, message: "请输入金额", trigger: "blur" },
-  type: { required: true, message: "请选择任务类型", trigger: "blur" },
-  state: { required: true, message: "请选择状态", trigger: "blur" },
-});
-const formData = ref({
-  title: "",
-  money: "",
-  type: "",
-  state: "",
-  describe: "",
-  status: "",
-  template_id: "",
-  company_id: "",
-  start_time: "",
-  end_time: "",
-  director_uid: "",
-  content: "",
-  extend: "",
-});
-
-const datalist = ref([]);
-
-dictDataLists({ type_id: 10 }).then((res) => {
-  datalist.value = res.lists;
-});
-
-const formRef = ref(null);
-
-function handleSubmit() {
-  formRef.value.validate((re) => {
-    if (re) {
-      apiTaskAdd({ ...formData.value }).then((res) => {});
-    }
-  });
-}
-const handleClose = (formRef) => {
-  if (!formRef) return;
-  formRef.resetFields();
-};
-</script>
-
-<style scoped lang="scss">
-.fromtabel {
-  .el-form-item {
-    width: 50%;
-    .el-select {
-      width: 100%;
-    }
-  }
-}
-</style>
diff --git a/src/views/task/dialog_index_man.vue b/src/views/task/dialog_index_man.vue
deleted file mode 100644
index 54a25f0..0000000
--- a/src/views/task/dialog_index_man.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="人员名称" prop="name">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.name"
-                        clearable
-                        placeholder="请输入人员名称"
-                    />
-                </el-form-item>
-                <el-form-item label="请选择人员角色" prop="role_id">
-                    <el-select class="w-[280px]" v-model="queryParams.role_id">
-            <el-option label="全部" value />
-            <el-option
-              v-for="(item, index) in optionsData.role"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-                </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">
-            <div class="mt-4">
-         <el-table :data="pager.lists" @cell-click="handleCurrentChange">
-          <el-table-column label="账号" prop="account" min-width="120" />
-          <el-table-column label="名称" prop="name" min-width="100" />
-          <el-table-column label="角色" prop="role_name" min-width="100" show-tooltip-when-overflow />
-          <el-table-column label="部门" prop="dept_name" min-width="100" show-tooltip-when-overflow />
-          <el-table-column label="创建时间" prop="create_time" min-width="180" />
-          <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
-          <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
-        </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script lang="ts" setup name="taskLists">
-import { usePaging } from '@/hooks/usePaging'
-import { roleAll } from "@/api/perms/role";
-import { useDictData,useDictOptions } from '@/hooks/useDictOptions'
-import { adminLists} from "@/api/perms/admin";
-import { defineEmits } from 'vue'
-const { optionsData } = useDictOptions<{
-  role: any[];
-}>({
-  role: {
-    api: roleAll,
-  },
-});
-// 查询条件
-const queryParams = reactive({
-    name: "",
-    role_id: "",
-})
-
-// 选中数据
-const emits = defineEmits(['customEvent'])
-
-// 选中数据子父传递
-const handleCurrentChange = (value: any) => {
-    emits('customEvent', value)
-}
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: adminLists,
-    params: queryParams
-})
-
-getLists()
-</script>
diff --git a/src/views/task/edit.vue b/src/views/task/edit.vue
deleted file mode 100644
index 898ff35..0000000
--- a/src/views/task/edit.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            title="创建日程安排"
-            :async="true"
-            width="800px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form class="formdata" :model="detailsdt" label-width="120px">
-                <el-form-item class="datatime" label="时间日程范围">
-                    <el-date-picker
-                        v-model="datetime"
-                        type="datetimerange"
-                        range-separator="至"
-                        start-placeholder="开始时间"
-                        end-placeholder="结束时间"
-                    />
-                </el-form-item>
-                <el-form-item label="日程内容">
-                    <el-input v-model="detailsdt.task_info.content" disabled />
-                </el-form-item>
-                <el-form-item label="日程描述">
-                    <el-input type="textarea" v-model="detailsdt.task_info.title" disabled />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="taskEidt">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { reactive, onUpdated, type PropType } from 'vue'
-const props = defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    },
-    dateValue: {
-        type: Date,
-        default: () => null
-    },
-    detailsdata: {
-        type: Object,
-        default: {}
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-const detailsdt = ref({})
-const datetime = ref([])
-// 弹窗标题
-// const popupTitle = computed(() => {
-//   return mode.value == "edit" ? "创建日程安排" : "新增任务";
-// });
-
-onUpdated(() => {
-    watchEffect(() => {
-        detailsdt.value = props.detailsdata
-        const startTime = new Date(props.detailsdata.start_time)
-        const endTime = new Date(props.detailsdata.end_time)
-        datetime.value = [startTime, endTime]
-    })
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    title: '', //任务名称
-    type: '', //任务类型
-    start_time: '', //预计开始时间
-    end_time: '', //预计结束时间
-    check_time: '', //预计验收时间
-    content: '' //任务描述
-})
-
-// 获取详情
-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 open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-defineExpose({
-    open,
-    setFormData
-})
-</script>
-<style lang="scss" scoped>
-.formdata {
-    .el-form-item {
-        .el-date-picker {
-            width: 100%;
-        }
-    }
-}
-</style>
diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue
index 6c2f6e9..ee01cb1 100644
--- a/src/views/task/taskCalendar.vue
+++ b/src/views/task/taskCalendar.vue
@@ -1,24 +1,28 @@
 <template>
-    <div>
-        <el-card class="!border-none" v-loading="loading" shadow="never">
-            <div style="display: flex; justify-content: space-between">
-                <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
-                    <template #icon>
-                        <icon name="el-icon-Plus" />
-                    </template>
-                    新增
-                </el-button>
-                <!-- <div class="btn">
+  <div>
+    <el-card class="!border-none" v-loading="loading" shadow="never">
+      <div style="display: flex; justify-content: space-between">
+        <el-button
+          v-perms="['flow_type/add']"
+          type="primary"
+          @click="handleAdd"
+        >
+          <template #icon>
+            <icon name="el-icon-Plus" />
+          </template>
+          新增
+        </el-button>
+        <!-- <div class="btn">
           <div :class="{ active: nowType == 0 }" @click="nowType = 0">日历</div>
           <div :class="{ active: nowType == 1 }" @click="nowType = 1">列表</div>
         </div> -->
-            </div>
-            <calendar
-                :list="taskList"
-                @clickItem="clickTask"
-                @initShowDate="initShowDate"
-            ></calendar>
-            <!-- <div class="mt-4">
+      </div>
+      <calendar
+        :list="taskList"
+        @clickItem="clickTask"
+        @initShowDate="initShowDate"
+      ></calendar>
+      <!-- <div class="mt-4">
         <el-calendar v-model="dateValue">
           <template #dateCell="{ data }">
             <div style="width: 100%; height: 100%">
@@ -40,186 +44,189 @@
           </template>
         </el-calendar>
       </div>-->
-        </el-card>
+    </el-card>
 
-        <EditTowPopup
-            ref="editTowRef"
-            :task="task"
-            :type="popupType"
-            @success="loadTask"
-            @close="showEditTow = false"
-        />
-    </div>
+    <EditTowPopup
+      ref="editTowRef"
+      :task="task"
+      :type="popupType"
+      @success="loadTask"
+      @close="showEditTow = false"
+    />
+  </div>
 </template>
 
 <script lang="ts" setup name="task">
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
 // import { getRoutePath } from "router";
-import EditPopup from './edit.vue'
-import EditTowPopup from './editTow.vue'
-import { reactive, watch } from 'vue'
-import { apiTaskList, apiTaskDetails } from '@/api/task'
-import calendar from './calendar.vue'
+import EditTowPopup from "./editTow.vue";
+import { reactive, watch } from "vue";
+import { apiTaskList, apiTaskDetails } from "@/api/task";
+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: '',
-    id: 0,
-    scheduling_id: 0,
-    start_time: '',
-    status: 0,
-    template_id: 0,
-    template_name: ''
-})
-const popupType = ref('add')
+  create_user_id: 0,
+  end_time: "",
+  id: 0,
+  scheduling_id: 0,
+  start_time: "",
+  status: 0,
+  template_id: 0,
+  template_name: "",
+});
+const popupType = ref("add");
 const clickTask = (e: any) => {
-    popupType.value = 'show'
-    // task.value = e;
-    task.value = taskList.value.find((item: any) => item.id == e)
-    handleSelect()
-}
+  popupType.value = "show";
+  // task.value = e;
+  task.value = taskList.value.find((item: any) => item.id == e);
+  handleSelect();
+};
 
 // 加载
-const loading = ref(true)
+const loading = ref(true);
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const editTowRef = shallowRef<InstanceType<typeof EditPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+const editTowRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 是否显示编辑框
-const showEdit = ref(false)
-const showEditTow = ref(false)
+const showEdit = ref(false);
+const showEditTow = ref(false);
 
 // 查询条件
 const queryParams = reactive({
-    scheduling_id: '',
-    start_time: '',
-    end_time: '',
-    page_no: 1,
-    pageSize: 150
-})
+  scheduling_id: "",
+  start_time: "",
+  end_time: "",
+  page_no: 1,
+  pageSize: 150,
+});
 if (route.query.id) {
-    queryParams.scheduling_id = route.query.id.toString()
+  queryParams.scheduling_id = route.query.id.toString();
 }
-const taskList = ref<any>([])
+const taskList = ref<any>([]);
 
 // 查询
 const loadTask = async () => {
-    apiTaskList(queryParams).then((res) => {
-        taskList.value = res.lists
-        loading.value = false
-    })
-}
+  apiTaskList(queryParams).then((res) => {
+    taskList.value = res.lists;
+    loading.value = false;
+  });
+};
 
-const start_date = ref('')
-const end_date = ref('')
+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 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 taskListFilter = (e: any) => {
-    return taskList.value
-        .filter((item: any) => {
-            const now = new Date(e).getTime() / 1000
-            const start = new Date(item.start_time).getTime() / 1000
-            const end = new Date(item.end_time).getTime() / 1000
-            return now - start >= 0 && now - end <= 0
-        })
-        .slice(0, 5)
-}
+  return taskList.value
+    .filter((item: any) => {
+      const now = new Date(e).getTime() / 1000;
+      const start = new Date(item.start_time).getTime() / 1000;
+      const end = new Date(item.end_time).getTime() / 1000;
+      return now - start >= 0 && now - end <= 0;
+    })
+    .slice(0, 5);
+};
 
 // 添加
 const handleAdd = async () => {
-    popupType.value = 'add'
-    showEditTow.value = true
-    await nextTick()
-    editTowRef.value?.open('add')
-    editTowRef.value?.updatedForm()
-}
+  popupType.value = "add";
+  showEditTow.value = true;
+  await nextTick();
+  editTowRef.value?.open("add");
+  editTowRef.value?.updatedForm();
+};
 // 查询
 const handleSelect = async () => {
-    popupType.value = 'show'
-    showEditTow.value = true
-    await nextTick()
-    editTowRef.value?.open('show')
-    editTowRef.value?.updatedForm()
-}
+  popupType.value = "show";
+  showEditTow.value = true;
+  await nextTick();
+  editTowRef.value?.open("show");
+  editTowRef.value?.updatedForm();
+};
 
 // 当前选择类型
-const nowType = ref(0)
+const nowType = ref(0);
 const handleTypeClick = (e) => {
-    console.log(e)
-}
+  console.log(e);
+};
 </script>
 
 <style lang="scss">
 .is-selected {
-    color: #1989fa;
+  color: #1989fa;
 }
 .el-calendar-table .el-calendar-day {
-    min-height: 8.2rem;
-    padding: 0;
+  min-height: 8.2rem;
+  padding: 0;
 }
 .task {
-    font-size: 0.8rem;
-    /* color: #f7ba2a; */
-    color: #1989fa;
-    padding: 0 8px;
-    white-space: nowrap; /* 设置文本不换行 */
-    overflow: hidden; /* 隐藏溢出的部分 */
-    text-overflow: ellipsis; /* 在溢出的部分显示省略号 */
-    &:hover {
-        background-color: rgba($color: #f38200, $alpha: 0.7);
-        border-radius: 4px;
-        color: #fff;
-    }
+  font-size: 0.8rem;
+  /* color: #f7ba2a; */
+  color: #1989fa;
+  padding: 0 8px;
+  white-space: nowrap; /* 设置文本不换行 */
+  overflow: hidden; /* 隐藏溢出的部分 */
+  text-overflow: ellipsis; /* 在溢出的部分显示省略号 */
+  &:hover {
+    background-color: rgba($color: #f38200, $alpha: 0.7);
+    border-radius: 4px;
+    color: #fff;
+  }
 }
 .the {
-    color: #ff5100;
+  color: #ff5100;
 }
 .tow {
-    color: #f38200;
+  color: #f38200;
 }
 .fou {
-    color: red;
+  color: red;
 }
 .btn {
-    height: 30px;
-    width: 150px;
-    border: 1px solid #4a5dff;
-    border-radius: 5px;
-    overflow: hidden;
-    display: flex;
-    cursor: pointer;
-    div {
-        flex: 1;
-        text-align: center;
-        line-height: 30px;
-    }
-    .active {
-        background-color: #4a5dff;
-        color: #fff;
-    }
+  height: 30px;
+  width: 150px;
+  border: 1px solid #4a5dff;
+  border-radius: 5px;
+  overflow: hidden;
+  display: flex;
+  cursor: pointer;
+  div {
+    flex: 1;
+    text-align: center;
+    line-height: 30px;
+  }
+  .active {
+    background-color: #4a5dff;
+    color: #fff;
+  }
 }
 </style>