Bladeren bron

bug修改

zhangjie 4 jaren geleden
bovenliggende
commit
f45e47eccc

+ 2 - 1
src/modules/base/components/ModifyField.vue

@@ -45,7 +45,8 @@
 <script>
 const initModalForm = {
   name: "",
-  code: ""
+  code: "",
+  enable: false
 };
 
 export default {

+ 3 - 1
src/modules/exam/components/PreviewTaskPaper.vue

@@ -60,12 +60,14 @@ export default {
   data() {
     return {
       modalIsShow: false,
+      cardId: "",
       paperAttachments: []
     };
   },
   methods: {
     async visibleChange() {
       const data = await taskApplyDetail(this.instance.id);
+      this.cardId = data.cardId;
       this.paperAttachments = data.paperAttachmentIds
         ? JSON.parse(data.paperAttachmentIds)
         : [];
@@ -88,7 +90,7 @@ export default {
         this.getRouterPath({
           name: "CardPreview",
           params: {
-            cardId: this.curTaskApply.cardId,
+            cardId: this.cardId,
             viewType: "view"
           }
         })

+ 2 - 2
src/modules/exam/views/DataTaskManage.vue

@@ -82,14 +82,14 @@
           class-name="action-column"
           label="操作"
           align="center"
-          width="120px"
+          width="100px"
         >
           <template slot-scope="scope">
             <el-button
               v-if="scope.row.hasReportFile"
               class="btn-table-icon"
               type="text"
-              icon="el-icon-download"
+              icon="icon icon-circle-share"
               :disabled="loading"
               @click="toDonwloadLog(scope.row)"
               title="导出日志"

+ 1 - 1
src/modules/print/views/PrintTaskManage.vue

@@ -363,7 +363,7 @@ export default {
         type: "warning"
       })
         .then(async () => {
-          const data = await submitPrintTask(row.id);
+          const data = await submitPrintTask(row.examDetailId);
           if (!data) return;
 
           this.$message.success("提交成功!");

+ 6 - 0
src/plugins/utils.js

@@ -330,6 +330,12 @@ export function residueFloorTime(timeNumber, wainingTime = 0) {
 }
 
 export function parseTimeRangeDateAndTime(startTime, endTime) {
+  if (!startTime || !endTime)
+    return {
+      date: "--",
+      time: "--"
+    };
+
   const st = formatDate("YYYY-MM-DD HH:mm", new Date(startTime)).split(" ");
   const et = formatDate("YYYY-MM-DD HH:mm", new Date(endTime)).split(" ");