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

+ 3 - 3
back-ui/src/hooks/useSchool.js

@@ -56,7 +56,7 @@ const useSchool = (options = {}) => {
       ? selectedArea.value?.[selectedArea.value.length - 1]
       : selectedArea.value;
     const res = await listSchool({
-      pro: areaId,
+      areaCode: areaId,
       pageNo: 1,
       pageSize: 100000,
     });
@@ -80,7 +80,7 @@ const useSchool = (options = {}) => {
       ? selectedArea.value?.[selectedArea.value.length - 1]
       : selectedArea.value;
     const res = await listCampus({
-      pro: areaId,
+      areaCode: areaId,
     });
     campusList.value = res.rows;
     return res.rows;
@@ -199,7 +199,7 @@ const useSchool = (options = {}) => {
     schoolList,
     selectedSchool,
     selectedAssignSchool,
-    
+
     classList,
     selectedClass,
     getClassList,

+ 3 - 3
back-ui/src/views/dz/cards/components/CardTable.vue

@@ -93,7 +93,7 @@
         </el-table-column>
         <el-table-column label="结算状态" prop="isSettlement" align="center" min-width="100">
           <template #default="scope">
-            <dict-tag :options="bool_values" :value="scope.row.isSettlement" />
+            <dict-tag :options="card_settlement_status" :value="scope.row.isSettlement" />
           </template>
         </el-table-column>
         <el-table-column label="分配时间" prop="distributeTime" align="center" min-width="120">
@@ -129,8 +129,8 @@
 import DictTag from '@/components/DictTag/index.vue';
 import { getCurrentInstance } from 'vue';
 const { proxy } = getCurrentInstance();
-const { card_type, exam_type, card_distribute_status, card_status, bool_values, card_time_status, card_pay_status } = 
-proxy.useDict("card_type", "exam_type", "card_distribute_status", "card_status", "bool_values", "card_time_status", "card_pay_status");
+const { card_type, exam_type, card_distribute_status, card_status, card_settlement_status, card_time_status, card_pay_status } = 
+proxy.useDict("card_type", "exam_type", "card_distribute_status", "card_status", "card_settlement_status", "card_time_status", "card_pay_status");
 const props = defineProps({
   data: {
     type: Array,

+ 3 - 4
back-ui/src/views/dz/cards/index.vue

@@ -66,7 +66,7 @@
         <ie-select v-model="queryParams.timeStatus" :options="card_time_status" class="w-[180px]!" clearable />
       </el-form-item>
       <el-form-item label="结算状态" prop="isSettlement">
-        <ie-select v-model="queryParams.isSettlement" :options="bool_values" class="w-[180px]!" clearable />
+        <ie-select v-model="queryParams.isSettlement" :options="card_settlement_status" class="w-[180px]!" clearable />
       </el-form-item>
       <el-form-item label="缴费状态" prop="payStatus">
         <ie-select v-model="queryParams.payStatus" :options="card_pay_status" class="w-[180px]!" clearable />
@@ -176,13 +176,12 @@ const {
 } = useSchool({ loadCampus: true, loadCampusClass: true, loadClass: true });
 const {
   exam_type,
-  card_status,
   card_distribute_status,
   card_time_status,
-  bool_values,
+  card_settlement_status,
   card_pay_status,
   card_type,
-} = proxy.useDict("exam_type", "card_status", "card_distribute_status", "card_time_status", "bool_values", "card_pay_status", "card_type");
+} = proxy.useDict("exam_type", "card_distribute_status", "card_time_status", "card_settlement_status", "card_pay_status", "card_type");
 const cascaderProps = {
   label: "areaName",
   value: "areaId",