zhangjie hace 1 año
padre
commit
978944a984

+ 12 - 10
src/components/common/select-type-user/index.vue

@@ -53,21 +53,23 @@ const onChange = () => {
   emit('change', isMultiple.value ? selectedData : selectedData[0]);
 };
 
-onMounted(() => {
-  search();
+onMounted(async () => {
+  await search();
+  updateSelected(props.modelValue);
 });
 
+const updateSelected = (val) => {
+  if (optionList.value.filter((item) => val === item.id).length !== 0) {
+    selected.value = val;
+  } else {
+    selected.value = null;
+  }
+};
+
 watch(
   () => props.modelValue,
   (val) => {
-    if (optionList.value.filter((item) => val === item.id).length !== 0) {
-      selected.value = val;
-    } else {
-      selected.value = null;
-    }
-  },
-  {
-    immediate: true,
+    updateSelected(val);
   }
 );
 watch(

+ 3 - 6
src/views/service-unit/dispatch/dispatch-manage/add-dispatch-dialog.vue

@@ -63,7 +63,6 @@
           <t-form-item label="考试开始时间">
             <t-date-picker
               v-model="formData.examStartTime"
-              :disable-date="{ after: formData.examEndTime || undefined }"
               value-type="time-stamp"
               enable-time-picker
               format="YYYY-MM-DD HH:mm"
@@ -75,7 +74,6 @@
           <t-form-item label="考试结束时间">
             <t-date-picker
               v-model="formData.examEndTime"
-              :disable-date="{ before: formData.examStartTime || undefined }"
               value-type="time-stamp"
               enable-time-picker
               format="YYYY-MM-DD HH:mm"
@@ -228,13 +226,12 @@ const customTypeChange = () => {
 };
 
 const save = async () => {
-  const valid = await formRef.value.validate();
-  if (valid !== true) return;
-
   if (formData.examStartTime > formData.examEndTime) {
-    MessagePlugin.success('考试开始时间不得迟于考试结束时间');
+    MessagePlugin.error('考试开始时间不得迟于考试结束时间');
     return;
   }
+  const valid = await formRef.value.validate();
+  if (valid !== true) return;
 
   const res = await dispatchEditApi(formData).catch(() => {});
   if (!res) return;