From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
index d823164..6367be4 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue
@@ -37,6 +37,12 @@
const route = currentRoute.value
let type = props.type
let faceOrientation = props.faceOrientation
+if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄鍐呴潰"){
+ faceOrientation='INSIDE'
+}
+else if (type.indexOf("鑻辨枃")>-1 && faceOrientation==="姝ら潰涓哄澶栭潰"){
+ faceOrientation='OUTSIDE'
+}
let lableType = props.lableType
data.value.printList = JSON.parse(props.list)
onMounted(() => {
@@ -50,13 +56,12 @@
labelList = dataList[0]
for (let i = 0; i < list.value.length; i++) {
let count = list.value[i].data.length
- for (let j = 0; j < 2; j++) {
+ for (let j = 0; j < count; j++) {
for (let k = 0; k < list.value[i].data[j].quantity; k++) {
lastList.value.push(list.value[i].data[j])
}
}
}
-
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -71,7 +76,7 @@
//淇敼鐩稿悓浜у搧鍚嶇О鏍囩
-const updateProductName = (event, index) => {
+const updateProductName = (event, index,id) => {
// 鍒涘缓鏄犲皠瀵硅薄
const propertyMapping = {};
labelList.forEach(item => {
@@ -79,6 +84,8 @@
});
// 杈撳叆鐨勫��
const newValue = event.target.innerText;
+ const parts = newValue.split('锛�');
+ const result = parts[1]; // 鑾峰彇鍐掑彿鍚庣殑閮ㄥ垎
// 鑾峰彇鏄犲皠涓墍鏈夌殑閿�
const keys = Object.keys(propertyMapping);
@@ -95,16 +102,23 @@
// 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
lastList.value.forEach(obj => {
// 鑾峰彇鍓嶇紑鍜� orderId
- const prefix = obj.processId.substring(0, 11);
+ const prefix = lastList.value[id].processId.substring(0, 11);
const orderId = obj.orderId;
-
+ const glassNumber=lastList.value[id].glassNumber
+ const customerName = obj.customerName
// 鏍规嵁 propertyName 鏇存柊灞炴��
if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
- obj.productAbbreviation = newValue;
+ obj.productAbbreviation = result;
}
if (propertyName === 'project' && orderId === obj.orderId) {
- obj.project = newValue;
+ obj.project = result;
+ }
+ if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
+ obj.productName = result;
+ }
+ if (propertyName === 'customerName' && orderId === obj.orderId){
+ obj.customerName = result;
}
});
}
@@ -115,12 +129,12 @@
<template>
<div id="print" :class="company.printLabel.className.custom.printFlowCardName()">
- <div v-for="(item1,id) in lastList" :class="company.printLabel.className.custom.entiretyName()">
+ <div v-for="(item1,index) in lastList" :class="company.printLabel.className.custom.entiretyName()">
<div class="row4">{{ faceOrientation }}</div>
<div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1">{{ item.title }}</div>
+ <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row1" contenteditable="true" @input="updateProductName($event, id,index)" v-text="item.title+'锛�'+item1[item.name]"></div>
<!-- <div class="row2" style="width: 100%;"><input class="contentRow2" v-model="item1[item.name]" @keyup="updataProductName()" style="border: none;"/></div>-->
- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>
+<!-- <div v-if="item1[item.name] != null && item1[item.name] !== ''" class="row2" style="width: 100%;" contenteditable="true" @input="updateProductName($event, id)" v-text="item1[item.name]"></div>-->
</div>
<div v-html="company.printLabel.custom(item1)"></div>
</div>
@@ -155,7 +169,7 @@
body {
overflow: hidden;
font-family: Arial;
- font-size: 10px;
+ font-size: 7px;
}
#printButton {
@@ -216,14 +230,13 @@
}
.contentRow .row1 {
- width: 20%;
- font-weight: bolder;
+ width: 100%;
}
.entirety_finished .row4 {
font-weight: bolder;
text-align: right;
- margin-right: 10px;
+ margin-right: 20px;
}
.contentRow .row1, .contentRow .row2 {
@@ -238,7 +251,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 20mm 1mm 0mm 1mm; /* this affects the margin in the printer settings */
+ margin: 13mm 5mm 0mm 7mm; /* this affects the margin in the printer settings */
}
@media print {
--
Gitblit v1.8.0