From 0fdd72b434d1e2566dac02d9cee87c19f32ad361 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 15:08:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue | 18 +++++-
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue | 102 +++++++++++++++++++++++++++++++++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 7 ++
3 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
index a6b25aa..862644c 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
@@ -90,13 +90,10 @@
const newValue = event.target.innerText;
const parts = newValue.split('锛�');
const result = parts[1]; // 鑾峰彇鍐掑彿鍚庣殑閮ㄥ垎
-
// 鑾峰彇鏄犲皠涓墍鏈夌殑閿�
const keys = Object.keys(propertyMapping);
-
// 鏍规嵁 index 鑾峰彇瀵瑰簲鐨勫睘鎬у悕
const propertyName = keys[index];
-
// 濡傛灉鏄犲皠涓病鏈夎 index锛岀洿鎺ヨ繑鍥�
if (!propertyName) {
console.warn('Unsupported index:', index);
@@ -129,6 +126,21 @@
if (propertyName === 'glassNumber' && glassNumber === obj.glassNumber){
obj.glassNumber = result;
}
+ if (propertyName === 'custom1' && orderId === obj.orderId){
+ obj.custom1 = result;
+ }
+ if (propertyName === 'custom2' && orderId === obj.orderId){
+ obj.custom2 = result;
+ }
+ if (propertyName === 'custom3' && orderId === obj.orderId){
+ obj.custom3 = result;
+ }
+ if (propertyName === 'custom4' && orderId === obj.orderId){
+ obj.custom4 = result;
+ }
+ if (propertyName === 'custom5' && orderId === obj.orderId){
+ obj.custom5 = result;
+ }
});
}
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
index 7ff858a..8840050 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -128,12 +128,34 @@
const TgaStyleSet = ref([
-
+ {
+ tid: 'INSIDE', title: '姝ら潰涓哄鍐呴潰', data: '', type: 'text',
+ options: {
+ testData: '',
+ width:55,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
+ {
+ tid: 'OUTSIDE', title: '姝ら潰涓哄澶栭潰', data: '', type: 'text',
+ options: {
+ testData: '',
+ width:55,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
{
tid: 'orderId', title: '璁㈠崟鍙�', data: '', type: 'text',
options: {
field: 'orderId',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -145,6 +167,7 @@
options: {
field: 'project',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -156,6 +179,7 @@
options: {
field: 'orderType',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -167,6 +191,7 @@
options: {
field: 'customerName',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -178,6 +203,7 @@
options: {
field: 'productName',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -189,6 +215,7 @@
options: {
field: 'edgingType',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -200,6 +227,7 @@
options: {
field: 'buildingNumber',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -211,6 +239,7 @@
options: {
field: 'customerAbbreviation',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -222,6 +251,7 @@
options: {
field: 'productAbbreviation',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -233,6 +263,7 @@
options: {
field: 'processId',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -244,6 +275,7 @@
options: {
field: 'orderNumber',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -266,6 +298,7 @@
options: {
field: 'process',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -321,6 +354,7 @@
options: {
field: 'remarks',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -332,6 +366,7 @@
options: {
field: 'remarks1',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -343,6 +378,7 @@
options: {
field: 'remarks2',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -354,6 +390,7 @@
options: {
field: 'remarks3',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -365,6 +402,7 @@
options: {
field: 'remarks4',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -376,6 +414,7 @@
options: {
field: 'filmNumber',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -398,6 +437,7 @@
options: {
field: 'glassChild',
testData: '',
+ width:270,
height: 16,
fontSize: 6.75,
textAlign: "left",
@@ -437,6 +477,66 @@
textContentVerticalAlign: "middle"
}
},
+ {
+ tid: 'custom1', title: '鑷畾涔�1', data: '', type: 'text',
+ options: {
+ field: 'custom1',
+ testData: '',
+ width:270,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
+ {
+ tid: 'custom2', title: '鑷畾涔�2', data: '', type: 'text',
+ options: {
+ field: 'custom2',
+ testData: '',
+ width:270,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
+ {
+ tid: 'custom3', title: '鑷畾涔�3', data: '', type: 'text',
+ options: {
+ field: 'custom3',
+ testData: '',
+ width:270,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
+ {
+ tid: 'custom4', title: '鑷畾涔�4', data: '', type: 'text',
+ options: {
+ field: 'custom4',
+ testData: '',
+ width:270,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
+ {
+ tid: 'custom5', title: '鑷畾涔�5', data: '', type: 'text',
+ options: {
+ field: 'custom5',
+ testData: '',
+ width:270,
+ height: 16,
+ fontSize: 6.75,
+ textAlign: "left",
+ textContentVerticalAlign: "middle"
+ }
+ },
])
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index ed46cbe..3f9d441 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2103,7 +2103,12 @@
od.other_columns,
ogd.glass_child as glassChild,
ogd.glass_address as glassAddress,
- JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.color')) AS color,
+ '鏂囨湰' as custom1,
+ '鏂囨湰' as custom2,
+ '鏂囨湰' as custom3,
+ '鏂囨湰' as custom4,
+ '鏂囨湰' as custom5
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join flow_card as fc on o.order_id = fc.order_id and
--
Gitblit v1.8.0