From 6752d494350ac67e24769ed8c80c76260c68b226 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 17 十二月 2024 09:03:17 +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/PrintLabel.vue | 4 ++--
north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue | 2 +-
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 2 +-
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
index baf840b..6339add 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue
@@ -42,7 +42,7 @@
},
columns:[
- {type: 'seq', title: t('basicData.Number'), width: 80 },
+ {field: 'orderNumber', title: t('basicData.Number'), width: 80 },
{field: 'buildingNumber',width:120, title: t('order.buildingNumber'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index 281be03..769ded6 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -86,7 +86,7 @@
item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
})
- gridOptions.mergeCells= res.data.mergeCells
+ //gridOptions.mergeCells= res.data.mergeCells
xGrid.value.loadData(res.data.data)
} else {
ElMessage.warning(res.msg)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index dab1008..4867a3a 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -142,7 +142,7 @@
<tr class="title-s">
<th colspan="2" style="width: 30%"></th>
<th colspan="5" style="width: 40%;">
- <h3 >鐢熸垚浠诲姟鍗�(鎴愬搧)</h3>
+ <h3 >鐢熶骇浠诲姟鍗�(鎴愬搧)</h3>
</th>
<th colspan="2" style="width: 30%;">璁㈠崟缂栧彿锛�<span>{{ data.order.orderId }}</span></th>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 3c220e2..50f25f5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -143,9 +143,9 @@
<div id="printFlowCard" >
<div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
- <div class="row1" v-if="item.heat_layout_id!=null">
+ <div class="row1" v-if="item.heat_layout_id!==null">
- <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
+ <div class="cell" v-if="item.heat_layout_id!==null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
<span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
--
Gitblit v1.8.0