shmily1213 1 месяц назад
Родитель
Сommit
4fcd503264

+ 0 - 1
back-ui/src/hooks/useSchool.js

@@ -127,7 +127,6 @@ const useSchool = (options = {}) => {
         selectedClass.value = null;
         classList.value = [];
       }
-      console.log(newVal, 222)
       if (newVal !== null) {
         if (loadClass) {
           getClassList();

+ 0 - 2
back-ui/src/views/dz/cards/components/DirectionDialog.vue

@@ -82,7 +82,6 @@ const getList = () => {
   getUniversityList(queryParams.value).then(res => {
     tableData.value = res.rows;
     total.value = res.total;
-    console.log(res)
   }).finally(() => {
     univerityLoading.value = false;
   })
@@ -110,7 +109,6 @@ const handleSelectionChange = (selection, row) => {
       majorAncestors: major.ancestors
     });
   });
-  console.log(selectedList.value, 'selectedList')
 }
 
 const modalRef = ref(null);

+ 4 - 0
back-ui/src/views/dz/cards/components/EditDialog.vue

@@ -206,6 +206,10 @@ const getUserInfo = (cardInfo) => {
       selectedArea.value = area.areaId;
     }
     selectedExamType.value = res.data.examType;
+    selectedCampus.value = res.data.campusSchoolId;
+    selectedCampusClass.value = res.data.campusClassId;
+    selectedSchool.value = res.data.schoolId;
+    selectedClass.value = res.data.classId;
   })
 }
 

+ 6 - 10
back-ui/src/views/dz/cards/components/OpenDialog.vue

@@ -13,8 +13,8 @@
         <ie-agent-select v-model="form.agentId" class="w-[350px]!" filterable />
       </el-form-item>
       <el-form-item label="省份" prop="provinceId" required>
-        <ie-select v-model="selectedArea" :options="areaList" label-key="areaName" value-key="areaId" class="w-[350px]!"
-          clearable />
+        <ie-select v-model="selectedArea" :options="areaList" label-key="areaName" value-key="areaId"
+          class="w-[350px]!" />
       </el-form-item>
       <el-form-item label="学校" prop="schoolId" required>
         <ie-select v-model="selectedSchool" :options="schoolList" label-key="name" value-key="id" filterable
@@ -30,7 +30,7 @@ import IeSelect from '@/components/IeSelect/index.vue';
 import IeAgentSelect from '@/components/IeAgentSelect/index.vue';
 import IeInstitutionSelect from '@/components/IeInstitutionSelect/index.vue';
 import { requestOpenCard } from '@/api/dz/cards';
-import { getCurrentInstance } from 'vue';
+import { getCurrentInstance, watchEffect } from 'vue';
 
 const { proxy } = getCurrentInstance();
 
@@ -62,14 +62,10 @@ const validateCardNoRange = (rule, value, callback) => {
   }
 }
 
-watch([() => form.value.begin, () => form.value.end], () => {
+watchEffect(() => {
   form.value.cardNoRange = `${form.value.begin}-${form.value.end}`;
-})
-watch(() => selectedArea.value, (val) => {
-  form.value.provinceId = val;
-})
-watch(() => selectedSchool.value, (val) => {
-  form.value.schoolId = val;
+  form.value.provinceId = selectedArea.value;
+  form.value.schoolId = selectedSchool.value;
 })
 
 const rules = ref({