|
|
@@ -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 = []
|