From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index db86010..c3b4eee 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -185,8 +185,7 @@
onMounted(async () => {
await getTags();
await hiprint.init();
- hiprintTemplate.value = new hiprint.PrintTemplate({});
- hiprintTemplate.value.design("#hiprint-printTemplate1",{grid:true});
+
})
@@ -204,7 +203,8 @@
})
const changeTag = () => {
-
+ hiprintTemplate.value = new hiprint.PrintTemplate({});
+ hiprintTemplate.value.design("#hiprint-printTemplate1",{grid:true});
const json = tag.value.value
hiprintTemplate.value.update(json)
}
@@ -218,7 +218,8 @@
})
}
const printOrder = (type) => {
- const list = JSON.parse(JSON.stringify(hiprintTemplate.value.getJson()))
+ printNumber()
+ const list = tag.value.value
list.panels[0].printElements.forEach(element => {
element.options.fontFamily = 'Arial'
if( element.options.field !== undefined){
@@ -235,7 +236,7 @@
})
//hiprintTemplate.value.update(list)
- let object = lastList.value
+ let object = JSON.parse(JSON.stringify(lastList.value))
//鍒ゆ柇鏄惁涓鸿〃鏍�
let columnsNum = null
if(list.panels[0].printElements[0].options.field==='table'){
@@ -244,7 +245,7 @@
}
//鍒ゆ柇鏄惁鏈� 宓屽鑷畾涔夌焊寮�
if(tag.value.tagHeight && tag.value.tagWidth){
- const print =createTemplate(hiprintTemplate.value.getJson(),object,tag.value.tagWidth,tag.value.tagHeight)
+ const print =createTemplate(list,object,tag.value.tagWidth,tag.value.tagHeight)
hiprintTemplate.value.update(print.template)
object = print.printData
}
@@ -710,7 +711,7 @@
return
}
if (printMerge.value === null || printMerge.value === '') {
- ElMessage.warning('璇峰～鍏ラ渶瑕佸悎骞剁殑灞�')
+ ElMessage.warning(t('rework.msg1'))
return
}
@@ -848,7 +849,7 @@
const printNumber = () => {
selectRecordsData.value.printList = selectRecords
- request.post(`/processCard/updatePrintNumber`, selectRecordsData.value).then((res) => {
+ request.post(`/tagStyle/updatePrintNumber`, selectRecordsData.value).then((res) => {
if (res.code == 200 && res.data === true) {
} else {
@@ -967,7 +968,7 @@
destroy-on-close
style="width: 75%;height:75% ">
<template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
+ <el-button v-print="printContent" :icon="Printer" circle />
</template>
<print-process
id="child"
@@ -1004,7 +1005,7 @@
destroy-on-close
style="width: 80%;height:75% ">
<template #header="{ close, titleId, titleClass }">
- <el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
+ <el-button v-print="printContentLabelSemi" :icon="Printer" circle @click="printNumber"/>
</template>
<print-custom-label-semi id="childLabelSemi"
:faceOrientation="labelRow.faceOrientation"
@@ -1051,7 +1052,24 @@
destroy-on-close
style="width: 80%;height:75% ">
<template #header="{ close, titleId, titleClass }">
- <el-button :icon="Printer" circle @click="printOrder(1)"/>
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.yesTitle')"
+ placement="top"
+ >
+ <el-button :icon="Printer" circle @click="printOrder(1)"/>
+ </el-tooltip>
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.noTitle')"
+ placement="top"
+ >
+ <el-button @click="printOrder(3)">
+ <i class="vxe-icon-print"></i>
+ </el-button>
+ </el-tooltip>
</template>
<print-custom-label-x-j id="childLabel"
:faceOrientation="labelRow.faceOrientation"
--
Gitblit v1.8.0