diff --git a/src/App.vue b/src/App.vue index 38e4ae74..aa73d1a9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.1.8------------"); +console.log("版本2.1.9------------"); // 监听关闭浏览器 let time1 = ref(0); diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue index 7a6c627b..daa2ce21 100644 --- a/src/components/common/BaseTable.vue +++ b/src/components/common/BaseTable.vue @@ -12,8 +12,9 @@ /> diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index c945a727..10ab7d37 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -136,13 +136,14 @@ import { defineEmits, defineProps, ref } from "vue"; import { Form, message } from "ant-design-vue"; import dayjs from "dayjs"; +import {useResetRef} from "@/utils/useCommon"; const props = defineProps({ type: Number, taskList: [] }) const visible = ref(false) -const formData = ref({ +const formData = useResetRef({ activityName: '', activityNotice: '', activityStartTime: '', @@ -195,22 +196,14 @@ const rulesRef = ref({ ], }); -const { resetFields, validate } = Form.useForm(formData, rulesRef); +const { validate } = Form.useForm(formData, rulesRef); const closeDrawer = () => { visible.value = false taskIndex.value = -1 dateTime.value = [] - resetFields() + formData.reset() }; -/** -const range = (start, end) => { - const result = []; - for (let i = start; i < end; i++) { - result.push(i); - } - return result; -};*/ function timeChange(time, timeStr) { formData.value.activityStartTime = timeStr[0] @@ -220,14 +213,7 @@ function timeChange(time, timeStr) { const disabledDate = (current) => { return current && current < dayjs().startOf('day'); }; -/** -const disabledRangeTime = () => ({ - // disabledHours: () => range(0, 24).splice(4, 20), - disabledMinutes: () => range(30, 60), - disabledSeconds: () => [55, 56], -}); -*/ async function confirm() { // debugger await validate().catch(({ errorFields }) => { diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index ce744440..e0d6545e 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -120,6 +120,7 @@ import { computed, defineEmits, defineProps, ref, watch } from "vue"; import { useBoeApiPage } from "@/api/request"; import { CASE_PAGE } from "@/api/ThirdApi"; import { message } from "ant-design-vue"; +import {useResetRef} from "@/utils/useCommon"; const props = defineProps({ type: Number, @@ -144,14 +145,13 @@ const columns = ref([ align: "center", }, ]); -const initParams = { +const params = useResetRef({ keyWord: "", authorName: "", pageIndex: 1, pageSize: 10, orderAsc: true, -}; -const params = ref(initParams); +}); const rowSelectKeys = ref([]); const selectsData = ref([]); @@ -221,9 +221,7 @@ function search() { function reset() { rowSelectKeys.value = []; selectsData.value = []; - params.value.pageIndex = 1; - params.value.keyWord = ""; - params.value.authorName = ""; + params.reset() fetch(); } @@ -258,7 +256,6 @@ function confirm() { } let selectedRows = ref(null); function openDrawer(i, row) { - console.log("iiiiiiiii", i, row); row && (rowSelectKeys.value = [row.info]); row && (selectsData.value = [{ title: row.name, id: row.courseId }]); i >= 0 && (taskIndex.value = i); diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 0aebf024..eccc791a 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -80,13 +80,14 @@