Merge remote-tracking branch 'origin/master'

src/modules/marking/views/MarkWork.vue

@@ -40,14 +40,14 @@
             border
             style="width: 100%"
           >
-            <el-table-column label="评卷工作名称" width="250">
+            <el-table-column label="评卷工作名称" width="150">
               <template slot-scope="scope">
                 <div>
                   <span>{{ scope.row.name }}</span>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="考试批次" width="250">
+            <el-table-column label="考试批次" width="200">
               <template slot-scope="scope">
                 <div>
                   <span>{{ scope.row.examName }}</span>
@@ -75,6 +75,13 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="状态" width="100">
+              <template slot-scope="scope">
+                <div>
+                  <span>{{ getStatus(scope.row.status) }}</span>
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <div class="pull-left" v-if="isAdmin">
@@ -364,6 +371,13 @@ export default {
       this.loading = false;
     },
     delMarkWork(row) {
+      if (Number.parseInt(row.status) == 0) {
+        this.$notify({
+          message: "创建中的评卷工作不能删除！",
+          type: "error"
+        });
+        return;
+      }
       this.$confirm("确认删除评卷工作?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",