bugfix

back-ui/src/api/dz/cards.js

@@ -59,11 +59,29 @@ export function issueCard(institutionId, type, count) {
 }
 
 // 分配卡
-export function assignCard(params) {
+export function assignCard(
+  cardType,
+  agentId,
+  begin,
+  end,
+  location,
+  examType,
+  schoolId,
+  days
+) {
   return request({
     url: "/dz/cards/assignCard",
     method: "post",
-    params,
+    params: {
+      cardType,
+      agentId,
+      begin,
+      end,
+      location,
+      examType,
+      schoolId,
+      days,
+    },
   });
 }
 

back-ui/src/hooks/useSchool.js

@@ -171,6 +171,7 @@ const useSchool = (options = {}) => {
 
   const reset = () => {
     area.selected = Array.isArray(area.selected) ? [] : null;
+    area.selectedItem = null;
     selectedSchool.value = null;
     selectedAssignSchool.value = null;
     selectedClass.value = null;
@@ -197,8 +198,7 @@ const useSchool = (options = {}) => {
     reset,
 
     area,
-    // selectedArea,
-    // getAreaList,
+    getAreaList,
 
     schoolList,
     selectedSchool,

back-ui/src/views/dz/cards/components/AssignDialog.vue

@@ -131,17 +131,7 @@ const handleConfirm = () => {
     if (valid) {
       const { cardType, agentId, begin, end, location, assignExamType, schoolId, days } = form.value;
       modalRef.value.showLoading()
-      const params = {
-        cardType,
-        agentId,
-        begin,
-        end,
-        location,
-        examType: assignExamType,
-        schoolId,
-        days
-      }
-      assignCard(params).then(res => {
+      assignCard(cardType, agentId, begin, end, location, assignExamType, schoolId, days).then(res => {
         proxy.$modal.msgSuccess('分配卡成功')
         close();
         setTimeout(() => {

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

@@ -15,7 +15,7 @@
 
         <el-col :span="12">
           <el-form-item label="省份" prop="provinceId">
-            <ie-select v-model="selectedArea" :options="areaList" label-key="areaName" value-key="areaId" />
+            <ie-select v-model="area.selected" v-model:selectedItem="area.selectedItem" :options="area.list" label-key="areaName" value-key="areaId" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -134,8 +134,7 @@ const form = ref({
 
 const {
   reset,
-  areaList,
-  selectedArea,
+  area,
   getAreaList,
   schoolList,
   selectedSchool,
@@ -201,9 +200,12 @@ const getUserInfo = (cardInfo) => {
       directionStudy: res.data.directionStudy || []
     };
     const areaList = await getAreaList();
-    const area = areaList.find(item => item.areaName === location + '省');
-    if (area) {
-      selectedArea.value = area.areaId;
+    // 只有名称，没有 id，所以需要手动查找赋值
+    const targetArea = areaList.find(item => item.areaName === location + '省');
+    if (targetArea) {
+      area.list = areaList;
+      area.selected = targetArea.areaId;
+      area.selectedItem = targetArea;
     }
     selectedExamType.value = res.data.examType;
     selectedCampus.value = res.data.campusSchoolId;

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

@@ -38,13 +38,10 @@ const {
   init,
   reset,
   area,
-  // areaList,
-  // selectedArea,
   schoolList,
   selectedSchool,
 } = useSchool({ autoLoad: false, loadExamType: true });
 
-const visible = ref(false);
 const modalRef = ref(null);
 const formRef = ref(null);
 const form = ref({