From 515025ffd3ace6f7382f9a853d3aba50f191c8d0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 12 十二月 2024 08:30:32 +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 | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 330e795..8420dc0 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
@@ -13,10 +13,12 @@
import {Printer} from "@element-plus/icons-vue/global";
import companyInfo from "@/stores/sd/companyInfo"
import {remove} from "xe-utils";
+import PrintProcess from "@/components/pp/PrintProcess.vue";
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
+const dialogTableVisible = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
let rowClickIndex = ref(null)
@@ -44,6 +46,14 @@
orderId: '',
project: ''
})
+
+//鎵撳嵃
+let printRow = ref({
+ list: null,
+ printMergeVal: null,
+ like: null,
+ project:null
+})
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
@@ -62,6 +72,11 @@
case 'edit2' :{
router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
break
+ }
+ case 'edit3' :{
+ printRow.value.project=row.project_no
+ console.log(printRow.value.project)
+ dialogTableVisible.value = true
}
}
}
@@ -188,7 +203,7 @@
//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: t('basicData.operate'), width: 140, slots: { default: 'button_slot' },fixed:"left"},
+ {title: t('basicData.operate'), width: 240, slots: { default: 'button_slot' },fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'project_no',
@@ -295,6 +310,10 @@
}
})
}
+const printContent = ref({
+ id: 'child',
+
+})
</script>
<template>
@@ -342,6 +361,7 @@
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.cutting')}}</el-button>
<el-button @click="getTableRow(row,'edit1')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
<el-button @click="getTableRow(row,'edit2')" link type="primary" size="small">{{$t('components.finishedProduct')}}</el-button>
+ <el-button @click="getTableRow(row,'edit3')" link type="primary" size="small">{{$t('娴佺▼鍗�')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -392,6 +412,24 @@
:projectNo="labelRow.projectNo"
style="width: 100%;height: 100%"/>
</el-dialog>
+
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisible"
+ :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 />
+ </template>
+ <print-process
+ id="child"
+ :printLike="printRow.like"
+ :printList="printRow.list"
+ :printMerge="printRow.printMergeVal"
+ :printProject="printRow.project"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
</div>
</template>
@@ -412,4 +450,10 @@
width: 100%;
}
+:deep(#sizePrintCalrd .el-dialog__body) {
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0