From dc015b2da417f869298e3893085308487e4450e0 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 7 Sep 2023 17:55:36 +0800
Subject: [PATCH] 发卡记录描述增加换班类型

---
 src/views/personal/card/index.vue |  98 +++++++++++++++++++++-----------------------------------------------------------------------------
 src/views/standard/card/index.vue | 157 ++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------
 2 files changed, 59 insertions(+), 196 deletions(-)

diff --git a/src/views/personal/card/index.vue b/src/views/personal/card/index.vue
index 0f04602..993b188 100644
--- a/src/views/personal/card/index.vue
+++ b/src/views/personal/card/index.vue
@@ -9,58 +9,23 @@
     <div class="page-content">
       <div class="answer-header">
         <div class="sel-box">
-          <el-cascader
-            @change="_QueryData(1)"
-            size="small"
-            class="sel"
-            clearable
-            placeholder="选择班级"
-            v-model="query.classId"
-            :options="gradeList"
-            :props="props"
-            :show-all-levels="false"
-          ></el-cascader>
-          <el-input
-            placeholder="请输入学生姓名"
-            v-model="query.studentName"
-            class="input-with-select"
-            @keyup.enter.native="_QueryData(2)"
-          >
-            <el-button
-              slot="append"
-              icon="el-icon-search"
-              @click="_QueryData(2)"
-            ></el-button>
+          <el-cascader @change="_QueryData(1)" size="small" class="sel" clearable placeholder="选择班级"
+            v-model="query.classId" :options="gradeList" :props="props" :show-all-levels="false"></el-cascader>
+          <el-input placeholder="请输入学生姓名" v-model="query.studentName" class="input-with-select"
+            @keyup.enter.native="_QueryData(2)">
+            <el-button slot="append" icon="el-icon-search" @click="_QueryData(2)"></el-button>
           </el-input>
-          <el-input
-            placeholder="请输入学生学号"
-            v-model="query.studentCode"
-            class="input-with-select"
-            @keyup.enter.native="_QueryData(3)"
-          >
-            <el-button
-              slot="append"
-              icon="el-icon-search"
-              @click="_QueryData(3)"
-            ></el-button>
+          <el-input placeholder="请输入学生学号" v-model="query.studentCode" class="input-with-select"
+            @keyup.enter.native="_QueryData(3)">
+            <el-button slot="append" icon="el-icon-search" @click="_QueryData(3)"></el-button>
           </el-input>
-          <el-button type="primary" round @click="_QueryData(4)"
-            >筛选</el-button
-          >
+          <el-button type="primary" round @click="_QueryData(4)">筛选</el-button>
         </div>
       </div>
-      <el-empty
-        :image-size="100"
-        v-if="!tableData.length && !loading"
-        description="暂无数据"
-      ></el-empty>
+      <el-empty :image-size="100" v-if="!tableData.length && !loading" description="暂无数据"></el-empty>
       <div v-else class="table-box" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            align="center"
