Browse Source

去掉中文符号校验

Qukatie 3 months ago
parent
commit
0b08a1de53

+ 9 - 1
src/util/date.js

@@ -353,9 +353,17 @@ export function checkFullWidthSymbols(text) {
   }
 }
 //判断一行不能超过35个字符
-export function lineQuantityVerification(text) {
+export function lineQuantityVerification(text, line) {
   if (text) {
     const matchesItem = [];
     let lines = text.split('\n')
+    console.log(lines)
+    for (let [index, item] of lines.entries()) {
+      if (item.length > line) {
+        console.log(item.length,line)
+        return true
+      }
+
+    }
   }
 }

+ 270 - 252
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -533,7 +533,7 @@ import businessReports from "@/views/iosBasicData/OceanFreightImport/bills/assem
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
-import { verifyEnglish, checkFullWidthSymbols } from "@/util/date";
+import { verifyEnglish, checkFullWidthSymbols, lineQuantityVerification } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import { selectListLos } from "@/api/approval/processConfig";
 import { isProcurement } from "@/api/basicData/configuration";
@@ -570,7 +570,6 @@ export default {
   },
   data() {
     return {
-      verifySymbolStatus: 0,
       showLock: false,
       ediData: [], // edi 列表数据
       ediData_SO: [], // edi SO 列表数据
@@ -882,7 +881,8 @@ export default {
       },
       excelBox: false,
       saberTenantId: 0,
-      isHq: null
+      isHq: null,
+      lineLength: 35
     };
   },
   watch: {
@@ -922,7 +922,7 @@ export default {
           });
         } else {
           this.basicData.column.forEach((item, index) => {
-             if (index == 3) {
+            if (index == 3) {
               item.forEach(row => {
                 if (row.prop == "mblno") {
                   row.disabled = false;
@@ -979,10 +979,10 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.isHq = JSON.parse(localStorage.getItem("user-Information")).isHq;
     this.roleName = localStorage.getItem("roleName").split(",");
-    isProcurement({
-      param: "verify.symbol"
-    }).then(res => {
-      this.verifySymbolStatus = res.data.data;
+    isProcurement({ param: "line.length" }).then(res => {
+      if (res.data.data) {
+        this.lineLength = res.data.data;
+      }
     });
     if (this.detailData.billType) {
       this.form.billType = this.detailData.billType;
@@ -1257,9 +1257,9 @@ export default {
           title: "收押箱款",
           width: "30%",
           menuPosition: "right",
-            data:{
-              quantityCntrDescr:this.form.quantityCntrDescr
-            },
+          data: {
+            quantityCntrDescr: this.form.quantityCntrDescr
+          },
           option: {
             submitText: "确定",
             emptyText: "取消",
@@ -1279,11 +1279,11 @@ export default {
                   }
                 ]
               },
-               {
+              {
                 label: "箱型箱量",
                 span: 24,
                 prop: "quantityCntrDescr",
-                disabled:true,
+                disabled: true
               }
             ]
           },
@@ -1484,122 +1484,131 @@ export default {
     // 发送edi
     editypesSendingEdifun(row) {
       row.billId = this.form.id;
-      let msgsList = [];
-      if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
-      }
-      if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
-      }
-      if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
-      }
-      if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        if (msg.length > 0) {
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-      }
+      // let msgsList = [];
+      // if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   if (msg.length > 0) {
+      //     this.$message({
+      //       dangerouslyUseHTMLString: true,
+      //       message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //       type: "error"
+      //     });
+      //     return;
+      //   }
+      // }
 
-      if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        if (msg.length > 0) {
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-      }
-      if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        if (msg.length > 0) {
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-      }
+      // if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   if (msg.length > 0) {
+      //     this.$message({
+      //       dangerouslyUseHTMLString: true,
+      //       message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //       type: "error"
+      //     });
+      //     return;
+      //   }
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   if (msg.length > 0) {
+      //     this.$message({
+      //       dangerouslyUseHTMLString: true,
+      //       message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //       type: "error"
+      //     });
+      //     return;
+      //   }
+      // }
 
-      if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
+      // if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+        return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
       }
-      if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
+      if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+        return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
       }
-      if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
+      if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+        return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
       }
       // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
       //   msgsList.push("发货人");
@@ -2422,136 +2431,145 @@ export default {
             });
             return;
           }
-          if (this.verifySymbolStatus == 1) {
-            let msgsList = [];
-            if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
+          
+            // let msgsList = [];
+            // if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
 
-            if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
-            if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
-            if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
+            // if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
 
-            if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
-            if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
+            // if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
 
-            if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
+            // if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,,请修正后再保存!`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+              return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
             }
-            if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
+            if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+              return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
             }
-            if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,,请修正后再保存!`,
-                  type: "error"
-                });
-                return;
-              }
+            if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+              return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
             }
             // console.log(this.form.detail);
             // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
@@ -2586,7 +2604,7 @@ export default {
             //   this.$message.error(`${msgsList.join(",")}存在非英文字符,如汉字等,请修正后再保存!`);
             //   return;
             // }
-          }
+          
           this.form.detail.hshipperDetails = this.getTextTirim(this.form.detail.hshipperDetails);
           this.form.detail.hconsigneeDetails = this.getTextTirim(this.form.detail.hconsigneeDetails);
           this.form.detail.hnotifyDetails = this.getTextTirim(this.form.detail.hnotifyDetails);
@@ -2776,7 +2794,7 @@ export default {
         id
       });
       loading.close();
-           this.detailData.seeDisabled = false;
+      this.detailData.seeDisabled = false;
       let types = typeof type == "string" ? type.split(",") : [];
       // if (type == '复制费用' || type == '') {
       //     res.data.data.preContainersList = []

+ 1 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -168,7 +168,7 @@
             </span>
         </el-dialog>
         <business-reports :id="assemblyForm.id" :itemIds="itemIds" ref="print" businessValue="HYCK" classifyCode="业务"
-            groupCode="配箱预览" :treeType="false" :type="1"></business-reports>
+            groupCode="配箱预览,ADVICE" :treeType="false" :type="1"></business-reports>
 
     </div>
 </template>

+ 33 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/components/sendEdi.vue

@@ -1,6 +1,13 @@
 <template>
   <div>
     <el-dialog title="发送下货纸" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+      <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">
+        <el-popover placement="top" width="400" trigger="click">
+          <el-input type="textarea" autosize placeholder="请输入内容" v-model="textarea"> </el-input>
+          <el-button slot="reference" size="small">查看</el-button>
+        </el-popover>
+        <el-button style="margin-left: 10px;" type="warning" size="small" @click="outExport">导出</el-button>
+      </div>
       <avue-crud
         v-if="dialogVisible"
         :option="option"
@@ -21,10 +28,12 @@
 
 <script>
 import { sendDeliveryPaper } from "@/api/iosBasicData/ReceivingOrders/precontainers";
+import { getToken } from "@/util/auth";
 export default {
   props: {},
   data() {
     return {
+      textarea:'',
       id: null,
       data: [],
       ids: null,
@@ -53,7 +62,7 @@ export default {
             overHidden: true
           },
           {
-            label: "船名航次",
+            label: "船名",
             prop: "vesselCnName",
             overHidden: true
           },
@@ -105,6 +114,25 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(309.6), this.optionBack);
   },
   methods: {
+    outExport() {
+      this.$confirm("是否导出当前所有数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        let obj = {
+          ids: this.ids
+        };
+        const routeData = this.$router.resolve({
+          path: "/api/blade-los/bills/sendDeliveryPaperExport", //跳转目标窗口的地址
+          query: {
+            "Blade-Auth": getToken(),
+            ...obj //括号内是要传递给新窗口的参数
+          }
+        });
+        window.open(routeData.href.slice(1, routeData.href.length));
+      });
+    },
     openDialog(val) {
       this.dialogVisible = true;
       this.ids = val;
@@ -137,7 +165,11 @@ export default {
       this.loading = true;
       sendDeliveryPaper(obj)
         .then(res => {
+          res.data.data.forEach(item=>{
+            this.textarea='开船日期:'+item.etd+'\n目的港:'+item.podEnName+'\n船名航次:'+item.vesselCnName+'\n航次:'+item.voyageNo+'\n箱主:'+item.boxOwner+'\n入港箱主:'+item.inboundContainerOwner+'\n转港:'+item.potEnName+'\n提单号:'+item.mblno+'\n箱型箱量:'+item.quantityCntrDescr+'\n货物毛重:'+item.grossWeight
+          })
           this.data = res.data.data;
+          
           // this.page.total = res.data.data.total;
         })
         .finally(() => {

+ 263 - 243
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -637,7 +637,7 @@ import businessReports from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
 import { editypesList } from "@/api/iosBasicData/editypes";
-import { verifyEnglish, checkFullWidthSymbols } from "@/util/date";
+import { verifyEnglish, checkFullWidthSymbols, lineQuantityVerification } from "@/util/date";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import { selectListLos } from "@/api/approval/processConfig";
 import { isProcurement } from "@/api/basicData/configuration";
@@ -742,7 +742,6 @@ export default {
         ]
       },
       logisticsDialog: false,
-      verifySymbolStatus: 0,
       showLock: false,
       ediData: [], // edi 列表数据
       ediData_SO: [], // edi SO 列表数据
@@ -1014,7 +1013,8 @@ export default {
       saberTenantId: 0,
       importTemplate: null,
       isHq: null,
-      textareaNumber:5,
+      textareaNumber: 5,
+      lineLength: 35
     };
   },
   watch: {
@@ -1105,9 +1105,6 @@ export default {
     this.saberTenantId = Obj ? Obj.content : 0;
     this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.isHq = JSON.parse(localStorage.getItem("user-Information")).isHq;
-    isProcurement({ param: "verify.symbol" }).then(res => {
-      this.verifySymbolStatus = res.data.data;
-    });
     isProcurement({ param: "import.template" }).then(res => {
       this.importTemplate = res.data.data;
     });
@@ -1116,6 +1113,11 @@ export default {
         this.textareaNumber = res.data.data;
       }
     });
+    isProcurement({ param: "line.length" }).then(res => {
+      if (res.data.data) {
+        this.lineLength = res.data.data;
+      }
+    });
     if (this.detailData.billType) {
       this.form.billType = this.detailData.billType;
     }
@@ -1544,122 +1546,131 @@ export default {
     // 发送edi
     editypesSendingEdifun(row) {
       row.billId = this.form.id;
-      let msgsList = [];
-      if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
-      }
-      if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
-      }
-      if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
-      }
-      if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        if (msg.length > 0) {
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-      }
+      // let msgsList = [];
+      // if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   if (msg.length > 0) {
+      //     this.$message({
+      //       dangerouslyUseHTMLString: true,
+      //       message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //       type: "error"
+      //     });
+      //     return;
+      //   }
+      // }
 
-      if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        if (msg.length > 0) {
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-      }
-      if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        if (msg.length > 0) {
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-      }
+      // if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   if (msg.length > 0) {
+      //     this.$message({
+      //       dangerouslyUseHTMLString: true,
+      //       message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //       type: "error"
+      //     });
+      //     return;
+      //   }
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   if (msg.length > 0) {
+      //     this.$message({
+      //       dangerouslyUseHTMLString: true,
+      //       message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //       type: "error"
+      //     });
+      //     return;
+      //   }
+      // }
 
-      if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
+      // if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+        return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
       }
-      if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
+      if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+        return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
       }
-      if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
-        let msg = [];
-        for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
-          msg.push(`第${item.row}行的"${item.symbol}"`);
-        }
-        this.$message({
-          dangerouslyUseHTMLString: true,
-          message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-          type: "error"
-        });
-        return;
+      if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+        return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
       }
       // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
       //   msgsList.push("发货人");
@@ -2486,136 +2497,145 @@ export default {
             });
             return;
           }
-          if (this.verifySymbolStatus == 1) {
+         
             let msgsList = [];
-            if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
+            // if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
 
-            if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
-            if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
-            if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
+            // if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.detail.mshipperDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.mshipperDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `MBL 发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
 
-            if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
-            if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
-            }
+            // if (checkFullWidthSymbols(this.form.detail.mconsigneeDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.mconsigneeDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `MBL 收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.detail.mnotifyDetails).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.detail.mnotifyDetails).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `MBL 通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
 
-            if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
+            // if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            // if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
+            //   let msg = [];
+            //   for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
+            //     msg.push(`第${item.row}行的"${item.symbol}"`);
+            //   }
+            //   if (msg.length > 0) {
+            //     this.$message({
+            //       dangerouslyUseHTMLString: true,
+            //       message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,,请修正后再保存!`,
+            //       type: "error"
+            //     });
+            //     return;
+            //   }
+            // }
+            if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+              return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
             }
-            if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                  type: "error"
-                });
-                return;
-              }
+            if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+              return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
             }
