natasha 2 gadi atpakaļ
vecāks
revīzija
2b2ce815ab
1 mainītis faili ar 8 papildinājumiem un 4 dzēšanām
  1. 8 4
      src/views/wordcard/cread.vue

+ 8 - 4
src/views/wordcard/cread.vue

@@ -369,6 +369,7 @@ export default {
     // 切换类型
     cutType(index) {
       this.typeIndex = index;
+      this.writeTableData = null
     },
     // 生成
     creadEvent() {
@@ -387,10 +388,6 @@ export default {
         this.$message.warning("请先输入配置内容");
         return;
       }
-      if(this.from.writeBoxNumber<this.from.miaoRedBoxNumber){
-        this.$message.warning("书写格数不能小于描红数");
-        return;
-      }
       // 大 一行8个    中 一行10个  小 一行12个
       let data = {
         option: [],
@@ -428,6 +425,13 @@ export default {
         data.marginBottom = "7px";
         data.playWidth = "8px";
       }
+      if(this.from.writeBoxNumber<this.from.miaoRedBoxNumber&&this.typeIndex == 1){
+        this.$message.warning("书写格数不能小于描红数");
+        return;
+      }else if(this.from.writeBoxNumber<Math.ceil(this.from.miaoRedBoxNumber/data.rowNumber)&&this.typeIndex == 0){
+        this.$message.warning("书写格数不能小于描红所用行数");
+        return;
+      }
       let contentArr = this.from.content.split("\n");
       for (let i = 0; i < contentArr.length; i++) {
         if (data.typeIndex == 0) {