diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue
index 202161a..05e021a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printDialog.vue
@@ -51,7 +51,11 @@ const bomCodes = ref('')
const open = async ( vals) => {
- cnenList.value = vals;
+ const sortedVals = [...vals].sort((a, b) => {
+ return a.id - b.id;
+ });
+ cnenList.value = sortedVals;
+
specarr.value = []
console.log(vals)
datavals.value = []
@@ -74,7 +78,9 @@ const open = async ( vals) => {
await Promise.all(
printCodeName.value.map(async (item) => {
- const qrCodeData = await QRCode.toDataURL(item.name)
+ const qrCodeData = await QRCode.toDataURL(item.name,{
+ errorCorrectionLevel: 'H'
+})
const qrCodeElement = document.getElementById('qrCodeContainer')
if (qrCodeElement) {
(qrCodeElement.innerHTML +=
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue
index 7a96925..67c6f2d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/printFinalDialog.vue
@@ -184,7 +184,9 @@ const open = async ( vals) => {
await Promise.all(
printCodeName.value.map(async (item) => {
- const qrCodeData = await QRCode.toDataURL(item.name)
+ const qrCodeData = await QRCode.toDataURL(item.name,{
+ errorCorrectionLevel: 'H'
+})
const qrCodeElement = document.getElementById('qrCodeContainer1')
if (qrCodeElement) {
(qrCodeElement.innerHTML +=
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printDialog.vue
index da1da2f..2e27f1d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printDialog.vue
@@ -51,14 +51,36 @@ const bomCodes = ref('')
const open = async (bomCode, vals) => {
- cnenList.value = vals;
+ const sortedVals = [...vals].sort((a, b) => {
+ const aParts = a.blueprintNo.split('-').map(part => parseInt(part) || part);
+ const bParts = b.blueprintNo.split('-').map(part => parseInt(part) || part);
+
+ // 逐段比较
+ for (let i = 0; i < Math.max(aParts.length, bParts.length); i++) {
+ const aPart = aParts[i] || 0; // 如果某段不存在,视为 0
+ const bPart = bParts[i] || 0;
+
+ // 如果当前段是数字,按数字比较
+ if (typeof aPart === 'number' && typeof bPart === 'number') {
+ if (aPart !== bPart) return aPart - bPart;
+ }
+ // 如果当前段是字符串,按字典序比较
+ else {
+ if (aPart !== bPart) return String(aPart).localeCompare(String(bPart));
+ }
+ }
+
+ // 如果所有段都相同,按原始字符串比较
+ return a.blueprintNo.localeCompare(b.blueprintNo);
+ })
+
+ cnenList.value = sortedVals;
bomCodes.value = bomCode;
specarr.value = []
- console.log(vals)
datavals.value = []
printCodeName.value = []
- vals.forEach((item) => {
+ sortedVals.forEach((item) => {
const row = {
blueprintNo: item.blueprintNo,
}
@@ -78,7 +100,9 @@ const open = async (bomCode, vals) => {
var i = 0;
await Promise.all(
printCodeName.value.map(async (item) => {
- const qrCodeData = await QRCode.toDataURL(item.name)
+ const qrCodeData = await QRCode.toDataURL(item.name,{
+ errorCorrectionLevel: 'H'
+})
const qrCodeElement = document.getElementById('qrCodeContainer')
if (qrCodeElement) {
(qrCodeElement.innerHTML +=
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printFinalDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printFinalDialog.vue
index 7b25d2d..cf5753f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printFinalDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/printFinalDialog.vue
@@ -188,7 +188,9 @@ const open = async (bomCode, vals) => {
await Promise.all(
printCodeName.value.map(async (item) => {
- const qrCodeData = await QRCode.toDataURL(item.name)
+ const qrCodeData = await QRCode.toDataURL(item.name,{
+ errorCorrectionLevel: 'H'
+})
const qrCodeElement = document.getElementById('qrCodeContainer1')
if (qrCodeElement) {
(qrCodeElement.innerHTML +=
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
index a7b7ade..f8a0606 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/printDialog.vue
@@ -10,20 +10,19 @@