-            if (checkFullWidthSymbols(this.form.forwarding).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.forwarding).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              if (msg.length > 0) {
-                this.$message({
-                  dangerouslyUseHTMLString: true,
-                  message: `FORWARDING:<br>${msg.join(";<br>")}<br>存在全角或汉字符号,,请修正后再保存!`,
-                  type: "error"
-                });
-                return;
-              }
+            if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+              return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
             }
             // console.log(this.form.detail);
             // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
@@ -2650,7 +2670,7 @@ export default {
             //   this.$message.error(`${msgsList.join(",")}存在非英文字符,如汉字等,请修正后再保存!`);
             //   return;
             // }
-          }
+         
           this.form.detail.hshipperDetails = this.getTextTirim(this.form.detail.hshipperDetails);
           this.form.detail.hconsigneeDetails = this.getTextTirim(this.form.detail.hconsigneeDetails);
           this.form.detail.hnotifyDetails = this.getTextTirim(this.form.detail.hnotifyDetails);

+ 134 - 116
src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -1060,7 +1060,7 @@ import _ from "lodash";
 import { Header } from "element-ui";
 import { dateFormat } from "@/util/date";
 import { isProcurement } from "@/api/basicData/configuration";
-import { verifyEnglish, checkFullWidthSymbols } from "@/util/date";
+import { verifyEnglish, checkFullWidthSymbols, lineQuantityVerification } from "@/util/date";
 export default {
   name: "detailsPage",
   data() {
@@ -1613,7 +1613,7 @@ export default {
       saberUserInfo: null,
       deptId: JSON.parse(localStorage.getItem("sysitemData")).deptId,
       flxDisabled: true,
-      verifySymbolStatus: 0
+      lineLength: 35
     };
   },
   components: {
@@ -1641,8 +1641,10 @@ export default {
     isProcurement({ param: "import.template" }).then(res => {
       this.importTemplate = res.data.data;
     });
-    isProcurement({ param: "verify.symbol" }).then(res => {
-      this.verifySymbolStatus = res.data.data;
+    isProcurement({ param: "line.length" }).then(res => {
+      if (res.data.data) {
+        this.lineLength = res.data.data;
+      }
     });
     if (this.detailData && this.detailData.id) {
       this.getDetails(this.detailData.id);
@@ -2448,68 +2450,76 @@ export default {
         });
       }
       if (name == "提交订舱") {
-        if (this.verifySymbolStatus == 1) {
-          if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-            let msg = [];
-            for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-              msg.push(`第${item.row}行的"${item.symbol}"`);
-            }
-            this.$message({
-              dangerouslyUseHTMLString: true,
-              message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-              type: "error"
-            });
-            return;
+        if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+          let msg = [];
+          for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+            msg.push(`第${item.row}行的"${item.symbol}"`);
           }
-          if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-            let msg = [];
-            for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-              msg.push(`第${item.row}行的"${item.symbol}"`);
-            }
-            this.$message({
-              dangerouslyUseHTMLString: true,
-              message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-              type: "error"
-            });
-            return;
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            type: "error"
+          });
+          return;
+        }
+        if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+          let msg = [];
+          for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+            msg.push(`第${item.row}行的"${item.symbol}"`);
           }
