From 748e47eb02e874e521500b24f5444d6dbaeda3b8 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 25 十二月 2025 11:46:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 5ffc88d..876be06 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -11,6 +11,7 @@
import companyInfo from "@/stores/sd/companyInfo";
import userInfo from "@/stores/userInfo"
import {add} from '@/utils/decimal'
+import ImageSizeEditor from '@/components/ImageSizeEditor.vue'
//璇█鑾峰彇
const company = companyInfo()
const {t} = useI18n()
@@ -19,6 +20,7 @@
let list = ref()
const details = ref([])
const user=userInfo()
+const imgSizeMap = ref({})
let totalQuantity = 0; // 鐢ㄤ簬璁板綍鎬绘暟閲�
let totalArea = 0; // 鐢ㄤ簬璁板綍鎬婚潰绉�
@@ -319,7 +321,7 @@
<!-- <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
<div id="printFlowCard">
<div id="contentDiv" v-for="(item,id) in produceList" :key="id">
- <table id="contentTable" style="border-bottom: none">
+ <table id="contentTable" style="border-bottom: none;margin-bottom: 20px">
<thead>
<tr v-for="(itemFlow,index) in item.detail" :key="index">
<td colspan="31">
@@ -506,12 +508,20 @@
</tr>
</tfoot>
</table>
- <el-image
- v-for="(img, index) in getPicturesByDetailList(item.detailList)"
- :key="index"
- :src="img.imageBase64"
- fit="contain"
- style="max-width: 100%;"
+<!-- <el-image-->
+<!-- v-for="(img, index) in getPicturesByDetailList(item.detailList)"-->
+<!-- :key="index"-->
+<!-- :src="img.imageBase64"-->
+<!-- fit="contain"-->
+<!-- style="max-width: 100%;margin: 50px"-->
+<!-- />-->
+ <ImageSizeEditor
+ :images="getPicturesByDetailList(item.detailList)"
+ v-model:sizeMap="imgSizeMap"
+ key-field="orderNumber"
+ src-field="imageBase64"
+ :default-width="300"
+ :default-height="300"
/>
</div>
</div>
--
Gitblit v1.8.0