From aad956a2a7ab42d25bee95352a5b601d5040af86 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 06 三月 2026 17:36:12 +0800
Subject: [PATCH] feat: 出库台账、库存管理、原材料出库领用都添加净重显示
---
src/views/inventoryManagement/dispatchLog/Record.vue | 5 +++++
src/views/inventoryManagement/stockManagement/Subtract.vue | 20 ++++++++++++++++++--
src/views/inventoryManagement/stockReport/index.vue | 5 +++++
src/views/inventoryManagement/receiptManagement/Record.vue | 8 ++++----
4 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 1637226..a41452f 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -77,6 +77,11 @@
show-overflow-tooltip
/>
<el-table-column
+ label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ show-overflow-tooltip
+ />
+ <el-table-column
label="鍑哄簱浜�"
prop="createBy"
show-overflow-tooltip
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 9e28b38..b738581 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -73,6 +73,10 @@
<el-table-column label="鍏ュ簱鏁伴噺"
prop="stockInNum"
show-overflow-tooltip/>
+ <el-table-column label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ v-if="type === '0'"
+ show-overflow-tooltip/>
<el-table-column label="鍏ュ簱浜�"
prop="createBy"
show-overflow-tooltip/>
@@ -85,10 +89,6 @@
</el-table-column>
<el-table-column label="杩囩鏃ユ湡"
prop="weighingDate"
- v-if="type === '0'"
- show-overflow-tooltip/>
- <el-table-column label="鍑�閲�(鍚�)"
- prop="netWeight"
v-if="type === '0'"
show-overflow-tooltip/>
</el-table>
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index a277a00..6294513 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -44,6 +44,14 @@
<el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
</el-form-item>
+ <el-form-item
+ v-if="isRawMaterial"
+ label="鍑�閲�"
+ prop="netWeight"
+ >
+ <el-input-number v-model="formState.netWeight" :precision="2" :step="0.01" :min="0" style="width: 100%" />
+ </el-form-item>
+
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formState.remark" type="textarea" />
</el-form-item>
@@ -97,6 +105,10 @@
return props.record.unLockedQuantity ? props.record.unLockedQuantity : 0;
})
+const isRawMaterial = computed(() => {
+ return props.record.parentName === '鍘熸潗鏂�';
+})
+
const initFormData = () => {
if (props.record) {
formState.value = {
@@ -113,6 +125,7 @@
model: "",
unit: "",
qualitity: 0,
+ netWeight: undefined,
remark: '',
});
@@ -135,8 +148,11 @@
productId: undefined,
productModelId: undefined,
productName: "",
- productModelName: "",
- description: '',
+ model: "",
+ unit: "",
+ qualitity: 0,
+ netWeight: undefined,
+ remark: '',
};
isShow.value = false;
};
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index ff1d901..5e9dfb5 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -214,6 +214,11 @@
prop="currentStock"
align="center"
/>
+ <el-table-column
+ label="鐜板噣閲�(鍚�)"
+ prop="currentWeight"
+ align="center"
+ />
<el-table-column label="鏉ユ簮"
prop="recordType"
v-if="searchForm.reportType !== 'inout'"
--
Gitblit v1.9.3