zelian_wu
/
ckt-leble-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

roll label

dev
qiezi 1 year ago
parent
b7e4edf2c8
commit
b7a6d58bec
8 changed files with 55 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/factory/site.js
  2. 4
      src/printFormat/RF_RFID.js
  3. 4
      src/printFormat/alphaHardTagPrintFormat.js
  4. 4
      src/printFormat/antenna.js
  5. 26
      src/views/modules/factory/tblbasedata.vue
  6. 2
      src/views/modules/label/printer.vue
  7. 1
      src/views/modules/label/record.vue
  8. 43
      src/views/modules/part/external.vue

2
src/api/factory/site.js
View File

@ -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)

4
src/printFormat/RF_RFID.js
View File

@ -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,`<img src="${icons[i].icon}" style="object-fit: contain"/>`);
LODOP.ADD_PRINT_IMAGE(149,(printTop+i*40),37,31,`<img src="${icons[i].icon}" style="object-fit: contain"/>`);
LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
}
LODOP.PRINT();

4
src/printFormat/alphaHardTagPrintFormat.js
View File

@ -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,`<img src="${icons[i].icon}" style="object-fit: contain"/>`);
LODOP.ADD_PRINT_IMAGE(149,(printTop+i*40),37,31,`<img src="${icons[i].icon}" style="object-fit: contain"/>`);
LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
}
LODOP.PRINT();

4
src/printFormat/antenna.js
View File

@ -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, `<img src="${icons[i].icon}" style="object-fit: contain"/>`)
LODOP.ADD_PRINT_IMAGE(149, (printTop + i * 40), 37, 31, `<img src="${icons[i].icon}" style="object-fit: contain"/>`)
LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2)
}
}

26
src/views/modules/factory/tblbasedata.vue
View File

@ -542,23 +542,23 @@ export default {
<el-input v-model="siteForm.email" ></el-input>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="Contact Phone No" prop="phoneNo" :show-message="false">
<el-input v-model="siteForm.phoneNo"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-col :span="18">-->
<!-- <el-form-item label="Contact Phone No" prop="phoneNo" :show-message="false">-->
<!-- <el-input v-model="siteForm.phoneNo"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="Default Country" prop="defaultCountry" :show-message="false">-->
<!-- <el-select v-model="siteForm.defaultCountry" placeholder="" style="width: 100%">-->
<!-- <el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item label="Contact Phone No" prop="phoneNo" :show-message="false">
<el-input v-model="siteForm.phoneNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="Default Country" prop="defaultCountry" :show-message="false">
<el-select v-model="siteForm.defaultCountry" placeholder="" style="width: 100%">
<el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" " :show-message="false">
<el-checkbox v-model="siteForm.active" true-label="Y" false-label="N">Active</el-checkbox>

2
src/views/modules/label/printer.vue
View File

@ -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}`,

1
src/views/modules/label/record.vue
View File

@ -407,6 +407,7 @@ export default {
manufacturer: item.manufacturerNo,
moldCode: item.moldCode,
sn: item.serialNumber,
freeInfo2:item.freeInfo2,
}
})

43
src/views/modules/part/external.vue
View File

@ -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 {
</el-form-item>
</el-col>
<el-col :span="17">
<el-form-item label="Free Info1" :show-message="false">
<el-input v-model="savePart.freeInfo"></el-input>
</el-form-item>
<!-- <el-form-item label="Free Info" :show-message="false">-->
<!-- <el-form-item label="Free Info1" :show-message="false">-->
<!-- <el-input v-model="savePart.freeInfo"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="Free Info" :show-message="false">
<el-input v-model="savePart.freeInfo"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label=" " :show-message="false">
<el-checkbox v-model="savePart.active" true-label="Y" false-label="N">Active</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="17">
<el-form-item label="Free Info2" :show-message="false">
<el-input v-model="savePart.freeInfo2"></el-input>
<!-- <el-col :span="17">-->
<!-- <el-form-item label="Free Info2" :show-message="false">-->
<!-- <el-input v-model="savePart.freeInfo2"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="7">
<el-form-item label="OOC" :show-message="false" prop="freeInfo2">
<el-select v-model="savePart.freeInfo2" placeholder="" style="width: 100%">
<el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-form-item label="OOC" :show-message="false" prop="freeInfo2">-->
<!-- <el-select v-model="savePart.freeInfo2" placeholder="" style="width: 100%">-->
<!-- <el-option v-for="item in countryList" :label="item.countryNo" :value="item.countryNo" :key="item.countryNo"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

Write Preview
Loading…
Cancel
Save