From aaf2e90e8f2967dde6f3bd5351523234881e2c98 Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期二, 03 三月 2026 14:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_KTHG' into dev_KTHG
---
src/views/inventoryManagement/stockManagement/New.vue | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
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');
--
Gitblit v1.9.3