From 9866aa9501cd64269857bcc6c75a77a2fcd4c9d4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 3 +--
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 1 +
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 33 +++++++++++++++++----------------
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue | 2 +-
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index d11f483..7708b60 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -41,7 +41,6 @@
produceList.value.forEach(item => {
sumMoney+=item.DeliveryDetail.money
})
- console.log(otherMoney.value)
otherMoney1=[]
otherMoney=deepClone(res.data.otherMoney)
for(let i=0;i<otherMoney.length;i++){
@@ -173,7 +172,7 @@
</thead>
<tr>
<td style="font-size: 15px;text-align: left" colspan="4">浜у搧鍚嶇О:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
- <td style="font-size: 15px;text-align: left" colspan="2">瀵规柟鍗曞彿:</td>
+ <td v-if="company.showDeliveryCreator" style="font-size: 15px;text-align: left" colspan="2">瀵规柟鍗曞彿:</td>
<td style="font-size: 15px;text-align: left" colspan="3">璁㈠崟缂栧彿:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
</tr>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
index a30fa29..545f964 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue
@@ -207,7 +207,7 @@
<th style="width: 15%;">妤煎眰缂栧彿</th>
<th style="width: 17%;" colspan="1">瀹絏楂�</th>
<th style="width: 10%;">鏁伴噺</th>
- <th style="width: 10%;">闈㈢Н</th>
+ <th style="width: 10%;">鎬婚潰绉�</th>
<th style="width: 10%;">鍗曚环</th>
<th style="width: 12%;">閲戦</th>
<th v-if="company.showDeliveryCreator" style="width: 20%;" colspan="2">鍔犲伐瑕佹眰</th>
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 263e1a4..9f02cb4 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
@@ -6,7 +6,8 @@
import {useRouter} from 'vue-router'
import {changeFilterEvent, filterChanged} from "@/hook"
import {useI18n} from 'vue-i18n'
-import deepClone from "@/utils/deepClone";
+import deepClone from "@/utils/deepClone"
+import companyInfo from "@/stores/sd/companyInfo"
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
@@ -18,7 +19,8 @@
const data = ref({
printList: []
})
-
+let remarks = ref('')
+const company = companyInfo()
@@ -137,6 +139,7 @@
<template>
<el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
+ <el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
<div id="printFlowCard" >
<div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
@@ -164,12 +167,13 @@
<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
<div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
<div class="row5">
- <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
+ <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
<div class="row6">
<span>{{item.glass_child}}</span>
- <span>{{item.processing_note}}</span>
+ <span v-if="company.showDeliveryCreator" >{{item.processing_note}}</span>
+ <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
</div>
<div class="row5">
<span>{{item.project}}</span>
@@ -187,34 +191,28 @@
<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>
- <span v-else-if="item.process.includes('涓┖')">涓┖</span>
- <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
- <span v-else></span>
+
<div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
</div>
<div class="row2" v-else>
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
- <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
- <span v-else-if="item.process.includes('涓┖')">涓┖</span>
- <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
- <span v-else></span>
</div>
<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
<div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
+
<div class="row5">
- <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
+ <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
<div class="row6">
<span>{{item.glass_child}}</span>
- <span>{{item.processing_note}}</span>
</div>
<div class="row5">
<span>{{item.project}}</span>
+ <span style="font-size: 7pt" v-if="!company.showDeliveryCreator">{{remarks}}</span>
</div>
</div>
</template>
@@ -313,8 +311,8 @@
position: absolute;
font-weight: bold;
margin-left: 5px;
- margin-top: 0px;
- font-size: 8pt;
+ margin-top: -6px;
+ font-size: 6pt;
}
.cell1{
@@ -323,6 +321,9 @@
margin-left: 158px;
margin-top: -21px;
}
+.font-size {
+ font-size: 6pt;
+}
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 4216fc0..6f8eac5 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -1048,6 +1048,7 @@
od.quantity,
od.gross_amount,
od.compute_gross_area,
+ od.area,
ifnull(od.processing_note,"") as processingNote,
ifnull(od.building_number,"") as buildingNumber,
od.price,
--
Gitblit v1.8.0