From 965609cd0f82ff4cc1aa06711ed174fc95a5b333 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 七月 2024 13:41:04 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue | 4 ++--
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue | 10 +++++-----
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue | 3 ++-
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 4 +---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 7 ++++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
index 9ce01d4..29766bc 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -37,7 +37,8 @@
contacts:'order.contacts',
deliveryAddress:'order.deliveryAddress',
processingNote:'order.processingNote',
- remarks:'product.msg.remarks'
+ remarks:'product.msg.remarks',
+ customerAbbreviation:'customer.customerAbbreviation'
})
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
index 2f87cf6..d9e761a 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet1.vue
@@ -155,7 +155,7 @@
<th>瑙勬牸锛堝W*楂楬锛�</th>
<th>鐗囨暟</th>
<th>闈㈢Н</th>
- <th>寤剁背</th>
+ <th>{{company.columnNamePerimeter}}</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
<th>澶囨敞</th>
@@ -193,21 +193,21 @@
</tr>
<tr>
- <td colspan="4">灏忚</td>
+ <td colspan="5">灏忚</td>
<td>{{getQuantity(item.productDetail)}}</td>
<td>{{getArea(item.productDetail)}}</td>
<td>{{getPerimeter(item.productDetail)}}</td>
- <td colspan="6"></td>
+ <td colspan="7"></td>
</tr>
</tbody>
<tr>
- <td colspan="4">鎬昏</td>
+ <td colspan="5">鎬昏</td>
<td>{{grossNum.quantity}}</td>
<td>{{grossNum.grossArea}}</td>
<td>{{grossNum.perimeter}}</td>
- <td colspan="8"></td>
+ <td colspan="7"></td>
</tr>
<tr>
<td colspan="15" style="white-space: pre-wrap;text-align:left ">
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
index 71f6e18..7c6ed13 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet2.vue
@@ -137,7 +137,7 @@
<th>瑙勬牸锛堝W*楂楬锛�</th>
<th>鐗囨暟</th>
<th>闈㈢Н</th>
- <th>寤剁背</th>
+ <th>{{company.columnNamePerimeter}}</th>
<th>鍗婂緞</th>
<th>妤煎彿</th>
<th>鍔犲伐瑕佹眰</th>
@@ -222,7 +222,7 @@
<td>{{grossNum.quantity}}</td>
<td>{{grossNum.grossArea}}</td>
<td>{{grossNum.perimeter}}</td>
- <td colspan=""></td>
+ <td colspan="9"></td>
</tr>
<tr>
<td colspan="17" style="white-space: pre-wrap;text-align:left ">
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 0856a02..3f1e8f3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -424,11 +424,9 @@
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
//鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
- if(column.title=="娆＄牬鏁伴噺"){
+ if(column.field=="breakageQuantity"){
brokenVisible.value = true
}
-
-
},
menuClick({menu, row, column}) {
const $grid = xGrid.value
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 344e39b..3720314 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -636,7 +636,7 @@
select o.order_id as orderId,
project,
customer_id as customerId,
- customer_name as customerName,
+ o.customer_name as customerName,
order_type as orderType,
order_classify as orderClassify,
batch,
@@ -658,13 +658,14 @@
od.building_number as buildingNumber,
od.product_name as productName,
od.edging_type as edgingType,
- p.remarks
-
+ p.remarks,
+ c.customer_abbreviation as customerAbbreviation
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
od.order_number = fc.order_number
left join sd.product as p on p.id=od.product_id
+ left join sd.customer as c on c.id = o.customer_id
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by od.order_number, width, height
--
Gitblit v1.8.0