diff --git a/src/api/factory/site.js b/src/api/factory/site.js
index a0eb65a..7ba8215 100644
--- a/src/api/factory/site.js
+++ b/src/api/factory/site.js
@@ -7,3 +7,5 @@ export const removeSite = data => createAPI(`/site/remove`,'post',data)
export const saveSite = data => createAPI(`/site/save`,'post',data)
export const updateSite = data => createAPI(`/site/update`,'post',data)
+export const getSiteDetail = data => createAPI(`/site/${data}`,'post',data)
+
diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js
index b9dc263..b97381e 100644
--- a/src/printFormat/RF_RFID.js
+++ b/src/printFormat/RF_RFID.js
@@ -51,11 +51,11 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
LODOP.ADD_PRINT_TEXT(104,202,100,20,row.rollCount);
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
if(rightIndex === 'Y'){
- LODOP.ADD_PRINT_TEXT(152,255,115,20,"MADE IN CHINA");
+ LODOP.ADD_PRINT_TEXT(152,255,115,20,`${row.freeInfo2}`);
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
}
for(let i = 0; i < icons.length; i++){
- LODOP.ADD_PRINT_IMAGE(149,(printTop+i*50),37,31,`
`);
+ LODOP.ADD_PRINT_IMAGE(149,(printTop+i*40),37,31,``);
LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
}
LODOP.PRINT();
diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js
index 74192d2..70f97aa 100644
--- a/src/printFormat/alphaHardTagPrintFormat.js
+++ b/src/printFormat/alphaHardTagPrintFormat.js
@@ -77,11 +77,11 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
if(rightIndex === 'Y'){
- LODOP.ADD_PRINT_TEXT(152,255,115,20,"MADE IN CHINA");
+ LODOP.ADD_PRINT_TEXT(152,255,115,20,`${row.freeInfo2}`);
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
}
for(let i = 0; i < icons.length; i++){
- LODOP.ADD_PRINT_IMAGE(149,(printTop+i*50),37,31,``);
+ LODOP.ADD_PRINT_IMAGE(149,(printTop+i*40),37,31,``);
LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
}
LODOP.PRINT();
diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js
index 5460d9a..f67b3af 100644
--- a/src/printFormat/antenna.js
+++ b/src/printFormat/antenna.js
@@ -55,11 +55,11 @@ export const printAntennaLabel = (printList, icons, printerName) => {
LODOP.ADD_PRINT_TEXT(128, 176, 180, 20, row.sn)
LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
if (rightIndex === 'Y') {
- LODOP.ADD_PRINT_TEXT(152, 255, 115, 20, 'MADE IN CHINA')
+ LODOP.ADD_PRINT_TEXT(152, 255, 115, 20, `${row.freeInfo2}`)
LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
}
for (let i = 0; i < icons.length; i++) {
- LODOP.ADD_PRINT_IMAGE(149, (printTop + i * 50), 37, 31, ``)
+ LODOP.ADD_PRINT_IMAGE(149, (printTop + i * 40), 37, 31, ``)
LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2)
}
}
diff --git a/src/views/modules/factory/tblbasedata.vue b/src/views/modules/factory/tblbasedata.vue
index b7e8989..d240a33 100644
--- a/src/views/modules/factory/tblbasedata.vue
+++ b/src/views/modules/factory/tblbasedata.vue
@@ -542,23 +542,23 @@ export default {
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Active
diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue
index f3f0956..c7a396a 100644
--- a/src/views/modules/label/printer.vue
+++ b/src/views/modules/label/printer.vue
@@ -694,6 +694,7 @@ export default {
manufacturer: item.manufacturerNo,
moldCode: item.moldCode,
sn: item.serialNumber,
+ freeInfo2: item.freeInfo2,
}
});
// let value = this.printCurrentPart.totalShipQty % this.printCurrentPart.qtyPerCarton
@@ -869,6 +870,7 @@ export default {
savePrintRollLabelRecord(params).then(({data})=>{
if (data && data.code === 0) {
let labelList = this.labelFormatList.filter((item)=> item.labelType === 'Roll Label')
+ console.log(labelList)
let prints = data.rows.map((item) => {
return {
qrCode: `(00)${item.partNo}(01)${item.qtyPerRoll}(02)${item.umName}(03)${item.manufacturerDate}(04)${item.serialNumber? item.serialNumber : ''}(05)${item.manufacturerNo? item.manufacturerNo : ''}(06)${item.moldCode? item.moldCode : ''}(07)(08)${item.rollNo}`,
diff --git a/src/views/modules/label/record.vue b/src/views/modules/label/record.vue
index 6a6f2f6..7337f55 100644
--- a/src/views/modules/label/record.vue
+++ b/src/views/modules/label/record.vue
@@ -407,6 +407,7 @@ export default {
manufacturer: item.manufacturerNo,
moldCode: item.moldCode,
sn: item.serialNumber,
+ freeInfo2:item.freeInfo2,
}
})
diff --git a/src/views/modules/part/external.vue b/src/views/modules/part/external.vue
index 91e70d2..595819b 100644
--- a/src/views/modules/part/external.vue
+++ b/src/views/modules/part/external.vue
@@ -17,6 +17,7 @@ import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../ap
import {Decimal} from 'decimal.js'
import {getCategoryList} from '../../../api/category/category'
import {countryList} from '../../../api/dict/country'
+import {getSiteDetail} from '../../../api/factory/site'
let part = {
site:'',
@@ -835,6 +836,7 @@ export default {
serialNumberRequired: 'N',
}
this.getCountryList();
+ this.savePart.freeInfo2 = this.defaultCountry
this.savePart.category = this.partCategoryList.length > 0 ? this.partCategoryList[0].categoryValue : ''
this.savePartVisible = true;
}
@@ -1051,6 +1053,20 @@ export default {
}).catch((error)=>{
this.$message.error(error)
})
+ },
+ getUserSiteDefaultCountry(){
+ let params = this.$store.state.user.site
+ getSiteDetail(params).then(({data})=>{
+ if (data && data.code === 0){
+ if (data.row && data.row.defaultCountry){
+ this.defaultCountry = data.row.defaultCountry
+ }
+ }else {
+ this.$message.warning(data.msg)
+ }
+ }).catch((error)=>{
+ this.$message.error(error)
+ })
}
},
computed:{
@@ -1061,6 +1077,7 @@ export default {
this.getCategoryList();
// this.getCountryList();
this.selectExternalPartList();
+ this.getUserSiteDefaultCountry();
this.getTableUserColumn("10002Table", 1)
this.getTableUserColumn("10002Table2", 2)
this.getTableUserColumn("10002Table3", 3)
@@ -1199,28 +1216,30 @@ export default {
-
-
-
-
+
+
+
+
Active
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-