src/views/basicData/supplierManage/components/BlacklistTab.vue

@@ -231,7 +231,10 @@
        </div>
      </template>
    </el-dialog>
    <files-dia ref="filesDia"></files-dia>
    <FileList v-if="fileListDialogVisible"
              v-model:visible="fileListDialogVisible"
              record-type="supplier_manage"
              :record-id="recordId" />
  </div>
</template>

@@ -249,7 +252,9 @@
} from "@/api/basicData/supplierManageFile.js";
import useUserStore from "@/store/modules/user";
import { getToken } from "@/utils/auth.js";
import FilesDia from "../filesDia.vue";
const FileList = defineAsyncComponent(() =>
    import("@/components/Dialog/FileList.vue")
);
const { proxy } = getCurrentInstance();
const userStore = useUserStore();

@@ -327,7 +332,7 @@
        name: "资质文件",
        type: "text",
        clickFun: (row) => {
          openFilesFormDia(row)
          openFileDialog(row)
        }
      }
    ],
@@ -342,7 +347,8 @@
  size: 100,
  total: 0,
});
const filesDia = ref()
const fileListDialogVisible = ref(false);
const recordId = ref();
// 用户信息表单弹框数据
const operationType = ref("");
const dialogFormVisible = ref(false);
@@ -567,10 +573,9 @@
  return `${year}-${month}-${day}`;
}
// 打开附件弹框
const openFilesFormDia = (row) => {
  nextTick(() => {
    filesDia.value?.openDialog(row)
  })
const openFileDialog = async row => {
  recordId.value = row.id;
  fileListDialogVisible.value = true;
};

onMounted(() => {

 src/views/basicData/supplierManage/components/HomeTab.vue

@@ -237,7 +237,10 @@
        </div>
      </template>
    </el-dialog>
    <files-dia ref="filesDia"></files-dia>
    <FileList v-if="fileListDialogVisible"
              v-model:visible="fileListDialogVisible"
              record-type="supplier_manage"
              :record-id="recordId" />
  </div>
</template>

@@ -255,7 +258,9 @@
} from "@/api/basicData/supplierManageFile.js";
import useUserStore from "@/store/modules/user";
import { getToken } from "@/utils/auth.js";
import FilesDia from "../filesDia.vue";
const FileList = defineAsyncComponent(() =>
    import("@/components/Dialog/FileList.vue")
);
const { proxy } = getCurrentInstance();
const userStore = useUserStore();

@@ -333,7 +338,7 @@
        name: "资质文件",
        type: "text",
        clickFun: (row) => {
          openFilesFormDia(row)
          openFileDialog(row)
        }
      }
    ],
