Ver código fonte

1.3.1bug fix

zhangjie 4 anos atrás
pai
commit
28ecefd0d6

+ 5 - 2
src/modules/base/api.js

@@ -36,12 +36,15 @@ export const saveWarningRule = datas => {
 export const importExtendColums = datas => {
   return $post("/api/print/basic/cardRule/impExtendColums", datas);
 };
-export const checkinExamList = schoolId => {
-  return $get("/api/print/basic/checkin/exam/listPage", { schoolId });
+export const checkinExamList = datas => {
+  return $get("/api/print/basic/checkin/exam/listPage", datas);
 };
 export const saveCheckinExam = datas => {
   return $post("/api/print/basic/checkin/save", datas);
 };
+export const deleteCheckinExam = id => {
+  return $post("/api/print/basic/checkin/delete", { id });
+};
 // course-manage
 export const courseListPage = datas => {
   return $get("/api/print/basic/course/list", datas);

+ 7 - 2
src/modules/base/components/ModifyCourse.vue

@@ -43,7 +43,6 @@
 
 <script>
 import { updateCourse } from "../api";
-import { commonCode } from "@/plugins/formRules";
 
 const initModalForm = {
   courseId: "",
@@ -82,7 +81,13 @@ export default {
             trigger: "change"
           }
         ],
-        courseCode: commonCode({ prop: "科目编码" })
+        courseCode: [
+          {
+            required: true,
+            message: "请输入科目编码",
+            trigger: "change"
+          }
+        ]
       }
     };
   },

+ 40 - 3
src/modules/base/components/RuleExamroom.vue

@@ -12,7 +12,23 @@
               type="text"
               icon="icon icon-upload-act"
               @click="toUpload(scope.row)"
-              title="上传"
+              title="上传登记表"
+            ></el-button>
+            <el-button
+              class="btn-table-icon"
+              type="text"
+              icon="icon icon-circle-right"
+              @click="toView(scope.row.path)"
+              title="预览登记表"
+              v-if="scope.row.id"
+            ></el-button>
+            <el-button
+              class="btn-table-icon"
+              type="text"
+              icon="icon icon-delete"
+              @click="toDelete(scope.row)"
+              title="删除登记表"
+              v-if="scope.row.id"
             ></el-button>
           </template>
         </el-table-column>
@@ -41,7 +57,7 @@
 </template>
 
 <script>
-import { checkinExamList, saveCheckinExam } from "../api";
+import { checkinExamList, saveCheckinExam, deleteCheckinExam } from "../api";
 import UploadFileDialog from "@/components/UploadFileDialog";
 
 export default {
@@ -63,7 +79,12 @@ export default {
   },
   methods: {
     async getList() {
-      const data = await checkinExamList(this.schoolId);
+      const datas = {
+        schoolId: this.schoolId,
+        pageNumber: this.current,
+        pageSize: this.size
+      };
+      const data = await checkinExamList(datas);
       this.dataList = data.records;
       this.total = data.total;
     },
@@ -80,6 +101,22 @@ export default {
       this.$refs.UploadFileDialog.open();
       console.log(row);
     },
+    toDelete(row) {
+      this.$confirm("确定要删除当前学校登记表吗?", "删除警告", {
+        cancelButtonClass: "el-button--danger is-plain",
+        confirmButtonClass: "el-button--primary",
+        type: "warning"
+      })
+        .then(async () => {
+          await deleteCheckinExam(row.id);
+          this.$message.success("删除成功!");
+          this.deletePageLastItem();
+        })
+        .catch(() => {});
+    },
+    toView(path) {
+      window.open(path);
+    },
     async uploadConfirm(attachment) {
       const datas = {
         attachmentId: attachment.attachmentId,