Merge branch 'dev_v3.3.1' of http://git.qmth.com.cn/teachcloud/teachcloud-print-web into dev_v3.3.1

src/modules/print/views/BusinessDataDetail.vue

@@ -107,6 +107,10 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
+        <el-table-column prop="studentCode" label="学号" width="120">
+        </el-table-column>
+        <el-table-column prop="studentName" label="姓名" min-width="100">
+        </el-table-column>
         <el-table-column
           prop="printPlanName"
           label="印刷计划"
@@ -131,10 +135,6 @@
         </el-table-column>
         <el-table-column prop="examRoom" label="考场" min-width="100">
         </el-table-column>
-        <el-table-column prop="studentCode" label="学号" width="120">
-        </el-table-column>
-        <el-table-column prop="studentName" label="姓名" min-width="100">
-        </el-table-column>
         <el-table-column
           class-name="action-column"
           label="操作"

src/modules/print/views/BusinessDataExport.vue

@@ -144,7 +144,7 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="semesterName"
           label="学期"
           min-width="160"
@@ -153,22 +153,12 @@
           prop="examName"
           label="考试"
           min-width="160"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="printPlanName"
           label="印刷计划"
           min-width="200"
         ></el-table-column>
-        <el-table-column prop="examDate" label="考试日期" width="100">
-        </el-table-column>
-        <el-table-column prop="examTime" label="考试时间" width="100">
-        </el-table-column>
-        <el-table-column prop="examPlace" label="考点" min-width="100">
-        </el-table-column>
-        <el-table-column prop="examRoom" label="考场" min-width="100">
-        </el-table-column>
-        <el-table-column prop="packageCode" label="卷袋号" min-width="160">
-        </el-table-column>
         <el-table-column
           prop="courseNameCode"
           label="课程（代码）"
@@ -180,6 +170,16 @@
           label="试卷编号"
           min-width="160"
         ></el-table-column>
+        <el-table-column prop="examDate" label="考试日期" width="100">
+        </el-table-column>
+        <el-table-column prop="examTime" label="考试时间" width="100">
+        </el-table-column>
+        <el-table-column prop="packageCode" label="卷袋号" min-width="160">
+        </el-table-column>
+        <el-table-column prop="examPlace" label="考点" min-width="100">
+        </el-table-column>
+        <el-table-column prop="examRoom" label="考场" min-width="100">
+        </el-table-column>
         <el-table-column prop="totalSubjects" label="科次" width="60">
         </el-table-column>
         <el-table-column

src/modules/print/views/PrintPlanManage.vue

@@ -83,7 +83,7 @@
           label="印刷计划"
           min-width="200"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="semesterName"
           label="学期"
           min-width="200"
@@ -92,7 +92,7 @@
           prop="examName"
           label="考试"
           min-width="200"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column prop="examStartTime" label="考试开始时间" width="170">
           <span slot-scope="scope">{{
             scope.row.examStartTime | timestampFilter
@@ -103,6 +103,11 @@
             scope.row.examEndTime | timestampFilter
           }}</span>
         </el-table-column>
+        <el-table-column prop="status" label="计划状态" width="100">
+          <span slot-scope="scope">
+            {{ scope.row.status | printPlanStatusFilter }}
+          </span>
+        </el-table-column>
         <el-table-column
           prop="createName"
           label="创建人"
@@ -113,11 +118,6 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column prop="status" label="计划状态" width="100">
-          <span slot-scope="scope">
-            {{ scope.row.status | printPlanStatusFilter }}
-          </span>
-        </el-table-column>
         <el-table-column
           class-name="action-column"
           label="操作"