From a4af8de233d0db9f0185187843c4d694fe3fd868 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Thu, 16 Apr 2026 09:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/locales/en.ts | 1 +
src/locales/zh-CN.ts | 15 +++---
src/styles/FormCreate/index.scss | 4 ++
.../erp/component/product/ProductForm.vue | 8 +--
src/views/erp/component/product/index.vue | 4 +-
.../stock/in/components/StockInItemForm.vue | 52 +++++++++++++++----
.../stock/out/components/StockOutItemForm.vue | 43 +++++++++++++--
7 files changed, 98 insertions(+), 29 deletions(-)
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 22386e12..d59d88e7 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -380,6 +380,7 @@ export default {
action: 'Action',
placeholderWarehouse: 'Please select warehouse',
placeholderProduct: 'Please select product',
+ placeholderBarcode: 'Please select barcode',
validatorWarehouseRequired: 'Warehouse is required',
validatorProductRequired: 'Product is required',
validatorCountRequired: 'Quantity is required'
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index cc40ad33..ccaa04da 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -369,9 +369,9 @@ export default {
Item: {
index: '序号',
warehouse: '仓库名称',
- product: '产品名称',
+ product: '名称',
stock: '库存',
- barcode: '条码',
+ barcode: '编码',
unit: '单位',
count: '数量',
price: '产品单价',
@@ -380,6 +380,7 @@ export default {
action: '操作',
placeholderWarehouse: '请选择仓库',
placeholderProduct: '请选择产品',
+ placeholderBarcode: '请选择编码',
validatorWarehouseRequired: '仓库不能为空',
validatorProductRequired: '产品不能为空',
validatorCountRequired: '产品数量不能为空'
@@ -1554,11 +1555,10 @@ export default {
// 备件管理
SparePartsManagement: {
SpareInfo: {
- name: '备件名称',
- code: '备件编码',
- deviceSpec:'规格型号',
+ name: '名称',
+ code: '编码',
qrcode: '二维码/条形码',
- standard: '规格',
+ standard: '规格型号',
expiryDay: '保质期天数',
category: '分类',
unit: '单位',
@@ -1570,11 +1570,10 @@ export default {
exportFilename: '备件信息.xls',
placeholderName: '请输入名称',
placeholderCode: '请输入编码',
- placeholderDeviceSpec: '请输入规格型号',
placeholderUnit: '请选择单位',
placeholderSafetyNumber: '请输入预警库存数量',
placeholderRemark: '请输入备注',
- placeholderStandard: '请输入规格',
+ placeholderStandard: '请输入规格型号',
placeholderExpiryDay: '请输入保质期天数',
qrcodeLoadError: '二维码加载失败',
qrcodeEmpty: '暂无二维码',
diff --git a/src/styles/FormCreate/index.scss b/src/styles/FormCreate/index.scss
index bb620005..d01125f8 100644
--- a/src/styles/FormCreate/index.scss
+++ b/src/styles/FormCreate/index.scss
@@ -20,3 +20,7 @@
.icon-user-o:before {
content: '\f2c0';
}
+
+.el-table--small .cell {
+ padding: 0 2px;
+}
\ No newline at end of file
diff --git a/src/views/erp/component/product/ProductForm.vue b/src/views/erp/component/product/ProductForm.vue
index fa0e7cc8..435319f1 100644
--- a/src/views/erp/component/product/ProductForm.vue
+++ b/src/views/erp/component/product/ProductForm.vue
@@ -37,8 +37,8 @@
-
-
+
+
@@ -53,11 +53,11 @@
-
+
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index 830f9a1e..8dd65406 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -8,7 +8,7 @@
:inline-message="true"
:disabled="disabled"
>
-
+
@@ -34,6 +34,31 @@
+
+
+
+
+
+
+
+
+
+
@@ -58,13 +83,7 @@
-
-
-
-
-
-
-
+
@@ -85,7 +104,7 @@
-
+
@@ -250,6 +269,19 @@ const handleDelete = (index) => {
formData.value.splice(index, 1)
}
+/** 处理产品变更 */
+const onChangeProductCode = (productBarCode, row) => {
+ const product = productList.value.find((item) => item.barCode === productBarCode)
+ if (product) {
+ row.productUnitName = product.unitName
+ row.productBarCode = product.barCode
+ row.productPrice = product.minPrice
+ row.productId = product.id
+ }
+ // 加载库存
+ setStockCount(row)
+}
+
/** 处理仓库变更 */
const onChangeWarehouse = (warehouseId, row) => {
// 加载库存
diff --git a/src/views/erp/stock/out/components/StockOutItemForm.vue b/src/views/erp/stock/out/components/StockOutItemForm.vue
index eca84e2d..80fea698 100644
--- a/src/views/erp/stock/out/components/StockOutItemForm.vue
+++ b/src/views/erp/stock/out/components/StockOutItemForm.vue
@@ -8,7 +8,7 @@
:inline-message="true"
:disabled="disabled"
>
-
+
@@ -34,6 +34,26 @@
+
+
+
+
+
+
+
+
+
@@ -58,13 +78,13 @@
-
+
@@ -85,7 +105,7 @@
-
+
@@ -250,6 +270,19 @@ const handleDelete = (index) => {
formData.value.splice(index, 1)
}
+/** 处理产品变更 */
+const onChangeProductCode = (productBarCode, row) => {
+ const product = productList.value.find((item) => item.barCode === productBarCode)
+ if (product) {
+ row.productUnitName = product.unitName
+ row.productBarCode = product.barCode
+ row.productPrice = product.minPrice
+ row.productId = product.id
+ }
+ // 加载库存
+ setStockCount(row)
+}
+
/** 处理仓库变更 */
const onChangeWarehouse = (warehouseId, row) => {
// 加载库存