-          if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-            let msg = [];
-            for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-              msg.push(`第${item.row}行的"${item.symbol}"`);
-            }
-            this.$message({
-              dangerouslyUseHTMLString: true,
-              message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-              type: "error"
-            });
-            return;
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            type: "error"
+          });
+          return;
+        }
+        if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+          let msg = [];
+          for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+            msg.push(`第${item.row}行的"${item.symbol}"`);
           }
-          if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-            let msg = [];
-            for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-              msg.push(`第${item.row}行的"${item.symbol}"`);
-            }
-            this.$message({
-              dangerouslyUseHTMLString: true,
-              message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-              type: "error"
-            });
-            return;
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            type: "error"
+          });
+          return;
+        }
+        if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+          let msg = [];
+          for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+            msg.push(`第${item.row}行的"${item.symbol}"`);
           }
-          if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-            let msg = [];
-            for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-              msg.push(`第${item.row}行的"${item.symbol}"`);
-            }
-            this.$message({
-              dangerouslyUseHTMLString: true,
-              message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-              type: "error"
-            });
-            return;
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            type: "error"
+          });
+          return;
+        }
+        if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+          let msg = [];
+          for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+            msg.push(`第${item.row}行的"${item.symbol}"`);
           }
+          this.$message({
+            dangerouslyUseHTMLString: true,
+            message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+            type: "error"
+          });
+          return;
+        }
+        if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+          return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
         }
