From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index 8a858ec..75896e7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -30,6 +30,7 @@
let produceList = ref([])
let titleStyleVisible = ref(false)
let print = ref("1")
+let printStyle = ref("1")
//鏍囩
let labelRow = ref({
@@ -43,6 +44,13 @@
const company = companyInfo()
let hidePrintLabels = company.printLabel.hideButton;
+//鍊掑彊
+let flashback = ref(1)
+//钀芥灦椤哄簭
+let landingSequence= ref(1)
+//鍚堟灦鎵撳嵃
+let compound = ref(null)
+
const form = reactive({
date1: '',
orderId: '',
@@ -55,13 +63,16 @@
printMergeVal: null,
like: null,
project:null,
- merge: null
+ merge: null,
+ flashback:null,
+ compound:null,
+ landingSequence:null,
})
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
if(parseInt(print.value)==1){
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1,printStyle:parseInt(printStyle.value) }})
}else{
router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
}
@@ -70,19 +81,22 @@
}
case 'edit1' :{
if(parseInt(print.value)==1){
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2,printStyle:parseInt(printStyle.value) }})
}else{
router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
}
break
}
case 'edit2' :{
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3,printStyle:parseInt(printStyle.value) }})
break
}
case 'edit3' :{
printRow.value.project=row.project_no
printRow.value.merge = company.flowCardMerge
+ printRow.value.flashback = flashback.value
+ printRow.value.compound = compound.value
+ printRow.value.landingSequence=landingSequence.value
if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
dialogTableVisibleStraight.value = true
}else{
@@ -138,7 +152,7 @@
if (res.code == 200) {
if(hidePrintLabels=="true"){
//鍒犻櫎涓嬫媺妗�
- remove(gridOptions.toolbarConfig.slots)
+ //remove(gridOptions.toolbarConfig.slots)
const button = {'code': 'printLabel',
status: 'primary',
'name': t('processCard.finishedProductPrinting2')}
@@ -265,7 +279,7 @@
buttons: [
],
slots:{
- buttons: "toolbar_buttons"
+ buttons: "toolbar_buttons",
},
zoom: true,
custom: true
@@ -417,11 +431,19 @@
</template>
<template #toolbar_buttons>
+ <vxe-select @change="changeOrderType" v-model="printStyle" >
+ <vxe-option value="1" label="11鍒�4琛�"></vxe-option>
+ <vxe-option value="2" label="6琛�3鍒�"></vxe-option>
+ </vxe-select>
+ </template>
+
+ <template #toolbar_button2>
<vxe-select @change="changeOrderType" v-model="print" >
<vxe-option value="1" label="EPSON LQ-82KF ESC/P2"></vxe-option>
<vxe-option value="2" label="TSC TTP-244Pro"></vxe-option>
</vxe-select>
</template>
+
@@ -476,6 +498,9 @@
:printMerge="printRow.printMergeVal"
:printProject="printRow.project"
:merges="printRow.merge"
+ :flashback = "printRow.flashback"
+ :compound = "printRow.compound"
+ :landingSequence = "printRow.landingSequence"
style="width: 100%;height: 100%"/>
</el-dialog>
--
Gitblit v1.8.0