zhangjie 2 years ago
parent
commit
d232c7614f

+ 5 - 1
src/constants/enumerate.js

@@ -227,7 +227,11 @@ export const PRINT_TASK_STATUS = {
 // pdf文件类型
 export const PRINT_PDF_TYPE = {
   ALL_A3: "试卷题卡合并文件",
-  CARD_A3: "题卡合并文件"
+  PAPER: "试卷合并文件",
+  CARD_A3: "题卡A3合并文件",
+  PACKAGE: "卷袋贴文件",
+  SIGN: "签到表文件",
+  CHECK_IN: "登记表文件"
 };
 
 // stmms

+ 3 - 0
src/modules/base/api.js

@@ -159,6 +159,9 @@ export const courseQuery = datas => {
 export const deleteCourse = idList => {
   return $postParam("/api/admin/basic/course/delete_batch", { idList });
 };
+export const batchDeleteCourse = datas => {
+  return $postParam("/api/admin/basic/course/delete_by_query", datas);
+};
 export const updateCourse = datas => {
   return $post("/api/admin/basic/course/save", datas);
 };

+ 7 - 54
src/modules/base/views/CourseManage.vue

@@ -18,21 +18,6 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="启用/禁用:" label-width="90px">
-            <el-select
-              v-model="filter.enable"
-              style="width: 120px;"
-              placeholder="启用/禁用"
-              clearable
-            >
-              <el-option
-                v-for="(val, key) in ABLE_TYPE"
-                :key="key"
-                :value="key * 1"
-                :label="val"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="创建时间:">
             <el-date-picker
               v-model="createTime"
@@ -59,10 +44,11 @@
       </el-form>
       <div class="part-box-action">
         <el-button
+          v-if="checkPrivilege('button', 'Delete')"
           type="danger"
           :disabled="!filterHasQuery"
           @click="toBatchDeable"
-          >批量禁用</el-button
+          >批量删除</el-button
         >
         <el-button
           type="success"
@@ -124,15 +110,10 @@
             scope.row.createTime | timestampFilter
           }}</span>
         </el-table-column>
-        <el-table-column prop="enable" label="启用/禁用" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.enable | enableFilter }}
-          </template>
-        </el-table-column>
         <el-table-column
           class-name="action-column"
           label="操作"
-          width="140"
+          width="120"
           fixed="right"
         >
           <template slot-scope="scope">
@@ -143,13 +124,6 @@
               @click="toEdit(scope.row)"
               >编辑</el-button
             >
-            <el-button
-              v-if="checkPrivilege('link', 'Enable')"
-              :class="scope.row.enable ? 'btn-danger' : 'btn-primary'"
-              type="text"
-              @click="toEnable(scope.row)"
-              >{{ scope.row.enable ? "禁用" : "启用" }}</el-button
-            >
             <el-button
               v-if="checkPrivilege('link', 'delete')"
               class="btn-danger"
@@ -182,12 +156,7 @@
 </template>
 
 <script>
-import {
-  courseListPage,
-  deleteCourse,
-  ableCourse,
-  batchEnableCourse
-} from "../api";
+import { courseListPage, deleteCourse, batchDeleteCourse } from "../api";
 import pickerOptions from "@/constants/datePickerOptions";
 import ModifyCourse from "../components/ModifyCourse";
 import UploadButton from "../../../components/UploadButton";
@@ -278,28 +247,12 @@ export default {
         })
         .catch(() => {});
     },
-    toEnable(row) {
-      const action = row.enable ? "禁用" : "启用";
-      this.$confirm(`确定要${action}课程【${row.courseName}】吗?`, "提示", {
-        type: "warning"
-      })
-        .then(async () => {
-          const enable = !row.enable;
-          await ableCourse({
-            idList: [row.id],
-            enable
-          });
-          row.enable = enable;
-          this.$message.success("操作成功!");
-        })
-        .catch(() => {});
-    },
-    toBatchDeable() {
-      this.$confirm(`确定要禁用当前查询的所有课程吗?`, "提示", {
+    toBatchDelete() {
+      this.$confirm(`确定要删除当前查询的所有课程吗?`, "提示", {
         type: "warning"
       })
         .then(async () => {
-          await batchEnableCourse({ ...this.filter, enableOperate: false });
+          await batchDeleteCourse({ ...this.filter });
           this.$message.success("操作成功!");
           this.toPage(1);
         })

+ 1 - 1
src/modules/print/views/BusinessDataExport.vue

@@ -339,7 +339,7 @@ export default {
       }, `考务数据模板.xlsx`).catch(e => {
         this.$message.error(e || "下载失败,请重新尝试!");
       });
-      this.downloading = false;
+      this.loading = false;
 
       if (!res) return;
       this.$message.success("下载成功!");