From d7862aa6b96bd7c09e6251b5b3f351e6d43d1075 Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Mon, 7 Jul 2025 15:42:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyComponents/ChooseUser/index.vue | 11 +- .../MyComponents/ChooseXs/index.vue} | 0 src/components/aboutTable/Search.vue | 15 + .../MeetingRoom/components/detailForm.vue | 120 +++++++- .../backOfficeSystem/MeetingRoom/index.vue | 263 +++++++----------- .../components/detailForm.vue | 2 +- 6 files changed, 246 insertions(+), 165 deletions(-) rename src/{views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/xslist.vue => components/MyComponents/ChooseXs/index.vue} (100%) diff --git a/src/components/MyComponents/ChooseUser/index.vue b/src/components/MyComponents/ChooseUser/index.vue index 8311e04..53c8b11 100644 --- a/src/components/MyComponents/ChooseUser/index.vue +++ b/src/components/MyComponents/ChooseUser/index.vue @@ -146,7 +146,16 @@ const form = ref({}); const tableData = ref([]); const emits = defineEmits(["update:modelValue", "choosedUsers"]); onMounted(() => { - handleFilter(); +}); + +watch(()=>props.modelValue, (val) => { + if (val) { + nextTick(() => { + getListData(); + }); + } +},{ + immediate: true }); const closed = () => { emits("update:modelValue", false); diff --git a/src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/xslist.vue b/src/components/MyComponents/ChooseXs/index.vue similarity index 100% rename from src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/xslist.vue rename to src/components/MyComponents/ChooseXs/index.vue diff --git a/src/components/aboutTable/Search.vue b/src/components/aboutTable/Search.vue index af70fc6..ca2e351 100644 --- a/src/components/aboutTable/Search.vue +++ b/src/components/aboutTable/Search.vue @@ -42,6 +42,17 @@ :disabledDate="disabledDate" value-format="YYYY-MM-DD" /> + { } } } + + ::v-deep .el-date-editor .el-range-separator{ + color: #333; +} diff --git a/src/views/backOfficeSystem/MeetingRoom/components/detailForm.vue b/src/views/backOfficeSystem/MeetingRoom/components/detailForm.vue index 330b67a..3a68995 100644 --- a/src/views/backOfficeSystem/MeetingRoom/components/detailForm.vue +++ b/src/views/backOfficeSystem/MeetingRoom/components/detailForm.vue @@ -1,13 +1,119 @@ - - \ No newline at end of file + diff --git a/src/views/backOfficeSystem/MeetingRoom/index.vue b/src/views/backOfficeSystem/MeetingRoom/index.vue index 5ceffbd..0e614ee 100644 --- a/src/views/backOfficeSystem/MeetingRoom/index.vue +++ b/src/views/backOfficeSystem/MeetingRoom/index.vue @@ -1,29 +1,27 @@