zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcdsj:34a80119e6a278310f581db1ba70e31006fb45e7
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916
..
compare: zcdsj:d2b0ed6f67c85d9ea25a6d0942feb3a56db65d47
Branches Tags
zcdsj:master
zcdsj:gzerp
zcdsj:base
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916

No commits in common. "34a80119e6a278310f581db1ba70e31006fb45e7" and "d2b0ed6f67c85d9ea25a6d0942feb3a56db65d47" have entirely different histories.
34a80119e6 ... d2b0ed6f67

2 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

6
src/views/wpm_bx/inmIn.vue
View File

@ -557,10 +557,9 @@ export default {
params.tid = row.id;
let materialname = row.material_.name + '|' + row.material_.process_name;
let specification = row.material_.specification;
if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'||that.route_code=='tuomoceliang'){
if(that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){
params.label_template_name = '工序带板段号打印模板';
that.wprParams.wm = row.id;
let totalcount = 0;
let numbers = ['','','','','','',''];
this.$API.wpm.wpr.list.req(that.wprParams).then((res) => {
let leng = res.length;
@ -572,7 +571,6 @@ export default {
}
}
if(leng>0){
totalcount = leng*slice_count;
let nums = leng/3;
for(let i=0;i<nums;i++){
let index = i*3;
@ -585,7 +583,7 @@ export default {
}
}
}
params.extra_data={orimaterial:row.material_ofrom_name,materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,totalcount:totalcount,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]};
params.extra_data={orimaterial:row.material_ofrom_name,materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]};
that.apiObjPrint.req(params).then((res) => {
let obj = {};
obj.printer_commands = res.commands;

6
src/views/wpm_bx/inmOut.vue
View File

@ -586,11 +586,10 @@ export default {
params.tid = row.id;
let materialname = row.material_.name + '|' + row.material_.process_name;
let specification = row.material_.specification;
if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='tuomoceliang'){
if(that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'){
console.log('route_code',that.route_code);
params.label_template_name = '工序带板段号打印模板';
that.wprParams.wm = row.id;
let totalcount = 0;
let numbers = ['','','','','','',''];
this.$API.wpm.wpr.list.req(that.wprParams).then((res) => {
let leng = res.length;
@ -602,7 +601,6 @@ export default {
}
}
if(leng>0){
totalcount = leng*slice_count;
let nums = leng/3;
for(let i=0;i<nums;i++){
let index = i*3;
@ -615,7 +613,7 @@ export default {
}
}
}
params.extra_data={orimaterial:row.material_ofrom_name,materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,totalcount:totalcount,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]};
params.extra_data={orimaterial:row.material_ofrom_name,materialname:materialname,specification:specification,count:row.count,slicecount:slice_count,numbers0:numbers[0],numbers1:numbers[1],numbers2:numbers[2],numbers3:numbers[3],numbers4:numbers[4],numbers5:numbers[5],numbers6:numbers[6]};
that.apiObjPrint.req(params).then((res) => {
let obj = {};
obj.printer_commands = res.commands;