zhangjie 3 سال پیش
والد
کامیت
f5010518f4

+ 1 - 1
src/components/UploadButton.vue

@@ -134,7 +134,7 @@ export default {
         message: "导入成功!"
       };
       this.$emit("upload-success", {
-        ...responseData,
+        data: responseData,
         filename: this.uploadDataDict[this.addFilenameParam]
       });
     },

+ 2 - 6
src/modules/base/components/ModifyClazzSimpleStudent.vue

@@ -43,7 +43,6 @@
             :upload-url="uploadUrl"
             :upload-data="uploadData"
             :format="['xls', 'xlsx']"
-            @upload-error="uplaodError"
             @upload-success="uploadSuccess"
           >
           </upload-button>
@@ -190,11 +189,8 @@ export default {
         .catch(() => {});
     },
     // import
-    uplaodError(errorData) {
-      this.$notify.error({ title: "错误提示", message: errorData.message });
-    },
-    uploadSuccess() {
-      this.$message.success("文件上传成功,后台正在导入!");
+    uploadSuccess(data) {
+      this.$message.success(data.data || "学生导入成功!");
       this.getList();
     }
   }

+ 1 - 1
src/modules/base/views/ApproveRecordManage.vue

@@ -206,7 +206,7 @@ export default {
       })
         .then(async () => {
           await deleteApproveRecord({
-            flowId: row.flowId,
+            id: row.id,
             enable: 0
           });
           this.$message.success("操作成功!");

+ 3 - 4
src/modules/base/views/CourseManage.vue

@@ -77,7 +77,6 @@
           btn-type="success"
           :upload-url="uploadUrl"
           :format="['xls', 'xlsx']"
-          @upload-error="uplaodError"
           @upload-success="uploadSuccess"
         >
         </upload-button>
@@ -290,9 +289,9 @@ export default {
         .catch(() => {});
     },
     // import
-    uplaodError(errorData) {
-      this.$notify.error({ title: "错误提示", message: errorData.message });
-    },
+    // uplaodError(errorData) {
+    //   this.$notify.error({ title: "错误提示", message: errorData.message });
+    // },
     uploadSuccess() {
       this.$message.success("文件上传成功,后台正在导入!");
       this.getList();

+ 0 - 4
src/modules/base/views/StudentManage.vue

@@ -71,7 +71,6 @@
           btn-type="success"
           :upload-url="uploadUrl"
           :format="['xls', 'xlsx']"
-          @upload-error="uplaodError"
           @upload-success="uploadSuccess"
         >
         </upload-button>
@@ -239,9 +238,6 @@ export default {
         .catch(() => {});
     },
     // import
-    uplaodError(errorData) {
-      this.$notify.error({ title: "错误提示", message: errorData.message });
-    },
     uploadSuccess() {
       this.$message.success("文件上传成功,后台正在导入!");
       this.getList();

+ 0 - 4
src/modules/base/views/UserManage.vue

@@ -83,7 +83,6 @@
           btn-type="success"
           :upload-url="uploadUrl"
           :format="['xls', 'xlsx']"
-          @upload-error="uplaodError"
           @upload-success="uploadSuccess"
         >
         </upload-button>
@@ -305,9 +304,6 @@ export default {
     //   this.$message.info("您的密码已经变更,请重新登录系统!");
     // },
     // import
-    uplaodError(errorData) {
-      this.$notify.error({ title: "错误提示", message: errorData.message });
-    },
     uploadSuccess() {
       this.getList();
     }

+ 0 - 4
src/modules/exam/views/StatisticsManage.vue

@@ -94,7 +94,6 @@
           btn-type="success"
           :upload-url="uploadUrl"
           :format="['xls', 'xlsx']"
-          @upload-error="uplaodError"
           @upload-success="uploadSuccess"
         >
         </upload-button>
@@ -250,9 +249,6 @@ export default {
       this.toPage(1);
     },
     // import
-    uplaodError(errorData) {
-      this.$notify.error({ title: "错误提示", message: errorData.message });
-    },
     uploadSuccess() {
       this.$message.success("文件上传成功,后台正在导入!");
       this.getList();

+ 15 - 0
src/modules/print/components/ModifyPrintPlan.vue

@@ -57,6 +57,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="examId" label="考试:">
+          <exam-select
+            v-model="modalForm.examId"
+            :semester-id="modalForm.semesterId"
+            class="width-full"
+          ></exam-select>
+        </el-form-item>
       </div>
 
       <div class="part-box">
@@ -289,6 +296,7 @@ const initModalForm = {
   examStartTime: "",
   examEndTime: "",
   semesterId: "",
+  examId: "",
   printContent: [],
   backupMethod: "ROOM",
   backupCount: 1,
@@ -427,6 +435,13 @@ export default {
             trigger: "change"
           }
         ],
+        examId: [
+          {
+            required: true,
+            message: "请选择使用考试",
+            trigger: "change"
+          }
+        ],
         printContent: [
           {
             required: false,