From 766d14454eb2f1b1330fb9646196f66f0d0ba24a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 02 三月 2026 17:49:55 +0800
Subject: [PATCH] 1.入库管理增加过磅日期显示 2.库存管理增加产品类型和净重显示 3.新增合格库存表单增加过磅日期和净重
---
src/views/inventoryManagement/stockManagement/New.vue | 30 ++++++++++++++++++++++++++++++
src/views/basicData/product/ProductSelectDialog.vue | 1 +
src/views/inventoryManagement/stockManagement/Qualified.vue | 2 ++
src/views/inventoryManagement/receiptManagement/Record.vue | 4 ++++
4 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index 70dbb16..229cf87 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -20,6 +20,7 @@
@selection-change="handleSelectionChange" @select="handleSelect">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="搴忓彿" width="60" />
+ <el-table-column prop="parentName" label="绫诲瀷" min-width="160" />
<el-table-column prop="productName" label="浜у搧澶х被" min-width="160" />
<el-table-column prop="model" label="鍨嬪彿鍚嶇О" min-width="200" />
<el-table-column prop="unit" label="鍗曚綅" min-width="160" />
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index cd103ea..199afab 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -83,6 +83,10 @@
{{ getRecordType(scope.row.recordType) }}
</template>
</el-table-column>
+ <el-table-column label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ v-if="type === 'qualified'"
+ show-overflow-tooltip/>
</el-table>
<pagination v-show="total > 0"
:total="total"
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..5d3ac53 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -51,6 +51,30 @@
>
<el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
</el-form-item>
+ <!-- productType === 0锛氬師鏉愭枡 -->
+ <el-form-item
+ v-if="type === 'qualified' && formState.productType === 0"
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ >
+ <el-date-picker
+ style="width: 100%"
+ v-model="formState.weighingDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="璇烽�夋嫨杩囩鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+
+ <el-form-item
+ v-if="type === 'qualified' && formState.productType === 0"
+ label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ >
+ <el-input-number v-model="formState.netWeight" :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" />
@@ -101,8 +125,11 @@
productName: "",
productModelName: "",
unit: "",
+ weighingDate: undefined,
+ productType: undefined,
qualitity: 0,
warnNum: 0,
+ netWeight: undefined,
remark: '',
});
@@ -133,6 +160,8 @@
// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async (products) => {
+ formState.value.weighingDate = undefined;
+ formState.value.netWeight = undefined;
if (products && products.length > 0) {
const product = products[0];
formState.value.productId = product.productId;
@@ -140,6 +169,7 @@
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.productType = product.productType;
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 8b15db1..d463b5e 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -23,12 +23,14 @@
:row-class-name="tableRowClassName" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column label="浜у搧绫诲瀷" prop="parentName" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip />
+ <el-table-column label="鍑�閲�(鍚�)" prop="netWeight" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
--
Gitblit v1.9.3