From cc0ed4513213c1210606deaef82de1587ee1c21d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 五月 2026 16:41:30 +0800
Subject: [PATCH] 仓库
---
src/views/inventoryManagement/dispatchLog/Record.vue | 32 ++++++++--------
src/views/inventoryManagement/stockManagement/New.vue | 8 ++--
src/views/inventoryManagement/receiptManagement/Record.vue | 12 +++---
src/views/inventoryManagement/stockProfitLoss/index.vue | 12 +++---
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 7ba8dfd..c7135b3 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -150,7 +150,7 @@
<el-input v-model="formState.unit" disabled />
</el-form-item>
<el-form-item label="浠撳簱"
- prop="warehouseId"
+ prop="warehouseInfoId"
:rules="[
{
required: true,
@@ -158,15 +158,14 @@
trigger: 'change',
}
]">
- <el-select v-model="formState.warehouseId"
+ <el-select v-model="formState.warehouseInfoId"
placeholder="璇烽�夋嫨浠撳簱"
clearable
- :disabled="isEdit || !formState.productId"
@change="handleWarehouseChange"
style="width: 100%">
<el-option v-for="warehouse in warehouseList"
:key="warehouse.id"
- :label="warehouse.name"
+ :label="warehouse.warehouseName"
:value="warehouse.id" />
</el-select>
</el-form-item>
@@ -182,7 +181,6 @@
<el-select v-model="formState.batchNo"
placeholder="璇烽�夋嫨鎵瑰彿"
clearable
- :disabled="isEdit"
@change="handleBatchNoChange"
style="width: 100%">
<el-option v-for="batch in batchNoList"
@@ -244,7 +242,7 @@
]">
<el-select v-model="formState.type"
placeholder="璇烽�夋嫨搴撳瓨绫诲瀷"
- :disabled="isEdit">
+ >
<el-option label="鍚堟牸搴撳瓨"
value="qualified" />
<el-option label="涓嶅悎鏍煎簱瀛�"
@@ -293,6 +291,7 @@
import { addStockOutRecordOnly } from "@/api/inventoryManagement/stockInventory.js";
import { addUnqualifiedStockOutRecordOnly } from "@/api/inventoryManagement/stockUninventory.js";
import { getWarehouseList } from "@/api/inventoryManagement/warehouse.js";
+import { productModelListByUrl } from "@/api/basicData/productModel.js";
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -357,7 +356,7 @@
productName: "",
productModelName: "",
unit: "",
- warehouseId: null, // 浠撳簱ID
+ warehouseInfoId: null, // 浠撳簱ID
type: undefined,
qualitity: 0,
batchNo: null,
@@ -477,9 +476,10 @@
type: props.type === '0' ? 'qualified' : 'unqualified',
qualitity: row.stockOutNum,
batchNo: row.batchNo,
+ warehouseInfoId: row.warehouseInfoId,
recordType: row.recordType,
remark: row.remark || "",
- maxStock: row.stockOutNum || 0, // 缂栬緫鏃朵娇鐢ㄥ綋鍓嶅嚭搴撴暟閲忎綔涓烘渶澶у簱瀛橈紙鍥犱负鏄慨鏀瑰凡鏈夎褰曪級
+ maxStock: row.stockOutNum || 0,
};
// 缂栬緫鏃朵粠batchNoMaps鑾峰彇鎵瑰彿鍒楄〃
if (row.batchNoMaps && Object.keys(row.batchNoMaps).length > 0) {
@@ -504,7 +504,7 @@
productName: "",
productModelName: "",
unit: "",
- warehouseId: null,
+ warehouseInfoId: null,
type: undefined,
qualitity: 0,
batchNo: null,
@@ -551,7 +551,7 @@
batchNoList.value = [];
batchNoStockMap.value = {};
rawBatchNoMaps.value = {};
- formState.value.warehouseId = null;
+ formState.value.warehouseInfoId = null;
formState.value.batchNo = null;
formState.value.maxStock = 0;
@@ -564,9 +564,9 @@
warehouseMap[w.id] = w.warehouseName || w.name || w.warehouseCode || `浠撳簱${w.id}`;
});
// 鏋勫缓浠撳簱鍒楄〃
- warehouseList.value = Object.keys(product.batchNoMaps).map(warehouseId => ({
- id: warehouseId,
- name: warehouseMap[warehouseId] || `浠撳簱${warehouseId}`
+ warehouseList.value = Object.keys(product.batchNoMaps).map(warehouseInfoId => ({
+ id: warehouseInfoId,
+ warehouseName: warehouseMap[warehouseInfoId] || `浠撳簱${warehouseInfoId}`
}));
}
showProductSelect.value = false;
@@ -576,15 +576,15 @@
};
// 浠撳簱閫夋嫨鍙樺寲澶勭悊
-const handleWarehouseChange = (warehouseId) => {
+const handleWarehouseChange = (warehouseInfoId) => {
batchNoList.value = [];
batchNoStockMap.value = {};
formState.value.batchNo = null;
formState.value.maxStock = 0;
- if (warehouseId && rawBatchNoMaps.value[warehouseId]) {
+ if (warehouseInfoId && rawBatchNoMaps.value[warehouseInfoId]) {
// 瑙ｆ瀽璇ヤ粨搴撲笅鐨勬壒鍙锋暟鎹紝鏍煎紡涓猴細[{鎵瑰彿: 搴撳瓨}, {鎵瑰彿: 搴撳瓨}]
- const batchArray = rawBatchNoMaps.value[warehouseId];
+ const batchArray = rawBatchNoMaps.value[warehouseInfoId];
const batchMap = {};
const batches = [];
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 929b2a0..b7d2253 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -153,7 +153,7 @@
<el-input v-model="formState.unit" disabled />
</el-form-item>
<el-form-item label="搴撲綅"
- prop="warehouseId"
+ prop="warehouseInfoId"
:rules="[
{
required: true,
@@ -161,7 +161,7 @@
trigger: 'change',
}
]">
- <el-select v-model="formState.warehouseId"
+ <el-select v-model="formState.warehouseInfoId"
placeholder="璇烽�夋嫨搴撲綅"
clearable
style="width: 100%">
@@ -325,7 +325,7 @@
type: undefined,
qualitity: 0,
batchNo: null,
- warehouseId: undefined,
+ warehouseInfoId: undefined,
warnNum: 0,
recordType: "",
remark: "",
@@ -454,7 +454,7 @@
type: props.type === '0' ? 'qualified' : 'unqualified',
qualitity: row.stockInNum,
batchNo: row.batchNo,
- warehouseId: row.warehouseId,
+ warehouseInfoId: row.warehouseInfoId,
warnNum: row.warnNum || 0,
recordType: row.recordType,
remark: row.remark || "",
@@ -474,7 +474,7 @@
type: undefined,
qualitity: 0,
batchNo: null,
- warehouseId: undefined,
+ warehouseInfoId: undefined,
warnNum: 0,
recordType: "",
remark: "",
@@ -563,7 +563,7 @@
model: formState.value.productModelName,
unit: formState.value.unit,
batchNo: formState.value.batchNo,
- warehouseId: formState.value.warehouseId,
+ warehouseInfoId: formState.value.warehouseInfoId,
stockInNum: formState.value.qualitity,
recordType: formState.value.recordType,
remark: formState.value.remark,
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 5a22acd..aa914e7 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -33,7 +33,7 @@
disabled />
</el-form-item>
<el-form-item label="搴撲綅"
- prop="warehouseId"
+ prop="warehouseInfoId"
:rules="[
{
required: true,
@@ -41,7 +41,7 @@
trigger: 'change',
}
]">
- <el-select v-model="formState.warehouseId"
+ <el-select v-model="formState.warehouseInfoId"
placeholder="璇烽�夋嫨搴撲綅"
clearable
style="width: 100%">
@@ -139,7 +139,7 @@
productName: "",
productModelName: "",
unit: "",
- warehouseId: undefined,
+ warehouseInfoId: undefined,
type: undefined,
qualitity: 0,
batchNo: null,
@@ -190,7 +190,7 @@
productName: "",
productModelName: "",
unit: "",
- warehouseId: undefined,
+ warehouseInfoId: undefined,
type: undefined,
qualitity: 0,
batchNo: null,
diff --git a/src/views/inventoryManagement/stockProfitLoss/index.vue b/src/views/inventoryManagement/stockProfitLoss/index.vue
index fdd21fb..d68e15c 100644
--- a/src/views/inventoryManagement/stockProfitLoss/index.vue
+++ b/src/views/inventoryManagement/stockProfitLoss/index.vue
@@ -58,8 +58,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="浠撳簱" prop="warehouseId">
- <el-select v-model="form.warehouseId" placeholder="璇烽�夋嫨浠撳簱" style="width: 100%" filterable :disabled="form.source === 'check'">
+ <el-form-item label="浠撳簱" prop="warehouseInfoId">
+ <el-select v-model="form.warehouseInfoId" placeholder="璇烽�夋嫨浠撳簱" style="width: 100%" filterable :disabled="form.source === 'check'">
<el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@@ -336,7 +336,7 @@
const form = reactive({
id: null,
type: 'profit',
- warehouseId: null,
+ warehouseInfoId: null,
remark: '',
source: 'manual',
checkPlanNo: '',
@@ -358,7 +358,7 @@
const rules = {
type: [{ required: true, message: '璇烽�夋嫨鐩堜簭绫诲瀷', trigger: 'change' }],
- warehouseId: [{ required: true, message: '璇烽�夋嫨浠撳簱', trigger: 'change' }],
+ warehouseInfoId: [{ required: true, message: '璇烽�夋嫨浠撳簱', trigger: 'change' }],
}
const totalDiffAmount = computed(() => {
@@ -396,7 +396,7 @@
dialogTitle.value = mode === 'add' ? '鏂板缓鐩堜簭鍗�' : '缂栬緫鐩堜簭鍗�'
if (mode === 'add') {
Object.assign(form, {
- id: null, type: 'profit', warehouseId: null, remark: '',
+ id: null, type: 'profit', warehouseInfoId: null, remark: '',
source: 'manual', checkPlanNo: '', items: [],
})
}
@@ -409,7 +409,7 @@
Object.assign(form, {
id: data.id,
type: data.type,
- warehouseId: data.warehouseId,
+ warehouseInfoId: data.warehouseInfoId,
remark: data.remark,
source: data.source,
checkPlanNo: data.checkPlanNo,
--
Gitblit v1.9.3