Browse Source

审批表调整

zhangjie 3 years ago
parent
commit
175608c637
1 changed files with 24 additions and 10 deletions
  1. 24 10
      src/modules/exam/components/PaperApproveTable.vue

+ 24 - 10
src/modules/exam/components/PaperApproveTable.vue

@@ -98,13 +98,23 @@
             <div class="paper-base">
             <div class="paper-base">
               <div class="paper-row">
               <div class="paper-row">
                 <div class="paper-item">
                 <div class="paper-item">
-                  <span>教研室:</span>
+                  <span>学院:</span>
+                  <span>{{ basicInfo.collegeName }}</span>
+                </div>
+                <div class="paper-item">
+                  <span>教研室(或系):</span>
                   <span>{{ basicInfo.teachingRoomName }}</span>
                   <span>{{ basicInfo.teachingRoomName }}</span>
                 </div>
                 </div>
+              </div>
+              <div class="paper-row">
                 <div class="paper-item">
                 <div class="paper-item">
-                  <span>试卷名称:</span>
+                  <span>使用学期:</span>
                   <span>{{ basicInfo.paperName || "" }}</span>
                   <span>{{ basicInfo.paperName || "" }}</span>
                 </div>
                 </div>
+                <div class="paper-item">
+                  <span>课程名称:</span>
+                  <span>{{ basicInfo.courseName }}</span>
+                </div>
               </div>
               </div>
               <div class="paper-row">
               <div class="paper-row">
                 <div class="paper-item">
                 <div class="paper-item">
@@ -126,14 +136,18 @@
               :key="tindex"
               :key="tindex"
             >
             >
               <tr>
               <tr>
+                <th style="width: 100px;">卷袋编号</th>
+                <th>使用校区</th>
                 <th>使用班级</th>
                 <th>使用班级</th>
-                <th>人数</th>
-                <th>总印份数</th>
+                <th style="width: 80px;">人数</th>
+                <th style="width: 100px;">总印份数</th>
               </tr>
               </tr>
-              <tr v-for="item in part.data" :key="item.id">
+              <tr v-for="item in examRoomInfoList" :key="item.id" :id="item.id">
+                <td style="width: 100px;">{{ item.packageCode }}</td>
+                <td>{{ item.campusNames }}</td>
                 <td>{{ item.clazzNames }}</td>
                 <td>{{ item.clazzNames }}</td>
-                <td style="width: 100px;">{{ item.studentCount }}</td>
-                <td style="width: 140px;">{{ item.printCount }}</td>
+                <td style="width: 80px;">{{ item.studentCount }}</td>
+                <td style="width: 100px;">{{ item.printCount }}</td>
               </tr>
               </tr>
             </table>
             </table>
 
 
@@ -142,13 +156,13 @@
                 <th>审批部门</th>
                 <th>审批部门</th>
                 <th>审批人</th>
                 <th>审批人</th>
                 <th>审批时间</th>
                 <th>审批时间</th>
-                <th style="width: 240px;">审批意见</th>
+                <th style="width: 260px;">审批意见</th>
               </tr>
               </tr>
-              <tr v-for="(item, index) in part.data" :key="index">
+              <tr v-for="(item, index) in approvalInfoList" :key="index">
                 <td>{{ item.levelName }}</td>
                 <td>{{ item.levelName }}</td>
                 <td>{{ item.approveName }}</td>
                 <td>{{ item.approveName }}</td>
                 <td>{{ item.time | timestampFilter }}</td>
                 <td>{{ item.time | timestampFilter }}</td>
-                <td style="width: 240px;">{{ item.remark }}</td>
+                <td style="width: 260px;">{{ item.remark }}</td>
               </tr>
               </tr>
             </table>
             </table>
           </template>
           </template>