From 59920fa409a048c81681c2757d27dd88f50ca251 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 18 七月 2025 15:05:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue | 4 ++--
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 2 +-
north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
index e7f266d..b4ed4ea 100644
--- a/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
+++ b/north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue
@@ -149,12 +149,12 @@
<template>
<div >
- <div :class="'div_'+n " style="width: 46%;position: relative;" v-for="n in 2" >
+ <div :class="'div_'+n " style="width: 46%;position: relative;margin-top: 20px" v-for="n in 2" >
<table v-for="page in orderDetailList" :key="page" style="width: 100%">
<thead>
<tr>
<td colspan="1" style="text-align: center;font-weight: bolder;">
- <div style="width: 60px;height: 60px">
+ <div style="width: 35px;height: 35px">
<img id="img-pic" style="width:100%;height: 100%" src="@/assets/northGlass.ico" alt="">
</div>
</td>
@@ -178,7 +178,7 @@
<td colspan="5">
<div style="display:flex;">
<div style="width: 100%"><span style="font-weight: bold;">瀹㈡埛鍚嶇О</span>锛�
- <input class="contactNumber" style="width: 60%;font-size: 12px" type="text"
+ <input class="contactNumber" style="width: 85%;font-size: 12px" type="text"
v-model="customer.customer_name" />
</div>
</div>
@@ -219,7 +219,7 @@
<tbody>
<template v-for="(row,index) in page" :key="row">
<tr v-if="row.type==='product'" style="width: 100%;height: 100px" >
- <td colspan="1" style="font-weight: bold;font-size: 13px">鍔犲伐鍝佺:</td>
+ <td colspan="1" style="font-weight: bold;font-size: 11px">鍔犲伐鍝佺:</td>
<td colspan="4">
<textarea style="resize: none;width: 100%;height: 100px;border: 0" class="textarea" type="textarea" v-model="row.productName" /></td>
</tr>
@@ -317,12 +317,12 @@
}
#footsum{
position: fixed;
- bottom: 2cm;
+ bottom: 1.5cm;
width: 100%; /* 鎴栬�呰缃垚鍏蜂綋鐨勫搴� */
}
#sticky-footer {
position: fixed;
- bottom: 1cm;
+ bottom: 0.5cm;
width: 100%; /* 鎴栬�呰缃垚鍏蜂綋鐨勫搴� */
}
/* thead{
diff --git a/north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue b/north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue
index ba9e7dc..a139e78 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue
@@ -212,7 +212,7 @@
{field: 'actualSignalArea',width: '140', title: t('productStock.singlePieceArea'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'area',width: '100', title: t('productStock.totalArea'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'weight',width: '100', title: t('processCard.weight'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'box_no',width: '100', title: t('productStock.boxNumber'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'boxNo',width: '100', title: t('productStock.boxNumber'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'storageRegion',width: '100', title: t('productStock.inventoryArea'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'status',width: '100', title: t('productStock.status'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -290,7 +290,7 @@
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
+ height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 6324c01..4fd0c76 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -926,7 +926,7 @@
<select id="getDetailLists">
SELECT
- ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'')) as building_number,
+ ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
od.width,
od.height,
fol.quantity,
--
Gitblit v1.8.0