From 141a3b8aa81efa30d5efc6d6669234f4c726aa47 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 08 五月 2026 13:52:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮
---
src/views/basicData/product/index.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index 99ab028..99ebc4f 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -163,6 +163,17 @@
@keydown.enter.prevent />
</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="搴撳瓨閲忥細"
+ prop="stockInventory">
+ <el-input-number v-model="modelForm.stockInventory"
+ :min="0"
+ style="width: 100%"
+ placeholder="璇疯緭鍏ュ簱瀛橀噺"
+ controls-position="right"
+ @keydown.enter.prevent />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
<template #footer>
@@ -303,6 +314,10 @@
prop: "unit",
},
{
+ label: "搴撳瓨閲�",
+ prop: "stockInventory",
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
@@ -340,18 +355,18 @@
model: "",
unit: "",
productCode: "",
+ stockInventory: 0,
},
modelRules: {
model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- productCode: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
},
});
const { form, rules, modelForm, modelRules } = toRefs(data);
// 鏌ヨ浜у搧鏍�
const getProductTreeList = () => {
treeLoad.value = true;
- productTreeList()
+ productTreeList({ productType: "鎴愬搧" })
.then(res => {
list.value = res || [];
normalizeExpandedKeys(list.value);
@@ -407,6 +422,7 @@
modelForm.value.model = "";
modelForm.value.unit = "";
modelForm.value.productCode = "";
+ modelForm.value.stockInventory = 0;
modelForm.value.id = "";
if (type === "edit") {
modelForm.value = { ...data };
--
Gitblit v1.9.3