@@ -343,12 +348,13 @@
const selectedRows = ref([]);
const userList = ref([]);
const tableLoading = ref(false);
const fileListDialogVisible = ref(false);
const recordId = ref();
const page = reactive({
  current: 1,
  size: 100,
  total: 0,
});
const filesDia = ref()
// 用户信息表单弹框数据
const operationType = ref("");
const dialogFormVisible = ref(false);
@@ -573,10 +579,9 @@
  return `${year}-${month}-${day}`;
}
// 打开附件弹框
const openFilesFormDia = (row) => {
  nextTick(() => {
    filesDia.value?.openDialog(row)
  })
const openFileDialog = async row => {
  recordId.value = row.id;
  fileListDialogVisible.value = true;
};

onMounted(() => {

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -189,10 +189,10 @@
                       :value="batch" />
          </el-select>
        </el-form-item>
        <el-form-item v-if="formState.batchNo && batchNoStockMap[formState.batchNo]"
        <el-form-item v-if="formState.batchNo && batchNoStockMap[formState.batchNo] !== undefined"
                      label="当前批号库存"
                      prop="currentStock">
          <el-input v-model="batchNoStockMap[formState.batchNo]" disabled />
          <el-input :model-value="batchNoStockMap[formState.batchNo]" disabled />
        </el-form-item>
        <el-form-item label="出库数量"
                      prop="qualitity"
@@ -288,7 +288,7 @@
  findAllQualifiedStockOutRecordTypeOptions,
  findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";
import { addStockOutRecordOnly } from "@/api/inventoryManagement/stockInventory.js";
import { addStockOutRecordOnly, getStockInventoryByModelId } 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";
@@ -462,10 +462,136 @@
};

// 编辑
const handleEdit = (row) => {
const handleEdit = async (row) => {
  dialogType.value = 'edit';
  resetForm();
  // 填充表单数据

  // 先加载所有数据，最后再赋值 formState
  let loadedWarehouseList = [];
  let loadedBatchNoList = [];
  let loadedBatchNoStockMap = {};
  let loadedMaxStock = 0;
  let loadedRawBatchNoMaps = {};

  // 编辑时加载仓库列表
  if (row.warehouseInfoId) {
    const allWarehouses = await loadWarehouseList();
    const currentWarehouse = allWarehouses.find(w => String(w.id) === String(row.warehouseInfoId));
    if (currentWarehouse) {
      loadedWarehouseList = [{
        id: currentWarehouse.id,
        warehouseName: currentWarehouse.warehouseName || currentWarehouse.name || currentWarehouse.warehouseCode || `仓库${currentWarehouse.id}`
      }];
    }
  }

  // 编辑时查询产品库存
  if (row.productModelId) {
    try {
      console.log('编辑时查询库存，productModelId:', row.productModelId);
      console.log('当前row数据:', row);
      const res = await productModelListByUrl('/basic/product/pageModelAndQua', {
        id: row.productModelId,
        page: 1,
        size: 1
      });
      console.log('查询库存接口返回:', res);
      // 接口直接返回 {records: [], total: ...}，没有 data 层和 code
      const records = res.records || (res.data && res.data.records) || [];
      if (records.length > 0) {
        const product = records[0];
        console.log('产品数据:', product);
        console.log('batchNoMaps:', product.batchNoMaps);
        if (product.batchNoMaps && Object.keys(product.batchNoMaps).length > 0) {
          loadedRawBatchNoMaps = product.batchNoMaps;
          // 获取所有仓库信息用于反显名称
          const allWarehouses = await loadWarehouseList();
          const warehouseMap = {};
          allWarehouses.forEach(w => {
            warehouseMap[w.id] = w.warehouseName || w.name || w.warehouseCode || `仓库${w.id}`;
          });
          // 构建仓库列表，确保包含当前记录的仓库
          const warehouseIds = Object.keys(product.batchNoMaps);
          // 如果当前记录的仓库不在 product.batchNoMaps 中，添加进去
          if (row.warehouseInfoId && !warehouseIds.some(id => String(id) === String(row.warehouseInfoId))) {
            warehouseIds.push(String(row.warehouseInfoId));
          }
          loadedWarehouseList = warehouseIds.map(warehouseInfoId => ({
            id: warehouseInfoId,
            warehouseName: warehouseMap[warehouseInfoId] || `仓库${warehouseInfoId}`
          }));
          console.log('当前仓库ID:', row.warehouseInfoId);
          console.log('该仓库的batchNoMaps:', product.batchNoMaps[row.warehouseInfoId]);
          // 如果当前有仓库ID，解析该仓库的批号库存（处理类型不匹配问题）
          let batchArray = null;
          if (row.warehouseInfoId) {
            // 尝试多种方式获取批号数据
            batchArray = product.batchNoMaps[row.warehouseInfoId] ||
                        product.batchNoMaps[String(row.warehouseInfoId)] ||
                        product.batchNoMaps[Number(row.warehouseInfoId)];
          }
          if (batchArray) {
            console.log('batchArray:', batchArray);
            const batchMap = {};
            const batches = [];
            batchArray.forEach(item => {
              const batchNo = Object.keys(item)[0];
              const stock = item[batchNo];
              console.log('批号:', batchNo, '库存:', stock);
              batches.push(batchNo);
              batchMap[batchNo] = stock;
            });
            loadedBatchNoList = batches;
            loadedBatchNoStockMap = batchMap;
            console.log('batchMap:', batchMap);
            console.log('当前批号:', row.batchNo);
            // 设置当前批号的库存
            if (row.batchNo && batchMap[row.batchNo] !== undefined) {
              loadedMaxStock = batchMap[row.batchNo];
              console.log('设置maxStock为:', loadedMaxStock);
            } else {
              console.log('未找到当前批号的库存');
              loadedMaxStock = 0;
            }
          } else {
            console.log('未找到当前仓库的batchNoMaps');
            loadedBatchNoList = row.batchNo ? [row.batchNo] : [];
            loadedBatchNoStockMap = {};
            loadedMaxStock = 0;
          }
        } else {
          console.log('产品没有batchNoMaps');
          loadedBatchNoList = row.batchNo ? [row.batchNo] : [];
          loadedBatchNoStockMap = {};
          loadedMaxStock = 0;
        }
      } else {
        console.log('接口返回数据异常:', res);
        loadedBatchNoList = row.batchNo ? [row.batchNo] : [];
        loadedBatchNoStockMap = {};
        loadedMaxStock = 0;
      }
    } catch (error) {
      console.error('查询产品库存失败', error);
      loadedBatchNoList = row.batchNo ? [row.batchNo] : [];
      loadedBatchNoStockMap = {};
      loadedMaxStock = 0;
    }
  } else {
    console.log('没有productModelId');
    loadedBatchNoList = row.batchNo ? [row.batchNo] : [];
    loadedBatchNoStockMap = {};
    loadedMaxStock = 0;
  }

  // 所有数据加载完成后，一次性赋值
  warehouseList.value = loadedWarehouseList;
  batchNoList.value = loadedBatchNoList;
  batchNoStockMap.value = loadedBatchNoStockMap;
  rawBatchNoMaps.value = loadedRawBatchNoMaps;

  // 最后赋值 formState，确保仓库列表已经准备好
  // 注意：将 warehouseInfoId 转换为字符串，确保与 warehouseList 中的 id 类型匹配
  formState.value = {
    id: row.id,
    productId: row.productId,
@@ -476,22 +602,13 @@
    type: props.type === '0' ? 'qualified' : 'unqualified',
    qualitity: row.stockOutNum,
    batchNo: row.batchNo,
    warehouseInfoId: row.warehouseInfoId,
    warehouseInfoId: row.warehouseInfoId != null ? String(row.warehouseInfoId) : null,
    recordType: row.recordType,
    remark: row.remark || "",
    maxStock: row.stockOutNum || 0,
    maxStock: loadedMaxStock,
  };
  // 编辑时从batchNoMaps获取批号列表
  if (row.batchNoMaps && Object.keys(row.batchNoMaps).length > 0) {
    batchNoList.value = Object.keys(row.batchNoMaps);
    batchNoStockMap.value = row.batchNoMaps;
  } else if (row.batchNo) {
    batchNoList.value = [row.batchNo];
    batchNoStockMap.value = { [row.batchNo]: row.stockOutNum || 0 };
  } else {
    batchNoList.value = [];
    batchNoStockMap.value = {};
  }

  // 所有数据加载完成后再显示弹窗
  dialogVisible.value = true;
};


 src/views/procurementManagement/procurementLedger/index.vue

@@ -671,6 +671,7 @@
  const salesContractList = ref([]);
  const supplierList = ref([]);
  const tableLoading = ref(false);
  const recordId = ref();
  const fileListDialogVisible = ref(false);
  const page = reactive({
    current: 1,

 src/views/salesManagement/opportunityManagement/index.vue

@@ -101,9 +101,9 @@
        <el-table-column label="签约金额" prop="contractAmount" show-overflow-tooltip width="150" />
        <!-- <el-table-column label="客户描述" prop="description" show-overflow-tooltip min-width="200" /> -->
        <el-table-column label="录入人" prop="entryPerson" show-overflow-tooltip width="120" />
        <el-table-column label="更新日期" prop="updateTime" width="120">
        <el-table-column label="录入日期" prop="entryDate" width="120">
          <template #default="{ row }">
            {{ formatDate(row.updateTime) }}
            {{ formatDate(row.entryDate) }}
          </template>
        </el-table-column>
        <el-table-column label="操作" fixed="right" width="240" align="center">