zhangjie 5 жил өмнө
parent
commit
646151b296

+ 6 - 3
src/assets/styles/card-preview.scss

@@ -461,7 +461,8 @@
           line-height: 1;
           text-align: center;
           color: #666;
-          border: 1px solid #555;
+          // border-rect
+          border: 1px solid #000;
         }
       }
       .stdno-auto {
@@ -629,7 +630,8 @@
         display: inline-block;
         width: 30px;
         height: 14px;
-        border: 1px solid #555;
+        // border-rect
+        border: 1px solid #000;
         font-size: 10px;
         text-align: center;
         line-height: 1;
@@ -896,7 +898,8 @@
     text-align: center;
     font-size: 10px;
     line-height: 1;
-    border: 1px solid #555;
+    // border-rect
+    border: 1px solid #000;
     color: #666;
     box-sizing: border-box;
 

+ 6 - 3
src/constants/enumerate.js

@@ -12,17 +12,20 @@ export const GENDER_TYPE = {
 // 打印状态
 export const PRINT_STATUS = {
   0: "未打印",
-  1: "已打印"
+  1: "打印中",
+  2: "已打印",
+  9: "无"
 };
 // 撤回状态
 export const REVOKE_STATUS = {
   0: "待确认",
-  1: "无"
+  9: "无"
 };
 // 审核状态
 export const AUDITING_STATUS = {
   0: "未审核",
-  1: "已审核"
+  1: "已审核",
+  9: "无"
 };
 
 export const CARD_BUSINESS_FIELDS = {

+ 3 - 3
src/modules/card/previewTemp.js

@@ -523,7 +523,7 @@ const css =
     line-height: 1;\
     text-align: center;\
     color: #666;\
-    border: 1px solid #555;\
+    border: 1px solid #000;\
   }\
   .card-head-body .head-stdno .stdno-auto-barcode {\
     height: 80px;\
@@ -664,7 +664,7 @@ const css =
     display: inline-block;\
     width: 30px;\
     height: 14px;\
-    border: 1px solid #555;\
+    border: 1px solid #000;\
     font-size: 10px;\
     text-align: center;\
     line-height: 1;\
@@ -899,7 +899,7 @@ const css =
     text-align: center;\
     font-size: 10px;\
     line-height: 1;\
-    border: 1px solid #555;\
+    border: 1px solid #000;\
     color: #666;\
     -webkit-box-sizing: border-box;\
     box-sizing: border-box;\

+ 4 - 2
src/modules/exam-center/views/CardManage.vue

@@ -17,9 +17,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="印时间:">
+        <el-form-item label="印时间:">
           <el-date-picker
             v-model="filter.printTime"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
             type="date"
             placeholder="请选择日期"
           >
@@ -54,7 +56,7 @@
         stripe
       >
         <el-table-column prop="cardCode" label="题卡ID"></el-table-column>
-        <el-table-column label="科目(编码)">
+        <el-table-column label="科目名称(编码)">
           <template slot-scope="scope">
             <span
               >{{ scope.row.courseName

+ 1 - 1
src/modules/exam-center/views/DoneTask.vue

@@ -34,7 +34,7 @@
         <el-table-column prop="paperStatus" label="试卷"></el-table-column>
         <el-table-column prop="cardStatus" label="答题卡"></el-table-column>
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column prop="printStatus" label="印状态"></el-table-column>
+        <el-table-column prop="printStatus" label="印状态"></el-table-column>
         <el-table-column prop="cancelStatus" label="撤回状态"></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">

+ 3 - 1
src/modules/exam-center/views/ExamManage.vue

@@ -35,6 +35,8 @@
         <el-form-item label="打印时间:">
           <el-date-picker
             v-model="filter.printTime"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
             type="date"
             placeholder="请选择日期"
           >
@@ -65,7 +67,7 @@
         <el-table-column prop="printTime" label="打印时间"></el-table-column>
         <el-table-column prop="name" label="创建人"></el-table-column>
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column prop="printStatus" label="印状态"></el-table-column>
+        <el-table-column prop="printStatus" label="印状态"></el-table-column>
         <el-table-column prop="endTime" label="完成时间"></el-table-column>
         <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">

+ 2 - 0
src/modules/exam-center/views/PrintManage.vue

@@ -20,6 +20,8 @@
         <el-form-item label="打印时间:">
           <el-date-picker
             v-model="filter.printTime"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
             type="date"
             placeholder="请选择日期"
           >