From 82b0aaf3c4c879742fa128e2b46037de6245ac4b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:41:35 +0800
Subject: [PATCH] 提交发货 界面修改
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetNotMoney.vue | 0
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 16 ++++++++--------
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue | 4 ++--
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue | 0
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue | 9 +++++----
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue | 4 ++--
6 files changed, 17 insertions(+), 16 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/PrintSheetMoney.vue
similarity index 98%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue
index 1276555..c13e8ee 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetMoney.vue
@@ -260,7 +260,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
- <div style="display: flex;font-size: 10px;text-align: center;">
+ <div style="display: flex;font-size: 14px;text-align: center;">
<span style="width: 25%;font-weight: bold;font-size: 12px">鍔犲伐璐圭敤</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鍗曚环</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鏁伴噺</span>
@@ -271,7 +271,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
- <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
+ <div style="display: flex;font-size: 14px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetNotMoney.vue
similarity index 100%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetNotMoney.vue
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
similarity index 98%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
index 61707e9..75b108b 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumn.vue
@@ -283,7 +283,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="7">
- <div style="display: flex;font-size: 10px;text-align: center;">
+ <div style="display: flex;font-size: 14px;text-align: center;">
<span style="width: 25%;font-weight: bold;font-size: 12px">鍔犲伐璐圭敤</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鍗曚环</span>
<span style="width: 25%;font-weight: bold;font-size: 12px">鏁伴噺</span>
@@ -294,7 +294,7 @@
</tr>
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="7" >
- <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
+ <div style="display: flex;font-size: 14px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
<span style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue
similarity index 100%
rename from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue
rename to north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
index cae176c..dfd2977 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
@@ -10,6 +10,7 @@
const route = useRoute()
let rowClickIndex = ref(null)
const xGrid = ref()
+import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -40,7 +41,7 @@
// {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'alias', title:t('components.otherProcessing'),minWith:'130'},
{field: 'price', title:t('order.price'),editRender: { name: 'input'}},
- {field: 'quantity', title:t('order.quantity')},
+ {field: 'quantity', title:t('order.quantity'),editRender: { name: 'input'}},
{field: 'money', slots:{default:'default'}, title:t('delivery.money')}
],
//琛ㄥ崟楠岃瘉
@@ -58,9 +59,9 @@
quantity: [
{
validator ({ cellValue }) {
- const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
+ const regex = /^(0|[1-9]\d*)$/
if (cellValue && !regex.test(cellValue) ) {
- return new Error(t('basicData.msg.range99999Dec2') )
+ return new Error(t('basicData.msg.greater0') )
}
}
}
@@ -159,7 +160,7 @@
const countAmount = (row) => {
const price = row.price===null?0:row.price
const quantity = row.quantity===null?0:row.quantity
- return parseFloat((row.price * row.quantity).toFixed(2))
+ return parseFloat((row.price * row.quantity).toFixed(2)) || 0
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 7710720..7fa7ebf 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -11,15 +11,15 @@
import DeliveryPrinting from "@/views/sd/delivery/DeliveryPrinting.vue";
import footSum from "@/hook/footSum"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
-import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
-import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
+import PrintSheetMoney from "@/components/sd/delivery/PrintSheetMoney.vue";
+import PrintSheetNotMoney from "@/components/sd/delivery/PrintSheetNotMoney.vue";
import PrintSheetLuoyang from "@/components/sd/delivery/PrintSheetLuoyang.vue";
import PrintSheetLuoyangDetails from "@/components/sd/delivery/PrintSheetLuoyangDetails.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";
import { saveAs } from "file-saver"
import companyInfo from "@/stores/sd/companyInfo";
-import PrintSheet3 from "@/components/sd/delivery/PrintSheet3.vue";
-import PrintSheet4 from "@/components/sd/delivery/PrintSheet4.vue";
+import PrintSheetTwoColumn from "@/components/sd/delivery/PrintSheetTwoColumn.vue";
+import PrintSheetTwoColumnNotMoney from "@/components/sd/delivery/PrintSheetTwoColumnNotMoney.vue";
import {addListener} from "@/hook/mouseMove";
import {copyTableCellValue} from "@/hook/copyTableCellValue";
@@ -787,14 +787,14 @@
/>
</el-select>
</template>
- <print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" />
- <print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" />
+ <print-sheet-money id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" />
+ <print-sheet-not-money id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" />
<print-sheet-luoyang id="child" v-if="sheetIndex===3" :deliveryId="flowData.delivery" :type="1" :optionVal='optionVal'/>
<print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type="2" :optionVal='optionVal'/>
<print-sheet-luoyang-details id="child" v-if="sheetIndex===5" :deliveryId="flowData.delivery" :type="3" :optionVal='optionVal'/>
<print-sheet-luoyang-details id="child" v-if="sheetIndex===6" :deliveryId="flowData.delivery" :type="4" :optionVal='optionVal'/>
- <print-sheet3 id="child" v-if="sheetIndex===7" :deliveryId="flowData.delivery" />
- <print-sheet4 id="child" v-if="sheetIndex===8" :deliveryId="flowData.delivery" />
+ <print-sheet-two-column id="child" v-if="sheetIndex===7" :deliveryId="flowData.delivery" />
+ <print-sheet-two-column-not-money id="child" v-if="sheetIndex===8" :deliveryId="flowData.delivery" />
</el-dialog>
</div>
--
Gitblit v1.8.0