From 8545001aa6c929f64417b07d2dbc962edd6b32d4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 01 六月 2026 13:01:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/inventoryManagement/stockManagement/New.vue | 42 ++++++++++++++++++++++++++++++++++++++++--
src/views/inventoryManagement/stockManagement/Record.vue | 3 +++
2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index bc83a73..06d72bb 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -49,6 +49,23 @@
value="unqualified" />
</el-select>
</el-form-item>
+ <el-form-item label="浠撳簱"
+ prop="warehouse"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨浠撳簱',
+ trigger: 'change',
+ }
+ ]">
+ <el-select v-model="formState.warehouse"
+ placeholder="璇烽�夋嫨浠撳簱">
+ <el-option v-for="item in warehouseOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value" />
+ </el-select>
+ </el-form-item>
<el-form-item label="搴撳瓨鏁伴噺"
prop="qualitity">
<el-input-number v-model="formState.qualitity"
@@ -102,10 +119,11 @@
</template>
<script setup>
- import { ref, computed, watch, getCurrentInstance } from "vue";
+ import { ref, computed, watch, getCurrentInstance, onMounted } from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import { addStockInRecordOnly } from "@/api/inventoryManagement/stockInventory.js";
import { createStockUnInventory } from "@/api/inventoryManagement/stockUninventory.js";
+ import { getDicts } from "@/api/system/dict/data";
const props = defineProps({
visible: {
@@ -128,6 +146,7 @@
productName: "",
productModelName: "",
unit: "",
+ warehouse: undefined,
type: undefined,
qualitity: 0,
batchNo: null,
@@ -135,6 +154,9 @@
createTime: "",
remark: "",
});
+
+ // 浠撳簱閫夐」
+ const warehouseOptions = ref([]);
const isShow = computed({
get() {
@@ -146,6 +168,21 @@
});
const showProductSelectDialog = ref(false);
+
+ // 鑾峰彇浠撳簱瀛楀吀鏁版嵁
+ const getWarehouseOptions = async () => {
+ const res = await getDicts("warehouse");
+ if (res.code === 200) {
+ warehouseOptions.value = res.data.map(item => ({
+ label: item.dictLabel,
+ value: item.dictValue,
+ }));
+ }
+ };
+
+ onMounted(() => {
+ getWarehouseOptions();
+ });
// 鎵瑰彿涓虹┖鏃惰浆涓� null
watch(
@@ -167,6 +204,7 @@
productName: "",
productModelName: "",
unit: "",
+ warehouse: undefined,
type: undefined,
qualitity: 0,
batchNo: null,
@@ -231,4 +269,4 @@
handleSubmit,
isShow,
});
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index 934ae06..13217f9 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -87,6 +87,9 @@
<el-table-column label="鎵瑰彿"
prop="batchNo"
show-overflow-tooltip />
+ <el-table-column label="浠撳簱"
+ prop="warehouse"
+ show-overflow-tooltip />
<el-table-column label="鍚堟牸搴撳瓨鏁伴噺"
prop="qualifiedQuantity"
show-overflow-tooltip />
--
Gitblit v1.9.3