From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 ff19127..2ad40e7 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
@@ -14,12 +14,14 @@
import companyInfo from "@/stores/sd/companyInfo"
import {remove} from "xe-utils";
import PrintProcess from "@/components/pp/PrintProcess.vue";
+import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
const dialogTableVisible = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
+const dialogTableVisibleStraight = ref(false)
let rowClickIndex = ref(null)
@@ -52,7 +54,8 @@
list: null,
printMergeVal: null,
like: null,
- project:null
+ project:null,
+ merge: null
})
const getTableRow = (row, type) => {
switch (type) {
@@ -66,7 +69,11 @@
break
}
case 'edit1' :{
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+ if(parseInt(print.value)==1){
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+ }else{
+ router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
+ }
break
}
case 'edit2' :{
@@ -75,7 +82,12 @@
}
case 'edit3' :{
printRow.value.project=row.project_no
- dialogTableVisible.value = true
+ printRow.value.merge = company.flowCardMerge
+ if(company.companyName=='甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�'){
+ dialogTableVisibleStraight.value = true
+ }else{
+ dialogTableVisible.value = true
+ }
}
}
}
@@ -449,6 +461,26 @@
:printList="printRow.list"
:printMerge="printRow.printMergeVal"
:printProject="printRow.project"
+ :merges="printRow.merge"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisibleStraight"
+ :title="$t('processCard.print')"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
+ </template>
+ <print-process-straight
+ id="child"
+ :printLike="printRow.like"
+ :printList="printRow.list"
+ :printMerge="printRow.printMergeVal"
+ :printProject="printRow.project"
+ :merges="printRow.merge"
style="width: 100%;height: 100%"/>
</el-dialog>
</div>
@@ -477,4 +509,5 @@
overflow-y: auto;
}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0