-            label="答题器编码"
-            prop="clickerSn"
-          ></el-table-column>
+          <el-table-column align="center" label="答题器编码" prop="clickerSn"></el-table-column>
           <el-table-column align="center" label="班级">
             <template slot-scope="scope">
               <span v-for="item in scope.row.classList" :key="item.classCode">{{
@@ -68,48 +33,27 @@
               }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="学生姓名"
-            prop="studentName"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="学号"
-            prop="studentCode"
-          ></el-table-column>
+          <el-table-column align="center" label="学生姓名" prop="studentName"></el-table-column>
+          <el-table-column align="center" label="学号" prop="studentCode"></el-table-column>
           <el-table-column align="center" label="类型">
             <template slot-scope="scope">
               {{ scope.row.operationType == 0 ? "发卡" : "补卡" }}
-            </template></el-table-column
-          >
+            </template></el-table-column>
           <el-table-column align="center" label="描述">
             <template slot-scope="scope">
               {{
                 scope.row.operationType == 0
-                  ? "--"
-                  : scope.row.reason == 0
+                ? "--"
+                : scope.row.reason == 0
                   ? "丢失"
-                  : "损坏"
+                  : scope.row.reason == 1 ? "损坏" : "换班"
               }}
-            </template></el-table-column
-          >
-          <el-table-column
-            align="center"
-            label="操作时间"
-            prop="modifiedTime"
-          ></el-table-column>
+            </template></el-table-column>
+          <el-table-column align="center" label="操作时间" prop="modifiedTime"></el-table-column>
         </el-table>
         <div class="pagination-box">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
+          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
+            @current-change="changePage" :current-page="page" :page-size="size">
           </el-pagination>
         </div>
       </div>
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index b73c7c5..d1b5553 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -23,94 +23,44 @@
             ></el-cascader>
           </template> -->
           <template v-if="role == 'ROLE_JITUAN'">
-            <el-select
-              class="sel2"
-              v-model="query.schoolId"
-              placeholder="选择学校"
-              @change="(page = 1), _QueryData(1)"
-            >
-              <el-option
-                v-for="item in schoolList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select class="sel2" v-model="query.schoolId" placeholder="选择学校" @change="(page = 1), _QueryData(1)">
+              <el-option v-for="item in schoolList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </template>
-          <el-select
-            class="sel sel3"
-            v-model="query.operationType"
-            placeholder="选择类型"
-            @change="(page = 1), _QueryData(1)"
-          >
+          <el-select class="sel sel3" v-model="query.operationType" placeholder="选择类型"
+            @change="(page = 1), _QueryData(1)">
             <el-option label="全部" value=""></el-option>
             <el-option label="发卡" :value="0"></el-option>
             <el-option label="补卡" :value="1"></el-option>
             <el-option label="换班" :value="2"></el-option>
           </el-select>
           <div class="d1">
-            <el-date-picker
-              v-model="query.startDay"
-              type="date"
-              @change="handleChangeTimeStart"
-              placeholder="选择日期时间"
-              value-format="yyyy-MM-dd"
-            >
+            <el-date-picker v-model="query.startDay" type="date" @change="handleChangeTimeStart" placeholder="选择日期时间"
+              value-format="yyyy-MM-dd">
             </el-date-picker>
             ~
-            <el-date-picker
-              v-model="query.endDay"
-              type="date"
-              placeholder="选择日期时间"
-              @change="handleChangeTimeEnd"
-              value-format="yyyy-MM-dd"
-            >
+            <el-date-picker v-model="query.endDay" type="date" placeholder="选择日期时间" @change="handleChangeTimeEnd"
+              value-format="yyyy-MM-dd">
             </el-date-picker>
           </div>
           <template v-if="role == 'ROLE_XUEXIAO'">
-            <el-input
-              placeholder="请输入学生姓名"
-              v-model="query.studentName"
-              class="input-with-select sel"
-              @keyup.enter.native="(page = 1), _QueryData(2)"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="(page = 1), _QueryData(2)"
-              ></el-button>
+            <el-input placeholder="请输入学生姓名" v-model="query.studentName" class="input-with-select sel"
+              @keyup.enter.native="(page = 1), _QueryData(2)">
+              <el-button slot="append" icon="el-icon-search" @click="(page = 1), _QueryData(2)"></el-button>
             </el-input>
-            <el-input
-              placeholder="请输入学生学号"
-              v-model="query.studentCode"
-              class="input-with-select sel"
-              @keyup.enter.native="(page = 1), _QueryData(3)"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="(page = 1), _QueryData(3)"
-              ></el-button>
+            <el-input placeholder="请输入学生学号" v-model="query.studentCode" class="input-with-select sel"
+              @keyup.enter.native="(page = 1), _QueryData(3)">
+              <el-button slot="append" icon="el-icon-search" @click="(page = 1), _QueryData(3)"></el-button>
             </el-input>
           </template>
-          <el-button type="primary" round @click="(page = 1), _QueryData(4)"
-            >筛选</el-button
-          >
+          <el-button type="primary" round @click="(page = 1), _QueryData(4)">筛选</el-button>
         </div>
       </div>
-      <el-empty
-        :image-size="100"
-        v-if="!tableData.length && !loading"
-        description="暂无数据"
-      ></el-empty>
+      <el-empty :image-size="100" v-if="!tableData.length && !loading" description="暂无数据"></el-empty>
       <div v-else class="table-box" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            align="center"
-            label="答题器编码"
-            prop="clickerSn"
-          ></el-table-column>
+          <el-table-column align="center" label="答题器编码" prop="clickerSn"></el-table-column>
           <el-table-column align="center" label="年级">
             <template slot-scope="scope">
               <span>{{ scope.row.classList[0]?.gradeName }}</span>
@@ -118,79 +68,43 @@
           </el-table-column>
           <el-table-column align="center" label="班级">
             <template slot-scope="scope">
-              <span
-                v-for="(item, index) in scope.row.classList"
-                :key="item.classCode"
-                >{{ (index == 0 ? "" : "、") + item.className }}</span
-              >
+              <span v-for="(item, index) in scope.row.classList" :key="item.classCode">{{ (index == 0 ? "" : "、") +
+                item.className }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="学生姓名"
-            prop="studentName"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="学号"
-            prop="studentCode"
-          ></el-table-column>
+          <el-table-column align="center" label="学生姓名" prop="studentName"></el-table-column>
+          <el-table-column align="center" label="学号" prop="studentCode"></el-table-column>
           <el-table-column align="center" label="类型">
             <template slot-scope="scope">
               {{
                 scope.row.operationType == 0
-                  ? "发卡"
-                  : scope.row.operationType == 1
+                ? "发卡"
+                : scope.row.operationType == 1
                   ? "补卡"
                   : "换班"
               }}
-            </template></el-table-column
-          >
-          <el-table-column
-            align="center"
-            label="操作次数"
-            prop="operations"
-          ></el-table-column>
+            </template></el-table-column>
+          <el-table-column align="center" label="操作次数" prop="operations"></el-table-column>
           <el-table-column align="center" label="描述">
             <template slot-scope="scope">
               {{
                 scope.row.operationType == 0
-                  ? "--"
-                  : scope.row.reason == 0
+                ? "--"
+                : scope.row.reason == 0
                   ? "丢失"
-                  : "损坏"
+                  : scope.row.reason == 1 ? "损坏" : "换班"
               }}
-            </template></el-table-column
-          >
-          <el-table-column
-            align="center"
-            label="操作时间"
-            prop="modifiedTime"
-            width="160"
-          ></el-table-column>
+            </template></el-table-column>
+          <el-table-column align="center" label="操作时间" prop="modifiedTime" width="160"></el-table-column>
         </el-table>
         <div class="pagination-box">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
+          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
+            @current-change="changePage" :current-page="page" :page-size="size">
           </el-pagination>
         </div>
       </div>
       <p class="down" v-if="tableData.length">
-        <el-button
-          type="primary"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          @click="downExl"
-          >导出报表</el-button
-        >
+        <el-button type="primary" plain round icon="fa fa-cloud-download" @click="downExl">导出报表</el-button>
       </p>
     </div>
   </div>
@@ -402,22 +316,27 @@ export default {
 .table-box {
   padding: 0 20px;
 }
+
 .down {
   padding: 16px 20px;
 }
+
 .answer-header {
   .sel-box {
     .sel {
       margin-right: 20px;
       min-width: 120px;
     }
+
     .sel2 {
       width: 200px;
       margin-right: 20px;
     }
+
     .sel3 {
       min-width: 80px;
     }
+
     .d1 {
       margin-right: 20px;
     }
--
libgit2 0.21.4