From c86781de7dd883ac5c90c20f31a6bc05bf5f6036 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 29 六月 2026 17:47:32 +0800
Subject: [PATCH] 新疆大罗素 1.库存管理页面、采购台账新增/编辑弹窗、入库记录页面添加库位字段
---
src/views/inventoryManagement/stockManagement/New.vue | 24 ++++++++++--------------
src/views/procurementManagement/procurementLedger/index.vue | 13 +++++--------
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 1 +
src/api/equipmentManagement/ledger.js | 7 +++++++
src/views/inventoryManagement/receiptManagement/Record.vue | 3 +++
5 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/api/equipmentManagement/ledger.js b/src/api/equipmentManagement/ledger.js
index d1b65b0..445d60d 100644
--- a/src/api/equipmentManagement/ledger.js
+++ b/src/api/equipmentManagement/ledger.js
@@ -42,3 +42,10 @@
method: "get",
});
};
+
+export const getIotDeviceList = () => {
+ return request({
+ url: "/device/ledger/iotDeviceList",
+ method: "get",
+ });
+};
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index de2b2f0..c89b6fe 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -122,6 +122,9 @@
<el-table-column label="鍗曚綅"
prop="unit"
show-overflow-tooltip />
+ <el-table-column label="搴撲綅"
+ prop="warehouse"
+ show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏁伴噺"
prop="stockInNum"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index b457019..ee03f68 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -142,8 +142,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="搴撲綅"
- prop="storageLocation">
- <el-input v-model="formState.storageLocation"
+ prop="warehouse">
+ <el-input v-model="formState.warehouse"
placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄨ幏鍙�"
disabled />
</el-form-item>
@@ -176,7 +176,7 @@
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import { addStockInRecordOnly } from "@/api/inventoryManagement/stockInventory.js";
import { createStockUnInventory } from "@/api/inventoryManagement/stockUninventory.js";
- import { getLedgerPage } from "@/api/equipmentManagement/ledger.js";
+ import { getIotDeviceList as getIotDeviceListApi } from "@/api/equipmentManagement/ledger.js";
const props = defineProps({
visible: {
@@ -208,7 +208,7 @@
needInspect: false,
inspectType: 0,
deviceId: "",
- storageLocation: "",
+ warehouse: "",
});
// IoT璁惧鍒楄〃
@@ -254,7 +254,7 @@
needInspect: false,
inspectType: 0,
deviceId: "",
- storageLocation: "",
+ warehouse: "",
};
isShow.value = false;
};
@@ -277,13 +277,9 @@
// 鑾峰彇IoT璁惧鍒楄〃
const getIotDeviceList = async () => {
try {
- const res = await getLedgerPage({
- isIotDevice: 1,
- page: 1,
- size: 999,
- });
- if (res.data && res.data.records) {
- iotDeviceList.value = res.data.records;
+ const res = await getIotDeviceListApi();
+ if (res.data) {
+ iotDeviceList.value = res.data;
}
} catch (error) {
console.error("鑾峰彇IoT璁惧鍒楄〃澶辫触:", error);
@@ -294,9 +290,9 @@
const handleDeviceChange = (deviceId) => {
const device = iotDeviceList.value.find(d => d.id === deviceId);
if (device) {
- formState.value.storageLocation = device.storageLocation || '';
+ formState.value.warehouse = device.storageLocation || '';
} else {
- formState.value.storageLocation = '';
+ formState.value.warehouse = '';
}
};
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index 364a04d..d71941a 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -167,6 +167,7 @@
<el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="quantity" label="鏁伴噺" />
+ <el-table-column prop="storageLocation" label="搴撲綅" />
<el-table-column prop="taxInclusiveUnitPrice" label="鍚◣鍗曚环">
<template #default="scope"
>楼{{
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 12b8f5a..47ec1e4 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -1021,7 +1021,7 @@
import { modelList, productTreeList } from "@/api/basicData/product.js";
import { getSparePartsList } from "@/api/equipmentManagement/spareParts.js";
import { getSupplierContractList, getSupplierContractFilesByNo } from "@/api/basicData/supplierContract.js";
- import { getLedgerPage } from "@/api/equipmentManagement/ledger.js";
+ import { getIotDeviceList as getIotDeviceListApi } from "@/api/equipmentManagement/ledger.js";
import dayjs from "dayjs";
import FileUpload from "@/components/AttachmentUpload/file/index.vue";
@@ -2344,15 +2344,12 @@
};
// 鑾峰彇IoT璁惧鍒楄〃
+ // 鑾峰彇IoT璁惧鍒楄〃
const getIotDeviceList = async () => {
try {
- const res = await getLedgerPage({
- isIotDevice: 1,
- page: 1,
- size: 999,
- });
- if (res.data && res.data.records) {
- iotDeviceList.value = res.data.records;
+ const res = await getIotDeviceListApi();
+ if (res.data) {
+ iotDeviceList.value = res.data;
}
} catch (error) {
console.error("鑾峰彇IoT璁惧鍒楄〃澶辫触:", error);
--
Gitblit v1.9.3