bug fix

src/modules/paper/api.js

@@ -149,12 +149,6 @@ export const paperQuestionMoveApi = ({ detailId, unitid, vector }) => {
 export const paperQuestionDeleteApi = (unitid) => {
   return $httpWithMsg.delete(`${QUESTION_API}/paperDetailUnit/${unitid}`, {});
 };
-export const paperQuestionUnitDeleteApi = ({ unitid, questionId }) => {
-  return $httpWithMsg.delete(
-    `${QUESTION_API}/paper/deleteQuestion/${unitid}/${questionId}`,
-    {}
-  );
-};
 
 // audit-paper
 export const auditPaperWaitPageListApi = (datas) => {

src/modules/paper/components/PaperBlueInfo.vue

@@ -94,6 +94,7 @@ export default {
         paperId: this.paperId,
         courseId: this.courseId,
         coursePropertyId: this.coursePropertyId,
+        rootOrgId: this.$store.state.user.rootOrgId,
       });
       this.paperData = res.data;
       this.headFirst = this.paperData.head.slice(0, 2);

src/modules/paper/views/EditPaper.vue

@@ -559,7 +559,6 @@ import {
   paperDetailDeleteApi,
   paperQuestionMoveApi,
   paperQuestionDeleteApi,
-  paperQuestionUnitDeleteApi,
   paperQuestionSaveApi,
   paperDetailAddQuestionApi,
 } from "../api";
@@ -621,9 +620,7 @@ export default {
       return this.$store.state.user;
     },
     enableCardEdit() {
-      return (
-        this.paper.auditStatus === "PASS" && this.paper.paperType === "GENERATE"
-      );
+      return this.paper.auditStatus === "PASS";
     },
   },
   created() {
@@ -693,7 +690,7 @@ export default {
       }).catch(() => {});
       if (confirm !== "confirm") return;
 
-      const res = await paperDeleteApi(this.paper).catch((error) => {
+      const res = await paperDeleteApi(this.paper.id).catch((error) => {
         this.$notify({
           type: "error",
           message: error.response.data.desc,
@@ -702,7 +699,6 @@ export default {
 
       if (!res) return;
       this.$message.success("删除成功!");
-      window.history.go(-1);
       this.toBack();
     },
     // 导入答案
@@ -968,29 +964,15 @@ export default {
       }).catch(() => {});
       if (confirm !== "confirm") return;
 
-      if (this.paper.paperType == "GENERATE") {
-        const res = await paperQuestionDeleteApi(paperDetailUnit.id).catch(
-          (error) => {
-            this.$notify({
-              type: "error",
-              message: error.response.data.desc,
-            });
-          }
-        );
-        if (!res) return;
-      } else {
-        let questionId = paperDetailUnit.question.id;
-        const res = await paperQuestionUnitDeleteApi({
-          unitid: paperDetailUnit.id,
-          questionId,
-        }).catch((error) => {
+      const res = await paperQuestionDeleteApi(paperDetailUnit.id).catch(
+        (error) => {
           this.$notify({
             type: "error",
             message: error.response.data.desc,
           });
-        });
-        if (!res) return;
-      }
+        }
+      );
+      if (!res) return;
 
       this.$message.success("操作成功!");
       this.initPaper();

src/modules/paper/views/PaperRecycle.vue

@@ -49,13 +49,7 @@
           align="center"
         ></el-table-column>
         <el-table-column prop="name" label="试卷名称"> </el-table-column>
-        <el-table-column label="课程名称">
-          <template slot-scope="scope">
-            <span
-              >{{ scope.row.course.name }}（{{ scope.row.course.code }}）</span
-            >
-          </template>
-        </el-table-column>
+        <el-table-column prop="courseName" label="课程名称"> </el-table-column>
         <el-table-column prop="operator" label="操作人" width="120">
         </el-table-column>
         <el-table-column prop="deleteTime" label="删除时间" width="170">
@@ -116,12 +110,6 @@ export default {
       const res = await paperRecycleListApi().catch(() => {});
       this.loading = false;
       if (!res) return;
-      res.data.forEach((item) => {
-        if (item.recycleType === "QUESTION") {
-          item.name = JSON.parse(item.name);
-        }
-        return item;
-      });
       this.dataList = res.data;
     },
     tableSelectChange(selections) {

src/modules/question/views/QuestionRecycle.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column prop="courseName" label="课程" width="120">
         </el-table-column>
-        <el-table-column prop="questionType" label="题型" width="100">
+        <el-table-column prop="sourceDetailName" label="题型" width="100">
         </el-table-column>
         <el-table-column prop="operator" label="操作人" width="120">
         </el-table-column>
@@ -125,9 +125,8 @@ export default {
       if (!res) return;
       res.data.forEach((item) => {
         if (item.recycleType === "QUESTION") {
-          item.name = JSON.parse(item.name);
+          item.name = item.name ? JSON.parse(item.name) : null;
         }
-        return item;
       });
       this.dataList = res.data;
     },