From 195770f92f7d739ffba6447fdbf3a3d5b9e009fa Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 24 四月 2026 16:32:57 +0800
Subject: [PATCH] fix(生产订单): 修复绑定工艺路线时的材料规格验证和显示问题
---
src/components/PIMTable/PIMTable.vue | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index dfbc231..bfb3c4e 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -30,7 +30,7 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column
- v-for="(item, index) in column"
+ v-for="(item, index) in visibleColumns"
:key="index"
:column-key="item.columnKey"
:filter-method="item.filterHandler"
@@ -45,6 +45,7 @@
:sortable="!!item.sortable"
:type="item.type"
:width="item.width"
+ :minWidth="item.minWidth"
>
<template #header="scope">
<div class="pim-table-header-cell">
@@ -225,7 +226,7 @@
<script setup>
import pagination from "./Pagination.vue";
-import { ref, inject, getCurrentInstance } from "vue";
+import { ref, inject, getCurrentInstance, computed, unref } from "vue";
import { ElMessage } from "element-plus";
// 鑾峰彇鍏ㄥ眬鐨� uploadHeader
@@ -233,7 +234,7 @@
const uploadHeader = proxy.uploadHeader;
const javaApi = proxy.javaApi;
-const emit = defineEmits(["pagination", "expand-change", "selection-change"]);
+const emit = defineEmits(["pagination", "expand-change", "selection-change", "row-click"]);
// Filters
const typeFn = (val, row) => {
@@ -333,6 +334,23 @@
},
});
+const resolveColumnVisible = (visible) => {
+ if (visible === undefined) return true;
+ if (typeof visible === "function") {
+ try {
+ return !!visible();
+ } catch (error) {
+ console.warn("PIMTable column visible function error:", error);
+ return true;
+ }
+ }
+ return !!unref(visible);
+};
+
+const visibleColumns = computed(() => {
+ return (props.column || []).filter((item) => resolveColumnVisible(item?.visible));
+});
+
// Data
const uploadRefs = ref([]);
const currentFiles = ref({});
@@ -427,6 +445,10 @@
emit("pagination", { page: page, limit: limit });
};
+const rowClick = (row) => {
+ emit("row-click", row);
+};
+
const expandChange = (row, expandedRows) => {
emit("expand-change", row, expandedRows);
};
--
Gitblit v1.9.3