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 @@