yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(workspace): 统一 MES 选择组件 id 判空处理

pull/365/head
XuZhiqiang 2026-06-19 10:54:26 +08:00
parent 1e4436561c
commit 860a12a7e7
45 changed files with 259 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/web-antd/src/views/mes/dv/checkplan/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesDvCheckPlanApi.CheckPlan[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -87,7 +87,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antd/src/views/mes/dv/machinery/components/select-dialog.vue
View File

@ -43,7 +43,7 @@ function getMultipleSelectedRows() {
] as MesDvMachineryApi.Machinery[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -97,7 +97,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/md/client/components/select-dialog.vue
View File

@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

10
apps/web-antd/src/views/mes/md/item/components/product-bom-select.vue
View File

@ -44,12 +44,18 @@ const showClear = computed(
props.allowClear &&
!props.disabled &&
hovering.value &&
props.modelValue !== undefined &&
props.modelValue !== null,
);
/** 根据 BOM 子物料编号回显选择器 */
async function resolveBomById(bomItemId: number | undefined) {
if (bomItemId === null || props.itemId === null) {
if (
bomItemId === undefined ||
bomItemId === null ||
props.itemId === undefined ||
props.itemId === null
) {
selectedBom.value = undefined;
return;
}
@ -86,7 +92,7 @@ function clearSelected() {
/** 打开 BOM 物料选择弹窗 */
function handleClick(event: MouseEvent) {
if (props.disabled || props.itemId === null) {
if (props.disabled || props.itemId === undefined || props.itemId === null) {
return;
}
const target = event.target as HTMLElement;

6
apps/web-antd/src/views/mes/md/item/components/select-dialog.vue
View File

@ -90,7 +90,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/md/vendor/components/select-dialog.vue vendored
View File

@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/pro/card/components/select-dialog.vue
View File

@ -71,7 +71,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProCardApi.Card[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/pro/task/components/select-dialog.vue
View File

@ -95,7 +95,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProTaskApi.Task[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/pro/workorder/components/select-dialog.vue
View File

@ -98,7 +98,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProWorkOrderApi.WorkOrder[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

10
apps/web-antd/src/views/mes/qc/indicator/components/select-dialog.vue
View File

@ -28,8 +28,8 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesQcIndicatorApi.Indicator[];
records.forEach((row) => {
if (!row.id) {
selectedMap.set(row.id as number, row);
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
return [...selectedMap.values()];
@ -74,7 +74,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesQcIndicatorApi.Indicator[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/tm/tool/components/select-dialog.vue
View File

@ -78,7 +78,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/wm/batch/components/select-dialog.vue
View File

@ -92,7 +92,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmBatchApi.Batch[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antd/src/views/mes/wm/materialstock/components/select-dialog.vue
View File

@ -118,7 +118,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

10
apps/web-antd/src/views/mes/wm/packages/components/select-dialog.vue
View File

@ -41,8 +41,8 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesWmPackageApi.Package[];
records.forEach((row) => {
if (!row.id) {
selectedMap.set(row.id as number, row);
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
return [...selectedMap.values()];
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antd/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
View File

@ -33,7 +33,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesWmStockTakingPlanApi.StockTakingPlan[];
records.forEach((row) => {
if (!row.id) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -80,7 +80,11 @@ async function applyPreSelection() {
const rows =
gridApi.grid.getData() as MesWmStockTakingPlanApi.StockTakingPlan[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/dv/checkplan/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesDvCheckPlanApi.CheckPlan[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -87,7 +87,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/dv/machinery/components/select-dialog.vue
View File

@ -43,7 +43,7 @@ function getMultipleSelectedRows() {
] as MesDvMachineryApi.Machinery[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -97,7 +97,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/md/client/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesMdClientApi.Client[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

10
apps/web-antdv-next/src/views/mes/md/item/components/product-bom-select.vue
View File

@ -44,12 +44,18 @@ const showClear = computed(
props.allowClear &&
!props.disabled &&
hovering.value &&
props.modelValue !== undefined &&
props.modelValue !== null,
);
/** 根据 BOM 子物料编号回显选择器 */
async function resolveBomById(bomItemId: number | undefined) {
if (bomItemId === null || props.itemId === null) {
if (
bomItemId === undefined ||
bomItemId === null ||
props.itemId === undefined ||
props.itemId === null
) {
selectedBom.value = undefined;
return;
}
@ -86,7 +92,7 @@ function clearSelected() {
/** 打开 BOM 物料选择弹窗 */
function handleClick(event: MouseEvent) {
if (props.disabled || props.itemId === null) {
if (props.disabled || props.itemId === undefined || props.itemId === null) {
return;
}
const target = event.target as HTMLElement;

8
apps/web-antdv-next/src/views/mes/md/item/components/select-dialog.vue
View File

@ -42,7 +42,7 @@ function getMultipleSelectedRows() {
] as MesMdItemApi.Item[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -90,7 +90,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/md/vendor/components/select-dialog.vue vendored
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesMdVendorApi.Vendor[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antdv-next/src/views/mes/pro/card/components/select-dialog.vue
View File

@ -71,7 +71,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProCardApi.Card[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antdv-next/src/views/mes/pro/task/components/select-dialog.vue
View File

@ -95,7 +95,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProTaskApi.Task[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antdv-next/src/views/mes/pro/workorder/components/select-dialog.vue
View File

@ -98,7 +98,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProWorkOrderApi.WorkOrder[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/qc/indicator/components/select-dialog.vue
View File

@ -28,7 +28,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesQcIndicatorApi.Indicator[];
records.forEach((row) => {
if (row.id !== null) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -74,7 +74,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesQcIndicatorApi.Indicator[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/tm/tool/components/select-dialog.vue
View File

@ -36,7 +36,7 @@ function getMultipleSelectedRows() {
] as MesTmToolApi.Tool[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -78,7 +78,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antdv-next/src/views/mes/wm/batch/components/select-dialog.vue
View File

@ -92,7 +92,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmBatchApi.Batch[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-antdv-next/src/views/mes/wm/materialstock/components/select-dialog.vue
View File

@ -118,7 +118,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/wm/packages/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesWmPackageApi.Package[];
records.forEach((row) => {
if (row.id !== null) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-antdv-next/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
View File

@ -33,7 +33,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesWmStockTakingPlanApi.StockTakingPlan[];
records.forEach((row) => {
if (row.id !== null) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -80,7 +80,11 @@ async function applyPreSelection() {
const rows =
gridApi.grid.getData() as MesWmStockTakingPlanApi.StockTakingPlan[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/dv/checkplan/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesDvCheckPlanApi.CheckPlan[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -87,7 +87,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/dv/machinery/components/select-dialog.vue
View File

@ -43,7 +43,7 @@ function getMultipleSelectedRows() {
] as MesDvMachineryApi.Machinery[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -97,7 +97,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/md/client/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesMdClientApi.Client[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

10
apps/web-ele/src/views/mes/md/item/components/product-bom-select.vue
View File

@ -44,12 +44,18 @@ const showClear = computed(
props.clearable &&
!props.disabled &&
hovering.value &&
props.modelValue !== undefined &&
props.modelValue !== null,
);
/** 根据 BOM 子物料编号回显选择器 */
async function resolveBomById(bomItemId: number | undefined) {
if (bomItemId === null || props.itemId === null) {
if (
bomItemId === undefined ||
bomItemId === null ||
props.itemId === undefined ||
props.itemId === null
) {
selectedBom.value = undefined;
return;
}
@ -86,7 +92,7 @@ function clearSelected() {
/** 打开 BOM 物料选择弹窗 */
function handleClick(event: MouseEvent) {
if (props.disabled || props.itemId === null) {
if (props.disabled || props.itemId === undefined || props.itemId === null) {
return;
}
const target = event.target as HTMLElement;

8
apps/web-ele/src/views/mes/md/item/components/select-dialog.vue
View File

@ -42,7 +42,7 @@ function getMultipleSelectedRows() {
] as MesMdItemApi.Item[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -90,7 +90,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/md/vendor/components/select-dialog.vue vendored
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
] as MesMdVendorApi.Vendor[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-ele/src/views/mes/pro/card/components/select-dialog.vue
View File

@ -71,7 +71,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProCardApi.Card[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-ele/src/views/mes/pro/task/components/select-dialog.vue
View File

@ -95,7 +95,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProTaskApi.Task[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-ele/src/views/mes/pro/workorder/components/select-dialog.vue
View File

@ -98,7 +98,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesProWorkOrderApi.WorkOrder[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/qc/indicator/components/select-dialog.vue
View File

@ -28,7 +28,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesQcIndicatorApi.Indicator[];
records.forEach((row) => {
if (row.id !== null) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -74,7 +74,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesQcIndicatorApi.Indicator[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/tm/tool/components/select-dialog.vue
View File

@ -36,7 +36,7 @@ function getMultipleSelectedRows() {
] as MesTmToolApi.Tool[];
records.forEach((row) => {
const rowId = row.id;
if (rowId !== null) {
if (rowId !== undefined && rowId !== null) {
selectedMap.set(rowId, row);
}
});
@ -78,7 +78,11 @@ async function applyPreSelection() {
}
const rows = getTableRows();
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-ele/src/views/mes/wm/batch/components/select-dialog.vue
View File

@ -92,7 +92,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmBatchApi.Batch[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

6
apps/web-ele/src/views/mes/wm/materialstock/components/select-dialog.vue
View File

@ -118,7 +118,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmMaterialStockApi.MaterialStock[];
for (const row of rows) {
if (row.id === undefined || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/wm/packages/components/select-dialog.vue
View File

@ -41,7 +41,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesWmPackageApi.Package[];
records.forEach((row) => {
if (row.id) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -83,7 +83,11 @@ async function applyPreSelection() {
}
const rows = gridApi.grid.getData() as MesWmPackageApi.Package[];
for (const row of rows) {
if (row.id || !preSelectedIds.value.includes(row.id as number)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {

8
apps/web-ele/src/views/mes/wm/stocktaking/plan/components/select-dialog.vue
View File

@ -33,7 +33,7 @@ function getMultipleSelectedRows() {
...(gridApi.grid.getCheckboxRecords?.() ?? []),
] as MesWmStockTakingPlanApi.StockTakingPlan[];
records.forEach((row) => {
if (row.id !== null) {
if (row.id !== undefined && row.id !== null) {
selectedMap.set(row.id, row);
}
});
@ -80,7 +80,11 @@ async function applyPreSelection() {
const rows =
gridApi.grid.getData() as MesWmStockTakingPlanApi.StockTakingPlan[];
for (const row of rows) {
if (row.id === null || !preSelectedIds.value.includes(row.id)) {
if (
row.id === undefined ||
row.id === null ||
!preSelectedIds.value.includes(row.id)
) {
continue;
}
if (multiple.value) {