+        if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+          return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
+        }
+        if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+          return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
+        }
+
         if (!this.form.preContainersList.length) {
           return this.$message.error("集装箱明细不能为空");
         }
@@ -2728,67 +2738,75 @@ export default {
           if (!this.form.detail.hnotifyDetails) {
             return this.$message.error("请输入通知人提单描述");
           }
-          if (this.verifySymbolStatus == 1) {
-            if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
+
+          if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+            let msg = [];
+            for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+              msg.push(`第${item.row}行的"${item.symbol}"`);
             }
-            if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
+            this.$message({
+              dangerouslyUseHTMLString: true,
+              message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+              type: "error"
+            });
+            return;
+          }
+          if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+            let msg = [];
+            for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+              msg.push(`第${item.row}行的"${item.symbol}"`);
             }
-            if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
+            this.$message({
+              dangerouslyUseHTMLString: true,
+              message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+              type: "error"
+            });
+            return;
+          }
+          if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+            let msg = [];
+            for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+              msg.push(`第${item.row}行的"${item.symbol}"`);
             }
-            if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
+            this.$message({
+              dangerouslyUseHTMLString: true,
+              message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+              type: "error"
+            });
+            return;
+          }
+          if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+            let msg = [];
+            for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+              msg.push(`第${item.row}行的"${item.symbol}"`);
             }
