north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -65,17 +65,14 @@ list.value = deepClone(res.data.data) const data = produceList.value[0].value dataList = JSON.parse(`[${data}]`); console.log(switchType) if (switchType===true){ labelList = props.titleList }else { labelList = dataList[0] } labelList = dataList[0] for (let i = 0; i < list.value.length; i++) { let count = list.value[i].data.length for (let j = 0; j < count; j++) { for (let k = 0; k < list.value[i].data[j].quantity; k++) { props.lastList.push(list.value[i].data[j]) lastList.value.push(list.value[i].data[j]) } } } north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -65,17 +65,14 @@ list.value = deepClone(res.data.data) const data = produceList.value[0].value dataList = JSON.parse(`[${data}]`); console.log(switchType) if (switchType===true){ labelList = props.titleList }else { labelList = dataList[0] } labelList = dataList[0] for (let i = 0; i < list.value.length; i++) { let count = list.value[i].data.length for (let j = 0; j < count; j++) { for (let k = 0; k < list.value[i].data[j].quantity; k++) { props.lastList.push(list.value[i].data[j]) lastList.value.push(list.value[i].data[j]) } } } north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -411,7 +411,10 @@ id += selectRecords[i].id + "|" } } router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}}) router.push({ path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords),printType:2} }) break } @@ -431,7 +434,7 @@ } router.push({ path: '/main/processCard/PrintCustomLabelSemi2', query: {printList: JSON.stringify(selectRecords)} query: {printList: JSON.stringify(selectRecords),printType:2} }) break @@ -483,7 +486,7 @@ } } if (lableTypes == 1) { console.log(company.label) labelRow.value.list = JSON.stringify(selectRecords) labelRow.value.faceOrientation = faceOrientation labelRow.value.type = type @@ -493,12 +496,13 @@ dialogTableVisibleLabel.value = true } else if (company.label === 2) { router.push({ path: '/main/processCard/PrintCustomLabel', path: '/main/processCard/PrintCustomLabelCZ', query: { type: type, faceOrientation: faceOrientation, lableType: lableTypes, printList: JSON.stringify(selectRecords) printList: JSON.stringify(selectRecords), printType:2 } }) } @@ -513,12 +517,13 @@ dialogTableVisibleCustomLabel.value = true } else if (company.label === 2) { router.push({ path: '/main/processCard/PrintCustomLabelSemi', path: '/main/processCard/PrintCustomLabelSemiCZ', query: { type: type, faceOrientation: faceOrientation, lableType: lableTypes, printList: JSON.stringify(selectRecords) printList: JSON.stringify(selectRecords), printType:2 } }) } @@ -529,7 +534,8 @@ type: type, faceOrientation: faceOrientation, lableType: lableTypes, printList: JSON.stringify(selectRecords) printList: JSON.stringify(selectRecords), printType:2 } }) @@ -640,7 +646,7 @@ if (hidePrintLabels == 'true') { return button.code !== 'printLabel' && button.code !== 'printLabel2'; } else { return true && button.code !== 'printLike' && button.code !== 'printLabel3'; // 显示该按钮 return true && button.code !== 'printLike' && button.code !== 'printLabel3'&& button.code !== 'printTest'; // 显示该按钮 } }) } north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -39,7 +39,7 @@ } }) }else{ console.log(printType) if (printType == 1) { data.value.printList = JSON.parse(route.query.printList) request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => { @@ -61,6 +61,7 @@ } }) }else if(printType==2){ data.value.printList = JSON.parse(route.query.printList) request.post(`/processCard/getSelectPrintLabelDetails`, data.value).then((res) => { if (res.code == 200) { produceList.value = deepClone(res.data.data) north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
@@ -64,17 +64,14 @@ list.value = deepClone(res.data.data) const data = produceList.value[0].value dataList = JSON.parse(`[${data}]`); console.log(switchType) if (switchType===true){ labelList = props.titleList }else { labelList = dataList[0] } labelList = dataList[0] for (let i = 0; i < list.value.length; i++) { let count = list.value[i].data.length for (let j = 0; j < count; j++) { for (let k = 0; k < list.value[i].data[j].quantity; k++) { props.lastList.push(list.value[i].data[j]) lastList.value.push(list.value[i].data[j]) } } }