diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js
index 78b3c79..e3f9822 100644
--- a/src/printFormat/alphaHardTagPrintFormat.js
+++ b/src/printFormat/alphaHardTagPrintFormat.js
@@ -47,6 +47,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ // LODOP.ADD_PRINT_HTM(50,175,186,35,`
${row.desc}
`);
LODOP.ADD_PRINT_TEXT(50,175,186,35,row.desc);
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
@@ -89,7 +90,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
if (row.weightUmName && row.weight){
- LODOP.ADD_PRINT_TEXT(86,250,50,20,"WEIGHT");
+ LODOP.ADD_PRINT_TEXT(86,230,80,20,"WEIGHT");
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue
index 7935a70..b079ae7 100644
--- a/src/views/modules/label/printer.vue
+++ b/src/views/modules/label/printer.vue
@@ -753,7 +753,7 @@ export default {
freeInfo2: item.freeInfo2,
tradingMark: item.tradingMark,
weightUmName: item.weightUmName,
- weight: item.packingWeight * item.qtyPerCarton,
+ weight: new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber(),
}
});
// let value = this.printCurrentPart.totalShipQty % this.printCurrentPart.qtyPerCarton
diff --git a/src/views/modules/label/record.vue b/src/views/modules/label/record.vue
index 86c3864..2eff968 100644
--- a/src/views/modules/label/record.vue
+++ b/src/views/modules/label/record.vue
@@ -10,6 +10,7 @@ import {printRF_RFIDLabel} from '../../../printFormat/RF_RFID'
import {selectLabelFormatUserDefaultPrintListByUserId} from '../../../api/label/labelFormatUserDefault'
import getLodop from '@/utils/LodopFuncs.js'
import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table'
+import {Decimal} from 'decimal.js'
const printRecord = {
customerNo: '',
@@ -410,7 +411,7 @@ export default {
freeInfo2:item.freeInfo2,
tradingMark: item.tradingMark,
weightUmName: item.weightUmName,
- weight: item.packingWeight * item.qtyPerCarton,
+ weight: new Decimal(item.packingWeight).mul(item.qtyPerCarton).toNumber(),
}
})
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index be0c0a3..c4ecafb 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -2,7 +2,10 @@
-
+
+
+
+
@@ -220,7 +223,8 @@ export default {
saveButton: false,
},
dataForm: {
- userName: '',
+ username: '',
+ userDisplay: '',
site: '',
},
columnList: [