-            if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
+            this.$message({
+              dangerouslyUseHTMLString: true,
+              message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+              type: "error"
+            });
+            return;
+          }
+          if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+            let msg = [];
+            for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+              msg.push(`第${item.row}行的"${item.symbol}"`);
             }
+            this.$message({
+              dangerouslyUseHTMLString: true,
+              message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+              type: "error"
+            });
+            return;
+          }
+          if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+            return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
+          }
+          if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+            return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
+          }
+          if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+            return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
           }
 
           for (let row of this.form.preContainersList) {

+ 146 - 129
src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -898,7 +898,7 @@ import _ from "lodash";
 import { Header } from "element-ui";
 import { dateFormat } from "@/util/date";
 import { isProcurement } from "@/api/basicData/configuration";
-import { verifyEnglish, checkFullWidthSymbols } from "@/util/date";
+import { verifyEnglish, checkFullWidthSymbols, lineQuantityVerification } from "@/util/date";
 export default {
   name: "detailsPage",
   data() {
@@ -1482,7 +1482,7 @@ export default {
       roleName: [],
       saberUserInfo: null,
       deptId: JSON.parse(localStorage.getItem("sysitemData")).deptId,
-      verifySymbolStatus: 0
+      lineLength: 35
     };
   },
   components: {
@@ -1504,8 +1504,10 @@ export default {
     isProcurement({ param: "import.template" }).then(res => {
       this.importTemplate = res.data.data;
     });
-    isProcurement({ param: "verify.symbol" }).then(res => {
-      this.verifySymbolStatus = res.data.data;
+    isProcurement({ param: "line.length" }).then(res => {
+      if (res.data.data) {
+        this.lineLength = res.data.data;
+      }
     });
     if (this.detailData && this.detailData.id) {
       this.getDetails(this.detailData.id);
@@ -1999,9 +2001,9 @@ export default {
             if (!item.id) {
               return this.$message.error("请保存数据");
             }
-            if (!item.srcCostId) {
-              return this.$message.error("价格编号不能为空,请提取价格维护价格编号");
-            }
+            // if (!item.srcCostId) {
+            //   return this.$message.error("价格编号不能为空,请提取价格维护价格编号");
+            // }
             if (Number(item.oceanFreight) < Number(item.salesPrice)) {
               return this.$message.error("集装箱的海运费低于销售价,请点击运费申请");
             }
@@ -2249,67 +2251,74 @@ export default {
       this.$refs["form"].validate(valid => {
         console.log(valid, this.form);
         if (valid) {
-          if (this.verifySymbolStatus == 1) {
-            if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
-            }
-            if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
-            }
-            if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
-            }
-            if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
-            }
-            if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-              let msg = [];
-              for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-                msg.push(`第${item.row}行的"${item.symbol}"`);
-              }
-              this.$message({
-                dangerouslyUseHTMLString: true,
-                message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-                type: "error"
-              });
-              return;
-            }
+          // if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+          //   let msg = [];
+          //   for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+          //     msg.push(`第${item.row}行的"${item.symbol}"`);
+          //   }
+          //   this.$message({
+          //     dangerouslyUseHTMLString: true,
+          //     message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+          //     type: "error"
+          //   });
+          //   return;
+          // }
+          // if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+          //   let msg = [];
+          //   for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+          //     msg.push(`第${item.row}行的"${item.symbol}"`);
+          //   }
+          //   this.$message({
+          //     dangerouslyUseHTMLString: true,
+          //     message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+          //     type: "error"
+          //   });
+          //   return;
+          // }
+          // if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+          //   let msg = [];
+          //   for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+          //     msg.push(`第${item.row}行的"${item.symbol}"`);
+          //   }
+          //   this.$message({
+          //     dangerouslyUseHTMLString: true,
+          //     message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+          //     type: "error"
+          //   });
+          //   return;
+          // }
+          // if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+          //   let msg = [];
+          //   for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+          //     msg.push(`第${item.row}行的"${item.symbol}"`);
+          //   }
+          //   this.$message({
+          //     dangerouslyUseHTMLString: true,
+          //     message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+          //     type: "error"
+          //   });
+          //   return;
+          // }
+          // if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+          //   let msg = [];
+          //   for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+          //     msg.push(`第${item.row}行的"${item.symbol}"`);
+          //   }
+          //   this.$message({
+          //     dangerouslyUseHTMLString: true,
+          //     message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+          //     type: "error"
+          //   });
+          //   return;
+          // }
+          if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+            return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
+          }
+          if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+            return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
+          }
+          if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+            return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
           }
 
           for (let row of this.form.preContainersList) {
@@ -2352,68 +2361,76 @@ export default {
       });
     },
     application() {
-      if (this.verifySymbolStatus == 1) {
-        if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
-          let msg = [];
-          for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
-            msg.push(`第${item.row}行的"${item.symbol}"`);
-          }
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-        if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
-          let msg = [];
-          for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
-            msg.push(`第${item.row}行的"${item.symbol}"`);
-          }
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-        if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
-          let msg = [];
-          for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
-            msg.push(`第${item.row}行的"${item.symbol}"`);
-          }
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-        if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
-          let msg = [];
-          for (let item of checkFullWidthSymbols(this.form.marks).positions) {
-            msg.push(`第${item.row}行的"${item.symbol}"`);
-          }
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
-        if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
-          let msg = [];
-          for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
-            msg.push(`第${item.row}行的"${item.symbol}"`);
-          }
-          this.$message({
-            dangerouslyUseHTMLString: true,
-            message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
-            type: "error"
-          });
-          return;
-        }
+      // if (checkFullWidthSymbols(this.form.detail.hshipperDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hshipperDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `发货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.hconsigneeDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hconsigneeDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `收货人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.detail.hnotifyDetails).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.detail.hnotifyDetails).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `通知人:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.marks).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.marks).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `唛头:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      // if (checkFullWidthSymbols(this.form.commodityDescr).hasFullWidth) {
+      //   let msg = [];
+      //   for (let item of checkFullWidthSymbols(this.form.commodityDescr).positions) {
+      //     msg.push(`第${item.row}行的"${item.symbol}"`);
+      //   }
+      //   this.$message({
+      //     dangerouslyUseHTMLString: true,
+      //     message: `货描:<br>${msg.join(";<br>")}<br>存在全角或汉字符号、汉字,请确认`,
+      //     type: "error"
+      //   });
+      //   return;
+      // }
+      if (lineQuantityVerification(this.form.detail.hshipperDetails, this.lineLength)) {
+        return this.$message.error(`发货人详情超长,请手动断行,否则影响打印`);
+      }
+      if (lineQuantityVerification(this.form.detail.hconsigneeDetails, this.lineLength)) {
+        return this.$message.error(`收货人详情超长,请手动断行,否则影响打印`);
       }
+      if (lineQuantityVerification(this.form.detail.hnotifyDetails, this.lineLength)) {
+        return this.$message.error(`通知人详情超长,请手动断行,否则影响打印`);
+      }
+
       if (!this.form.preContainersList.length) {
         return this.$message.error("集装箱明细不能为空");
       }