From 5fffe75d01be84ad2de0b097f41428698384e218 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 25 三月 2026 15:54:49 +0800
Subject: [PATCH] fix: 入库单位可选择
---
src/views/inventoryManagement/dispatchLog/Record.vue | 29 +++++++--
src/views/inventoryManagement/stockManagement/New.vue | 28 ++++++---
src/views/basicData/product/index.vue | 11 ++-
src/views/inventoryManagement/stockManagement/Subtract.vue | 28 +++++---
src/views/inventoryManagement/receiptManagement/Record.vue | 29 +++++++--
5 files changed, 86 insertions(+), 39 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 7b2a819..d2df67c 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -153,12 +153,15 @@
<el-row>
<el-col :span="24">
<el-form-item label="鍗曚綅锛�" prop="unit">
- <el-input
+ <el-select
v-model="modelForm.unit"
- placeholder="璇疯緭鍏ュ崟浣�"
+ placeholder="璇烽�夋嫨鍗曚綅"
clearable
- @keydown.enter.prevent
- />
+ style="width: 100%"
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 2353f54..deb89a2 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -82,17 +82,17 @@
show-overflow-tooltip
/>
<el-table-column
- label="姣涢噸(鍚�)"
+ label="姣涢噸"
prop="grossWeight"
show-overflow-tooltip
/>
<el-table-column
- label="鐨噸(鍚�)"
+ label="鐨噸"
prop="tareWeight"
show-overflow-tooltip
/>
<el-table-column
- label="鍑�閲�(鍚�)"
+ label="鍑�閲�"
prop="netWeight"
show-overflow-tooltip
/>
@@ -159,6 +159,8 @@
/>
</el-form-item> -->
+
+
<el-form-item
label="杞︾墝鍙�"
prop="licensePlateNo"
@@ -166,9 +168,22 @@
>
<el-input v-model="editForm.licensePlateNo" />
</el-form-item>
-
<el-form-item
- label="姣涢噸(鍚�)"
+ label="鍗曚綅"
+ prop="unit"
+ >
+ <el-select
+ v-model="editForm.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="姣涢噸"
prop="grossWeight"
:rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
@@ -182,7 +197,7 @@
</el-form-item>
<el-form-item
- label="鐨噸(鍚�)"
+ label="鐨噸"
prop="tareWeight"
:rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
>
@@ -196,7 +211,7 @@
</el-form-item>
<el-form-item
- label="鍑�閲�(鍚�)"
+ label="鍑�閲�"
prop="netWeight"
:rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
>
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 95f543d..7f0641e 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -82,15 +82,15 @@
prop="licensePlateNo"
v-if="type === '0'"
show-overflow-tooltip/>
- <el-table-column label="姣涢噸(鍚�)"
+ <el-table-column label="姣涢噸"
prop="grossWeight"
v-if="type === '0'"
show-overflow-tooltip/>
- <el-table-column label="鐨噸(鍚�)"
+ <el-table-column label="鐨噸"
prop="tareWeight"
v-if="type === '0'"
show-overflow-tooltip/>
- <el-table-column label="鍑�閲�(鍚�)"
+ <el-table-column label="鍑�閲�"
prop="netWeight"
v-if="type === '0'"
show-overflow-tooltip/>
@@ -151,6 +151,8 @@
</el-form-item> -->
<template v-if="type === '0'">
+
+
<el-form-item
label="杞︾墝鍙�"
prop="licensePlateNo"
@@ -158,9 +160,22 @@
>
<el-input v-model="editForm.licensePlateNo" />
</el-form-item>
-
<el-form-item
- label="姣涢噸(鍚�)"
+ label="鍗曚綅"
+ prop="unit"
+ >
+ <el-select
+ v-model="editForm.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="姣涢噸"
prop="grossWeight"
:rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur', 'change'] }]"
>
@@ -174,7 +189,7 @@
</el-form-item>
<el-form-item
- label="鐨噸(鍚�)"
+ label="鐨噸"
prop="tareWeight"
:rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur', 'change'] }]"
>
@@ -188,7 +203,7 @@
</el-form-item>
<el-form-item
- label="鍑�閲�(鍚�)"
+ label="鍑�閲�"
prop="netWeight"
:rules="[{ required: true, message: '璇疯緭鍏ュ噣閲�', trigger: ['blur', 'change'] }]"
>
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 9e0b6f5..4fe6f32 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -30,12 +30,7 @@
<el-input v-model="formState.productModelName" disabled />
</el-form-item>
- <el-form-item
- label="鍗曚綅"
- prop="unit"
- >
- <el-input v-model="formState.unit" disabled />
- </el-form-item>
+
<!-- 鍗婃垚鍝侊細鍏佽鎵嬪姩濉啓鏁伴噺鍏ュ簱 -->
<el-form-item
@@ -66,10 +61,23 @@
>
<el-input v-model="formState.licensePlateNo" />
</el-form-item>
-
+ <el-form-item
+ label="鍗曚綅"
+ prop="unit"
+ >
+ <el-select
+ v-model="formState.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </el-form-item>
<el-form-item
v-if="type === 'qualified' && formState.productType === 0"
- label="姣涢噸(鍚�)"
+ label="姣涢噸"
prop="grossWeight"
:rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
@@ -84,7 +92,7 @@
<el-form-item
v-if="type === 'qualified' && formState.productType === 0"
- label="鐨噸(鍚�)"
+ label="鐨噸"
prop="tareWeight"
:rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
>
@@ -99,7 +107,7 @@
<el-form-item
v-if="type === 'qualified' && formState.productType === 0"
- label="鍑�閲�(鍚�)"
+ label="鍑�閲�"
prop="netWeight"
:rules="[{ required: true, message: '璇峰厛杈撳叆姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠楀噣閲�', trigger: ['blur','change'] }]"
>
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index f709c2d..880a6e7 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -31,22 +31,28 @@
</el-form-item>
<el-form-item
- label="鍗曚綅"
- prop="unit"
- >
- <el-input v-model="formState.unit" disabled />
- </el-form-item>
-
- <el-form-item
label="杞︾墝鍙�"
prop="licensePlateNo"
:rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
>
<el-input v-model="formState.licensePlateNo" />
</el-form-item>
-
<el-form-item
- label="姣涢噸(鍚�)"
+ label="鍗曚綅"
+ prop="unit"
+ >
+ <el-select
+ v-model="formState.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="姣涢噸"
prop="grossWeight"
:rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
>
@@ -60,7 +66,7 @@
</el-form-item>
<el-form-item
- label="鐨噸(鍚�)"
+ label="鐨噸"
prop="tareWeight"
:rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
>
@@ -74,7 +80,7 @@
</el-form-item>
<el-form-item
- label="鍑�閲�(鍚�)"
+ label="鍑�閲�"
prop="netWeight"
:rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
>
--
Gitblit v1.9.3