zhangjie 2 rokov pred
rodič
commit
6d0fa295c3

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
card/previewTemp.js


+ 6 - 3
public/index.html

@@ -2,9 +2,12 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,
-    maximum-scale=1.0,minimum-scale=1.0, user-scalable=no"" />
-    <meta name=" renderer" content="webkit|ie-comp|ie-stand" />
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,
+    maximum-scale=1.0,minimum-scale=1.0, user-scalable=no"
+    />
+    <meta name="renderer" content="webkit|ie-comp|ie-stand" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />

+ 4 - 4
src/modules/base/api.js

@@ -364,11 +364,11 @@ export const printPlanSyncExamList = () => {
   return $post("/api/admin/exam/print_sync/list_relate_ids", {});
 };
 // new
-export const printPlanSyncRelateExamList = datas => {
-  return $post("/api/admin/basic/stmms_exam/sync", datas);
+export const printPlanSyncRelateExamList = () => {
+  return $post("/api/admin/basic/stmms_exam/sync", {});
 };
-export const printPlanRelateExamList = datas => {
-  return $postParam("/api/admin/basic/stmms_exam/list", datas);
+export const printPlanRelateExamList = () => {
+  return $postParam("/api/admin/basic/stmms_exam/list", {});
 };
 export const printPlanCourseRelateList = datas => {
   return $postParam("/api/admin/exam/print_sync/list_sync_exam_task", datas);

+ 9 - 5
src/modules/base/components/PrintPlanBatchPushDialog.vue

@@ -127,8 +127,8 @@
             <el-option
               v-for="(item, index) in thirdRelateExams"
               :key="index"
-              :value="item.thirdRelateId"
-              :label="item.thirdRelateName"
+              :value="item.examId"
+              :label="`${item.examId}-${item.examName}`"
             >
             </el-option>
           </el-select>
@@ -279,7 +279,12 @@ export default {
       this.modalIsShow = true;
     },
     handleSelectionChange(val) {
-      this.modalForm.list = val.map(item => item.id);
+      this.modalForm.list = val.map(item => {
+        return {
+          id: item.id,
+          printPlanIds: item.printPlanIds
+        };
+      });
     },
     examTypeChange() {
       this.$nextTick(() => {
@@ -293,8 +298,7 @@ export default {
       if (this.loading) return;
       this.loading = true;
       const data = await printPlanSyncStmms({
-        ...this.modalForm,
-        printPlanIds: this.ids
+        ...this.modalForm
       }).catch(() => {});
       this.loading = false;
 

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov