印品管理修改以及主页待办调整

src/constants/printTemplateData.js

@@ -113,6 +113,18 @@ export const PACKAGE_DATA = [
     name: "班级",
     disabled: false,
     enable: false
+  },
+  {
+    code: "examCount",
+    name: "应考人数",
+    disabled: true,
+    enable: true
+  },
+  {
+    code: "actualExamCount",
+    name: "实考人数",
+    disabled: true,
+    enable: true
   }
 ];
 

src/modules/base/components/ModifyPrintTemplate.vue

@@ -35,20 +35,6 @@
           placeholder="建议不超过50个字"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="type" label="模板类型：">
-        <el-select
-          v-model="modalForm.type"
-          placeholder="模板类型"
-          @change="templateTypeChange"
-        >
-          <el-option
-            v-for="(val, key) in TEMPLATE_TYPE"
-            :key="key"
-            :value="key"
-            :label="val"
-          ></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item prop="classify" label="分类：">
         <el-select v-model="modalForm.classify" placeholder="请选择" clearable>
           <el-option
@@ -93,7 +79,11 @@
           >{{ field.name }}</el-checkbox
         >
       </el-form-item>
-      <el-form-item v-else prop="attachmentId" label="上传模板文件：">
+      <el-form-item
+        v-else-if="modalForm.classify === 'CHECK_IN'"
+        prop="attachmentId"
+        label="上传模板文件："
+      >
         <upload-file-view
           :upload-data="uploadData"
           :upload-url="uploadUrl"
@@ -118,7 +108,6 @@
 import { templateDetail, updateTemplate } from "../api";
 import { attachmentDetail } from "../../login/api";
 import UploadFileView from "@/components/UploadFileView";
-import { TEMPLATE_TYPE } from "@/constants/enumerate";
 import { PACKAGE_DATA, SIGN_DATA } from "@/constants/printTemplateData";
 
 const initModalForm = {
@@ -130,11 +119,6 @@ const initModalForm = {
   attachmentId: ""
 };
 
-const TEMPLATE_CLASSIFY = {
-  VARIABLE: { SIGN: "签到表", PACKAGE: "卷袋贴" },
-  ORDINARY: { CHECK_IN: "考试情况登记表" }
-};
-
 export default {
   name: "modify-print-template",
   components: { UploadFileView },
@@ -152,16 +136,6 @@ export default {
     },
     title() {
       return (this.isEdit ? "编辑" : "新增") + "模板";
-    },
-    categories() {
-      return TEMPLATE_CLASSIFY[this.modalForm.type] || {};
-    },
-    format() {
-      const formats = {
-        VARIABLE: ["ftl"],
-        ORDINARY: ["ftl", "html", "pdf"]
-      };
-      return formats[this.modalForm.type];
     }
   },
   data() {
@@ -186,6 +160,12 @@ export default {
       isSubmit: false,
       modalForm: {},
       attachment: {},
+      format: ["ftl", "html", "pdf"],
+      categories: {
+        SIGN: "签到表",
+        PACKAGE: "卷袋贴",
+        CHECK_IN: "考试情况登记表"
+      },
       rules: {
         name: [
           {
@@ -195,13 +175,6 @@ export default {
             trigger: "change"
           }
         ],
-        type: [
-          {
-            required: true,
-            message: "请选择模板类型",
-            trigger: "change"
-          }
-        ],
         classify: [
           {
             required: true,
@@ -224,7 +197,6 @@ export default {
           }
         ]
       },
-      TEMPLATE_TYPE,
       packageDatas: [...PACKAGE_DATA],
       signDatas: { ...SIGN_DATA },
       // upload
@@ -250,9 +222,9 @@ export default {
         this.modalForm = this.$objAssign(initModalForm, val);
         this.packageDatas = [...PACKAGE_DATA];
         this.signDatas = { ...SIGN_DATA };
-        this.$nextTick(() => {
-          this.$refs.UploadFileView.setAttachmentName("");
-        });
+        // this.$nextTick(() => {
+        //   this.$refs.UploadFileView.setAttachmentName("");
+        // });
       }
     },
     initFieldData(data) {
@@ -293,9 +265,6 @@ export default {
     open() {
       this.modalIsShow = true;
     },
-    templateTypeChange() {
-      this.modalForm.classify = "";
-    },
     async submit() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});
       if (!valid) return;

src/modules/base/views/PrintTemplateManage.vue

@@ -10,16 +10,6 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="模板类型：" label-width="90px">
-            <el-select v-model="filter.type" placeholder="模板类型" clearable>
-              <el-option
-                v-for="(val, key) in TEMPLATE_TYPE"
-                :key="key"
-                :value="key"
-                :label="val"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="创建时间：">
             <el-date-picker
               v-model="createTime"
@@ -82,11 +72,6 @@
           label="模板名称"
           min-width="120"
         ></el-table-column>
-        <el-table-column prop="type" label="模板类型" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.type | templateTypeFilter }}
-          </template>
-        </el-table-column>
         <el-table-column prop="classify" label="分类" width="140">
           <template slot-scope="scope">
             {{ scope.row.classify | templateClassifyFilter }}

src/modules/exam/components/WaitTaskAnalysis.vue

@@ -81,13 +81,12 @@ export default {
     async initData() {
       await this.getList();
 
-      const presetTaskId = this.$route.query.tid;
-      if (presetTaskId) {
+      const presetTask = this.$ls.get("wait_task_analysis");
+      if (presetTask) {
         this.$nextTick(() => {
-          const curRow = this.dataList.find(item => item.id === presetTaskId);
-          if (!curRow) return;
-          this.toDo(curRow);
+          this.toDo(presetTask);
         });
+        this.$ls.remove("wait_task_analysis");
       }
     },
     async getList() {

src/modules/exam/components/WaitTaskFlow.vue

@@ -94,13 +94,12 @@ export default {
     async initData() {
       await this.getList();
 
-      const presetTaskId = this.$route.query.tid;
-      if (presetTaskId) {
+      const presetTask = this.$ls.get("wait_task_flow");
+      if (presetTask) {
         this.$nextTick(() => {
-          const curRow = this.dataList.find(item => item.id === presetTaskId);
-          if (!curRow) return;
-          this.toDo(curRow);
+          this.toDo(presetTask);
         });
+        this.$ls.remove("wait_task_flow");
       }
     },
     async getList() {

src/modules/exam/components/WaitTaskStmms.vue

@@ -82,13 +82,12 @@ export default {
     async initData() {
       await this.getList();
 
-      const presetTaskId = this.$route.query.tid;
-      if (presetTaskId) {
+      const presetTask = this.$ls.get("wait_task_stmms");
+      if (presetTask) {
         this.$nextTick(() => {
-          const curRow = this.dataList.find(item => item.id === presetTaskId);
-          if (!curRow) return;
-          this.toDo(curRow);
+          this.toDo(presetTask);
         });
+        this.$ls.remove("wait_task_stmms");
       }
     },
     async getList() {

src/views/HomePage.vue

@@ -31,7 +31,7 @@
               </div>
               <div
                 class="tab-task-item-cont"
-                title="立即处理"
+                :title="item.content"
                 @click="toDo(item)"
               >
                 {{ item.content }}
@@ -216,7 +216,7 @@ export default {
       const dataList = data.records.map(item => {
         const flowTaskName = item.taskName.replace(/\(.+?\)/g, "");
         return {
-          id: item.id,
+          ...item,
           type: "flow",
           content: `${flowTaskName}，试卷编号${item.paperNumber}，${item.courseName}（${item.courseCode}）`
         };
@@ -227,9 +227,9 @@ export default {
       const data = await stmmsTaskListPage(this.waitTaskFilter);
       const dataList = data.records.map(item => {
         return {
-          id: item.id,
+          ...item,
           type: "stmms",
-          content: `${item.thirdRelateName}（${item.thirdRelateId}），试卷编号${paperNumber}，${item.paperType}`
+          content: `${item.thirdRelateName}（${item.thirdRelateId}），试卷编号${item.paperNumber}，${item.paperType}`
         };
       });
       this.taskList[1] = dataList;
@@ -238,7 +238,7 @@ export default {
       const data = await analysisTaskListPage(this.waitTaskFilter);
       const dataList = data.records.map(item => {
         return {
-          id: item.id,
+          ...item,
           type: "analysis",
           content: `${item.semesterName}，${item.examName}，${item.courseName}（${item.courseCode}）`
         };
@@ -253,10 +253,10 @@ export default {
     },
     toDo(item) {
       console.log(item);
+      this.$ls.set(`wait_task_${item.type}`, item);
       this.$router.push({
         name: "WaitTask",
         query: {
-          tid: item.id,
           type: item.type
         }
       });