新疆大罗素
1.库存管理页面、采购台账新增/编辑弹窗、入库记录页面添加库位字段
已修改5个文件
48 ■■■■ 文件已修改
src/api/equipmentManagement/ledger.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/receiptManagement/Record.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockManagement/New.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/equipmentManagement/ledger.js
@@ -42,3 +42,10 @@
    method: "get",
  });
};
export const getIotDeviceList = () => {
  return request({
    url: "/device/ledger/iotDeviceList",
    method: "get",
  });
};
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 />
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 = '';
    }
  };
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"
                  >¥{{
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);