From 52a17a042f5164ae3554b69151f7a02c57ac2591 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 23 八月 2024 16:28:05 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index 8f52595..913acd6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -12,6 +12,7 @@
import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
+import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelXJ.vue'
import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import SelectSortTable from '@/components/pp/SelectSortTable.vue'
@@ -28,6 +29,7 @@
const dialogSortTable = ref(false)
const dialogTableVisible = ref(false)
const dialogTableVisibleLabel = ref(false)
+const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleCustomLabel = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
@@ -485,7 +487,13 @@
labelRow.value.type = type
labelRow.value.lableType = lableTypes
if (company.label === 1) {
- dialogTableVisibleLabel.value = true
+ if (company.printLabel.columnsLabel===1){
+ dialogTableVisibleLabelXJ.value = true
+ }
+ else{
+ dialogTableVisibleLabel.value = true
+ }
+
} else if (company.label === 2) {
router.push({
path: '/main/processCard/PrintCustomLabelCZ',
@@ -722,6 +730,24 @@
style="width: 100%;height: 100%"/>
</el-dialog>
+ <!-- 鎴愬搧鏍囩鏂扮枂-->
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabelXJ"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContentLabel" :icon="Printer" circle/>
+ </template>
+ <print-custom-label-x-j id="childLabel"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :list="labelRow.list"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
+
<!-- 灏忕墖鏍囩 -->
<el-dialog
id="sizeCustomSemi"
--
Gitblit v1.8.0