客户托书 客户订舱新加特殊符号校验 海运出口去掉汉字校验

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1661,37 +1661,37 @@ export default {
         });
         return;
       }
-      if (!verifyEnglish(this.form.detail.hshipperDetails)) {
-        msgsList.push("发货人");
-      }
-      if (!verifyEnglish(this.form.detail.hconsigneeDetails)) {
-        msgsList.push("收货人");
-      }
-      if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
-        msgsList.push("通知人");
-      }
-      if (!verifyEnglish(this.form.detail.mshipperDetails)) {
-        msgsList.push("MBL 发货人");
-      }
-      if (!verifyEnglish(this.form.detail.mconsigneeDetails)) {
-        msgsList.push("MBL 收货人");
-      }
-      if (!verifyEnglish(this.form.detail.mnotifyDetails)) {
-        msgsList.push("MBL 通知人");
-      }
-      if (!verifyEnglish(this.form.marks)) {
-        msgsList.push("唛头");
-      }
-      if (!verifyEnglish(this.form.commodityDescr)) {
-        msgsList.push("货描");
-      }
-      if (!verifyEnglish(this.form.forwarding)) {
-        msgsList.push("FORWARDING");
-      }
-      if (msgsList.length > 0) {
-        this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
-        return;
-      }
+      // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
+      //   msgsList.push("发货人");
+      // }
+      // if (!verifyEnglish(this.form.detail.hconsigneeDetails)) {
+      //   msgsList.push("收货人");
+      // }
+      // if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
+      //   msgsList.push("通知人");
+      // }
+      // if (!verifyEnglish(this.form.detail.mshipperDetails)) {
+      //   msgsList.push("MBL 发货人");
+      // }
+      // if (!verifyEnglish(this.form.detail.mconsigneeDetails)) {
+      //   msgsList.push("MBL 收货人");
+      // }
+      // if (!verifyEnglish(this.form.detail.mnotifyDetails)) {
+      //   msgsList.push("MBL 通知人");
+      // }
+      // if (!verifyEnglish(this.form.marks)) {
+      //   msgsList.push("唛头");
+      // }
+      // if (!verifyEnglish(this.form.commodityDescr)) {
+      //   msgsList.push("货描");
+      // }
+      // if (!verifyEnglish(this.form.forwarding)) {
+      //   msgsList.push("FORWARDING");
+      // }
+      // if (msgsList.length > 0) {
+      //   this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
+      //   return;
+      // }
       this.saveLoading = true;
       editypesSendingEdi(row)
         .then(res => {
@@ -2618,38 +2618,38 @@ export default {
               }
             }
             // console.log(this.form.detail);
-            if (!verifyEnglish(this.form.detail.hshipperDetails)) {
-              msgsList.push("发货人");
-            }
-            if (!verifyEnglish(this.form.detail.hconsigneeDetails)) {
-              msgsList.push("收货人");
-            }
-            if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
-              msgsList.push("通知人");
-            }
-            if (!verifyEnglish(this.form.detail.mshipperDetails)) {
-              msgsList.push("MBL 发货人");
-            }
-            if (!verifyEnglish(this.form.detail.mconsigneeDetails)) {
-              msgsList.push("MBL 收货人");
-            }
-            if (!verifyEnglish(this.form.detail.mnotifyDetails)) {
-              msgsList.push("MBL 通知人");
-            }
-            if (!verifyEnglish(this.form.marks)) {
-              msgsList.push("唛头");
-            }
-            if (!verifyEnglish(this.form.commodityDescr)) {
-              msgsList.push("货描");
-            }
-            if (!verifyEnglish(this.form.forwarding)) {
-              msgsList.push("FORWARDING");
-            }
-            if (msgsList.length > 0) {
-              // this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
-              this.$message.error(`${msgsList.join(",")}存在非英文字符，如汉字等，请修正后再保存！`);
-              return;
-            }
+            // if (!verifyEnglish(this.form.detail.hshipperDetails)) {
+            //   msgsList.push("发货人");
+            // }
+            // if (!verifyEnglish(this.form.detail.hconsigneeDetails)) {
+            //   msgsList.push("收货人");
+            // }
+            // if (!verifyEnglish(this.form.detail.hnotifyDetails)) {
+            //   msgsList.push("通知人");
+            // }
+            // if (!verifyEnglish(this.form.detail.mshipperDetails)) {
+            //   msgsList.push("MBL 发货人");
+            // }
+            // if (!verifyEnglish(this.form.detail.mconsigneeDetails)) {
+            //   msgsList.push("MBL 收货人");
+            // }
+            // if (!verifyEnglish(this.form.detail.mnotifyDetails)) {
+            //   msgsList.push("MBL 通知人");
+            // }
+            // if (!verifyEnglish(this.form.marks)) {
+            //   msgsList.push("唛头");
+            // }
+            // if (!verifyEnglish(this.form.commodityDescr)) {
+            //   msgsList.push("货描");
+            // }
+            // if (!verifyEnglish(this.form.forwarding)) {
+            //   msgsList.push("FORWARDING");
+            // }
+            // if (msgsList.length > 0) {
+            //   // this.$message.error(`请正确输入${msgsList.join(",")}的英文`);
+            //   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);

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -1056,6 +1056,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";
 export default {
   name: "detailsPage",
   data() {
@@ -1659,11 +1660,11 @@ export default {
       }
       deptGetDetailPol(this.saberUserInfo.dept_pid.split(",")[0]).then(res => {
         // 装货港
-        this.form.polCnName = res.data.data.polCnName
-        this.form.polEnName = res.data.data.polEnName
-        this.form.polId = res.data.data.polId
-        this.form.polCode = res.data.data.polCode
-        this.form.polNamePrint = res.data.data.polEnName
+        this.form.polCnName = res.data.data.polCnName;
+        this.form.polEnName = res.data.data.polEnName;
+        this.form.polId = res.data.data.polId;
+        this.form.polCode = res.data.data.polCode;
+        this.form.polNamePrint = res.data.data.polEnName;
       });
     }
 
@@ -2383,6 +2384,66 @@ export default {
         });
       }
       if (name == "提交订舱") {
+        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 (!this.form.preContainersList.length) {
           return this.$message.error("集装箱明细不能为空");
         }
@@ -2484,25 +2545,25 @@ export default {
         submit(this.form).then(res => {
           this.form = res.data.data;
           this.$confirm("是否提单确认?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          const loading = this.$loading({
-            lock: true,
-            text: "加载中",
-            spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
-          });
-          submitConfirm(this.form)
-            .then(res => {
-              this.$message.success("操作成功");
-              this.getDetails(this.form.id);
-            })
-            .finally(() => {
-              loading.close();
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: "加载中",
+              spinner: "el-icon-loading",
+              background: "rgba(255,255,255,0.7)"
             });
-        });
+            submitConfirm(this.form)
+              .then(res => {
+                this.$message.success("操作成功");
+                this.getDetails(this.form.id);
+              })
+              .finally(() => {
+                loading.close();
+              });
+          });
         });
       }
       if (name == "模板保存") {
@@ -2597,6 +2658,66 @@ export default {
           if (!this.form.detail.hnotifyDetails) {
             return this.$message.error("请输入通知人提单描述");
           }
+          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;
+          }
           for (let row of this.form.preContainersList) {
             if (!row.cntrTypeCode || !row.quantity) {
               this.$refs.crud.rowCell(row, row.$index);

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -426,10 +426,7 @@
                   </el-row>
                   <el-row>
                     <el-col span="12">
-                      <el-form-item
-                        label="HS CODE"
-                        prop="hscode"
-                      >
+                      <el-form-item label="HS CODE" prop="hscode">
                         <el-input
                           style="width: 100%;"
                           v-model="form.hscode"
@@ -441,10 +438,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col span="12">
-                      <el-form-item
-                        label=""
-                        prop="commodityCnName"
-                      >
+                      <el-form-item label="" prop="commodityCnName">
                         <el-input
                           style="width: 100%;"
                           v-model="form.commodityCnName"
@@ -901,6 +895,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";
 export default {
   name: "detailsPage",
   data() {
@@ -2197,6 +2192,66 @@ export default {
       this.$refs["form"].validate(valid => {
         console.log(valid, this.form);
         if (valid) {
+          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;
+          }
           for (let row of this.form.preContainersList) {
             if (!row.cntrTypeCode || !row.quantity) {
               this.$refs.crud.rowCell(row, row.$index);
@@ -2236,6 +2291,66 @@ export default {
       });
     },
     application() {
+            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 (!this.form.preContainersList.length) {
         return this.$message.error("集装箱明细不能为空");
       }