zhangjie 3 vuotta sitten
vanhempi
commit
b35b82d64a

+ 7 - 0
src/assets/styles/element-ui-costom.scss

@@ -521,6 +521,13 @@
   }
 }
 // .el-message
+.el-message {
+  .el-message__content {
+    word-wrap: break-word;
+    max-width: 600px;
+    line-height: 1.4;
+  }
+}
 .el-message-loading {
   border-color: mix($--color-white, $--color-success, 80%);
   background-color: mix($--color-white, $--color-success, 90%);

+ 3 - 1
src/modules/card/views/CardPreview.vue

@@ -186,7 +186,9 @@ export default {
           }
         });
       } else {
-        const VALID_ELEMENTS_FOR_EXTERNAL = ["BARCODE", "FILL_FIELD"];
+        const VALID_ELEMENTS_FOR_EXTERNAL = ["BARCODE"];
+        // PS:系统暂时没有设置变量值获取方法,变量站位填充暂时取消。
+        // const VALID_ELEMENTS_FOR_EXTERNAL = ["BARCODE", "FILL_FIELD"];
         pages.forEach(page => {
           page.columns.forEach(column => {
             column.elements.forEach(element => {

+ 14 - 11
src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -14,6 +14,7 @@
           value-format="timestamp"
           placeholder="考试日期"
           style="width: 150px"
+          :editable="false"
           @change="timeChange"
         >
         </el-date-picker>
@@ -25,6 +26,7 @@
           end-placeholder="考试结束时间"
           placeholder="选择时间范围"
           value-format="timestamp"
+          :editable="false"
           @change="timeChange"
         >
         </el-time-picker>
@@ -274,12 +276,21 @@ export default {
       });
       this.updatePackageInfos();
     },
-    checkData() {
+    checkTime() {
       if (!this.modalForm.examStartTime || !this.modalForm.examEndTime) {
         this.$message.error("请选择考试时间!");
-        return Promise.reject();
+        return false;
       }
 
+      if (this.modalForm.examStartTime >= this.modalForm.examEndTime) {
+        this.$message.error("考试开始时间必须小于考试结束时间!");
+        return false;
+      }
+      return true;
+    },
+    checkData() {
+      if (!this.checkTime()) return Promise.reject();
+
       if (this.IS_MODEL2) {
         if (!this.modalForm.printCount) {
           this.$message.error("请输入印刷分数!");
@@ -444,15 +455,7 @@ export default {
       }
     },
     toAdd() {
-      if (!this.modalForm.examStartTime || !this.modalForm.examEndTime) {
-        this.$message.error("请选择考试时间!");
-        return;
-      }
-
-      if (this.modalForm.examStartTime === this.modalForm.examEndTime) {
-        this.$message.error("考试开始时间不能等于考试结束时间!");
-        return;
-      }
+      if (!this.checkTime()) return;
 
       this.curRow = {
         examPlace: "",