From f24ec48c98a485af26321f7f4b74fe1611162f5a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 25 三月 2026 18:05:32 +0800
Subject: [PATCH] fix: 吨/公斤换算
---
src/pages/inventoryManagement/dispatchLog/index.vue | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/pages/inventoryManagement/dispatchLog/index.vue b/src/pages/inventoryManagement/dispatchLog/index.vue
index df78c59..d8a8491 100644
--- a/src/pages/inventoryManagement/dispatchLog/index.vue
+++ b/src/pages/inventoryManagement/dispatchLog/index.vue
@@ -83,7 +83,19 @@
</view>
<view class="form-row">
- <text class="form-label required">姣涢噸(鍚�)</text>
+ <text class="form-label">鍗曚綅</text>
+ <up-radio-group v-model="editForm.unit" class="unit-radio-group">
+ <up-radio
+ v-for="opt in unitOptions"
+ :key="opt.value"
+ :label="opt.label"
+ :name="opt.value"
+ ></up-radio>
+ </up-radio-group>
+ </view>
+
+ <view class="form-row">
+ <text class="form-label required">姣涢噸</text>
<up-input
v-model="editForm.grossWeight"
type="digit"
@@ -93,7 +105,7 @@
</view>
<view class="form-row">
- <text class="form-label required">鐨噸(鍚�)</text>
+ <text class="form-label required">鐨噸</text>
<up-input
v-model="editForm.tareWeight"
type="digit"
@@ -103,7 +115,7 @@
</view>
<view class="form-row">
- <text class="form-label required">鍑�閲�(鍚�)</text>
+ <text class="form-label required">鍑�閲�</text>
<up-input v-model="editForm.netWeight" type="digit" placeholder="鑷姩璁＄畻" disabled />
</view>
@@ -285,6 +297,7 @@
const editForm = reactive({
id: null,
licensePlateNo: '',
+ unit: '鍚�',
grossWeight: '',
tareWeight: '',
netWeight: '',
@@ -292,6 +305,26 @@
weighingOperator: '',
remark: ''
})
+
+const unitOptions = [
+ { label: '鍚�', value: '鍚�' },
+ { label: '鍏枻', value: '鍏枻' }
+]
+
+const normalizeUnit = (u) => {
+ if (!u) return '鍚�'
+ const s = String(u).trim()
+ if (s === '鍚�' || s === 't' || s === 'ton' || s === 'tonne') return '鍚�'
+ if (
+ s === '鍏枻' ||
+ s === 'kg' ||
+ s === 'kilogram' ||
+ s === '鍗冨厠' ||
+ s === 'kilograms'
+ )
+ return '鍏枻'
+ return '鍚�'
+}
const computeNetWeightEdit = () => {
const gross = Number(editForm.grossWeight)
@@ -324,6 +357,7 @@
const handleEdit = (row) => {
Object.assign(editForm, row || {})
+ editForm.unit = normalizeUnit(editForm.unit)
// 浠ュ綋鍓嶆瘺閲�/鐨噸涓哄噯璁＄畻鍑�閲�
computeNetWeightEdit()
showEditModal.value = true
@@ -525,6 +559,12 @@
color: #f56c6c;
margin-right: 6rpx;
}
+.unit-radio-group {
+ display: flex;
+ gap: 24rpx;
+ align-items: center;
+ flex-wrap: wrap;
+}
.selector-trigger {
display: flex;
align-items: center;
--
Gitblit v1.9.3