Browse Source

模版修改

zhangjie 2 năm trước cách đây
mục cha
commit
8ccbc151f6

+ 90 - 74
src/constants/printTemplateData.js

@@ -38,6 +38,12 @@ export const SIGN_DATA = {
     }
   ],
   table: [
+    {
+      code: "siteNumber",
+      name: "座位号",
+      disabled: false,
+      enable: false
+    },
     {
       code: "studentName",
       name: "姓名",
@@ -65,80 +71,90 @@ export const SIGN_DATA = {
   ]
 };
 
-export const PACKAGE_DATA = [
-  {
-    code: "examTime",
-    name: "考试时间",
-    disabled: true,
-    enable: true
-  },
-  {
-    code: "courseCode",
-    name: "课程代码",
-    disabled: true,
-    enable: true
-  },
-  {
-    code: "paperNumber",
-    name: "试卷编号",
-    disabled: true,
-    enable: true
-  },
-  {
-    code: "examPlace",
-    name: "考点",
-    disabled: false,
-    enable: false
-  },
-  {
-    code: "examRoom",
-    name: "考场",
-    disabled: false,
-    enable: false
-  },
-  {
-    code: "collegeName",
-    name: "学院",
-    disabled: false,
-    enable: false
-  },
-  {
-    code: "majorName",
-    name: "专业",
-    disabled: false,
-    enable: false
-  },
-  {
-    code: "clazzName",
-    name: "班级",
-    disabled: false,
-    enable: false
-  },
-  {
-    code: "examCount",
-    name: "应考人数",
-    disabled: true,
-    enable: true
-  },
-  {
-    code: "actualExamCount",
-    name: "实考人数",
-    disabled: true,
-    enable: true
-  },
-  {
-    code: "campusName",
-    name: "校区",
-    disabled: false,
-    enable: false
-  },
-  {
-    code: "examClassroomName",
-    name: "考试教室",
-    disabled: false,
-    enable: false
-  }
-];
+export const PACKAGE_DATA = {
+  title: [
+    {
+      code: "semesterName",
+      name: "学期",
+      disabled: false,
+      enable: true
+    }
+  ],
+  basic: [
+    {
+      code: "examTime",
+      name: "考试时间",
+      disabled: true,
+      enable: true
+    },
+    {
+      code: "courseCode",
+      name: "课程代码",
+      disabled: true,
+      enable: true
+    },
+    {
+      code: "paperNumber",
+      name: "试卷编号",
+      disabled: true,
+      enable: true
+    },
+    {
+      code: "examPlace",
+      name: "考点",
+      disabled: false,
+      enable: false
+    },
+    {
+      code: "examRoom",
+      name: "考场",
+      disabled: false,
+      enable: false
+    },
+    {
+      code: "collegeName",
+      name: "学院",
+      disabled: false,
+      enable: false
+    },
+    {
+      code: "majorName",
+      name: "专业",
+      disabled: false,
+      enable: false
+    },
+    {
+      code: "clazzName",
+      name: "班级",
+      disabled: false,
+      enable: false
+    },
+    {
+      code: "examCount",
+      name: "应考人数",
+      disabled: true,
+      enable: true
+    },
+    {
+      code: "actualExamCount",
+      name: "实考人数",
+      disabled: true,
+      enable: true
+    },
+    {
+      code: "campusName",
+      name: "校区",
+      disabled: false,
+      enable: false
+    },
+    {
+      code: "examClassroomName",
+      name: "考试教室",
+      disabled: false,
+      enable: false
+    }
+  ]
+};
 
 // acorn = {
 //   code: 200,

+ 23 - 5
src/modules/base/components/ModifyPrintTemplate.vue

@@ -71,12 +71,27 @@
         label="显示字段:"
         prop="fields"
       >
-        <el-checkbox
+        <!-- <el-checkbox
           v-for="field in packageDatas"
           :key="field.code"
           v-model="field.enable"
           :disabled="field.disabled"
           >{{ field.name }}</el-checkbox
+        > -->
+        <el-checkbox
+          v-for="field in packageDatas.title"
+          :key="field.code"
+          v-model="field.enable"
+          :disabled="field.disabled"
+          >{{ field.name }}</el-checkbox
+        >
+        <el-divider></el-divider>
+        <el-checkbox
+          v-for="field in packageDatas.basic"
+          :key="field.code"
+          v-model="field.enable"
+          :disabled="field.disabled"
+          >{{ field.name }}</el-checkbox
         >
       </el-form-item>
       <el-form-item
@@ -141,7 +156,10 @@ export default {
   data() {
     const fieldsValidator = (rule, value, callback) => {
       if (this.modalForm.classify === "PACKAGE") {
-        if (!this.packageDatas.some(item => item.enable)) {
+        if (
+          !this.packageDatas.basic.some(item => item.enable) ||
+          !this.packageDatas.title.some(item => item.enable)
+        ) {
           return callback(new Error("请选择显示字段"));
         }
         return callback();
@@ -197,7 +215,7 @@ export default {
           }
         ]
       },
-      packageDatas: [...PACKAGE_DATA],
+      packageDatas: { ...PACKAGE_DATA },
       signDatas: { ...SIGN_DATA },
       // upload
       uploadUrl: "/api/admin/common/file/upload",
@@ -220,7 +238,7 @@ export default {
         }
       } else {
         this.modalForm = this.$objAssign(initModalForm, val);
-        this.packageDatas = [...PACKAGE_DATA];
+        this.packageDatas = { ...PACKAGE_DATA };
         this.signDatas = { ...SIGN_DATA };
         // this.$nextTick(() => {
         //   this.$refs.UploadFileView.setAttachmentName("");
@@ -232,7 +250,7 @@ export default {
         ? JSON.parse(data.displayRange)
         : null;
       if (!displayRange) {
-        this.packageDatas = [...PACKAGE_DATA];
+        this.packageDatas = { ...PACKAGE_DATA };
         this.signDatas = { ...SIGN_DATA };
         return;
       }