shmily1213 1 месяц назад
Родитель
Сommit
221e409e01
1 измененных файлов с 22 добавлено и 18 удалено
  1. 22 18
      back-ui/src/views/dz/cards/index.vue

+ 22 - 18
back-ui/src/views/dz/cards/index.vue

@@ -6,33 +6,33 @@
       </el-form-item>
       <el-form-item label="分配学校" prop="assignSchoolId">
         <ie-select v-model="selectedAssignSchool" :options="schoolList" label-key="name" value-key="id" filterable
-          class="w-[180px]!" />
+          clearable class="w-[180px]!" />
       </el-form-item>
       <el-form-item label="注册学校" prop="schoolId">
-        <ie-select v-model="selectedSchool" :options="schoolList" label-key="name" value-key="id" filterable
+        <ie-select v-model="selectedSchool" :options="schoolList" label-key="name" value-key="id" filterable clearable
           class="w-[180px]!" />
       </el-form-item>
       <el-form-item label="注册班级" prop="classId">
         <ie-select v-model="selectedClass" :options="classList" label-key="name" value-key="classId" filterable
-          class="w-[180px]!" />
+          clearable class="w-[180px]!" />
       </el-form-item>
       <el-form-item label="培训学校" prop="campusId">
-        <ie-select v-model="selectedCampus" :options="campusList" label-key="name" value-key="id" filterable
+        <ie-select v-model="selectedCampus" :options="campusList" label-key="name" value-key="id" filterable clearable
           class="w-[180px]!" @change="handleCampusChange" />
       </el-form-item>
       <el-form-item label="培训班级" prop="campusClassId">
         <ie-select v-model="selectedCampusClass" :options="campusClassList" label-key="name" value-key="classId"
-          filterable class="w-[180px]!" />
+          clearable filterable class="w-[180px]!" />
       </el-form-item>
       <el-form-item label="代理商" prop="agentId">
-        <ie-agent-select v-model="queryParams.agentId" class="w-[180px]!" filterable />
+        <ie-agent-select v-model="queryParams.agentId" class="w-[180px]!" filterable clearable />
       </el-form-item>
       <el-form-item label="姓名" prop="nickName">
         <el-input v-model="queryParams.nickName" type="text" class="w-[180px]!" placeholder="请输入姓名" clearable />
       </el-form-item>
       <el-form-item label="手机" prop="phonenumber">
-        <el-input v-model="queryParams.phonenumber" type="text" v-number maxlength="11" class="w-[180px]!" placeholder="请输入手机号"
-          clearable />
+        <el-input v-model="queryParams.phonenumber" type="text" v-number maxlength="11" class="w-[180px]!"
+          placeholder="请输入手机号" clearable />
       </el-form-item>
       <el-form-item label="卡号段" prop="begin">
         <div class="flex items-center gap-x-3">
@@ -41,9 +41,9 @@
           <el-input v-model="queryParams.end" type="text" maxlength="11" class="w-[180px]!" placeholder="请输入结束卡号" />
         </div>
       </el-form-item>
-      <el-form-item label="卡分配日期" prop="days">
-        <el-date-picker v-model="queryParams.days" type="daterange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" class="w-[282px]!" />
+      <el-form-item label="卡分配日期" prop="assignTimeRange">
+        <el-date-picker v-model="queryParams.assignTimeRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+          end-placeholder="结束日期" value-format="YYYY-MM-DD" class="w-[282px]!" />
       </el-form-item>
       <el-form-item label="平台机构" prop="deptId">
         <ie-institution-select v-model="queryParams.deptId" class="w-[180px]!" clearable />
@@ -51,8 +51,8 @@
       <el-form-item label="考生类型" prop="examType">
         <ie-select v-model="queryParams.examType" :options="exam_type" class="w-[180px]!" clearable />
       </el-form-item>
-      <el-form-item label="卡类型" prop="cardType">
-        <ie-select v-model="queryParams.cardType" :options="card_type" class="w-[180px]!" clearable />
+      <el-form-item label="卡类型" prop="type">
+        <ie-select v-model="queryParams.type" :options="card_type" class="w-[180px]!" clearable />
       </el-form-item>
       <el-form-item label="分配状态" prop="distributeStatus">
         <ie-select v-model="queryParams.distributeStatus" :options="card_distribute_status" class="w-[180px]!"
@@ -170,7 +170,7 @@ const {
   selectedCampus,
   campusClassList,
   selectedCampusClass,
-} = useSchool({ loadCampus: true, loadClass: true });
+} = useSchool({ loadCampus: true, loadCampusClass: true, loadClass: true });
 const {
   exam_type,
   card_status,
@@ -227,10 +227,14 @@ const resetQuery = () => {
 }
 
 const getList = () => {
-  loading.value = true;
-  listCards({
-    ...queryParams.value
-  }).then(res => {
+  const params = {
+    ...queryParams.value,
+    assignTimeBegin: queryParams.value.assignTimeRange?.[0],
+    assignTimeEnd: queryParams.value.assignTimeRange?.[1],
+  };
+  delete params.assignTimeRange;
+  console.log(params)
+  listCards(params).then(res => {
     cardList.value = res.rows;
     total.value = res.total;
   }).finally(() => {