kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'jskim-node' (#435) from jskim-node into main 

Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/435
This commit is contained in:
kjs 2026-03-30 18:29:58 +09:00
parent 767863b6d6 378b8e7e7a
commit ea816b2e00
6 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app/(main)/COMPANY_29/sales/customer/page.tsx
View File

@ -457,6 +457,8 @@ export default function CustomerManagementPage() {
try {
const filters: any[] = [];
if (itemSearchKeyword) filters.push({ columnName: "item_name", operator: "contains", value: itemSearchKeyword });
// 영업관리/판매품 division 필터 (다중값 contains 매칭)
filters.push({ columnName: "division", operator: "contains", value: "CAT_ML8ZFVEL_1TOR" });
const res = await apiClient.post(`/table-management/tables/item_info/data`, {
page: 1, size: 50,
dataFilter: filters.length > 0 ? { enabled: true, filters } : undefined,

11
frontend/app/(main)/COMPANY_29/sales/order/page.tsx
View File

@ -474,16 +474,9 @@ export default function SalesOrderPage() {
if (itemSearchKeyword) {
filters.push({ columnName: "item_name", operator: "contains", value: itemSearchKeyword });
}
// division 필터는 다중값(쉼표 구분)이므로 contains로 부분 매칭
if (itemSearchDivision !== "all") {
filters.push({ columnName: "division", operator: "equals", value: itemSearchDivision });
} else {
// 기본: 영업관련 division만 (판매품, 제품, 영업관리 등)
const salesDivCodes = (categoryOptions["item_division"] || [])
.filter((o) => ["판매품", "제품", "영업관리"].some((label) => o.label.includes(label)))
.map((o) => o.code);
if (salesDivCodes.length > 0) {
filters.push({ columnName: "division", operator: "in", value: salesDivCodes });
}
filters.push({ columnName: "division", operator: "contains", value: itemSearchDivision });
}
const res = await apiClient.post(`/table-management/tables/item_info/data`, {
page: p, size: s,

4
frontend/app/(main)/COMPANY_29/sales/sales-item/page.tsx
View File

@ -166,8 +166,8 @@ export default function SalesItemPage() {
try {
const filters: { columnName: string; operator: string; value: any }[] = searchFilters.map((f) => ({ columnName: f.columnName, operator: f.operator, value: f.value }));
// 판매품목 division 필터 (다중값 컬럼이므로 contains로 매칭)
filters.push({ columnName: "division", operator: "contains", value: "CAT_DIV_SALES" });
// 판매품목/영업관리 division 필터 (다중값 컬럼이므로 contains로 매칭)
filters.push({ columnName: "division", operator: "contains", value: "CAT_ML8ZFVEL_1TOR" });
const res = await apiClient.post(`/table-management/tables/${ITEM_TABLE}/data`, {
page: 1, size: 500,

2
frontend/app/(main)/COMPANY_7/sales/customer/page.tsx
View File

@ -457,6 +457,8 @@ export default function CustomerManagementPage() {
try {
const filters: any[] = [];
if (itemSearchKeyword) filters.push({ columnName: "item_name", operator: "contains", value: itemSearchKeyword });
// 영업관리/판매품 division 필터 (다중값 contains 매칭)
filters.push({ columnName: "division", operator: "contains", value: "CAT_ML8ZFVEL_1TOR" });
const res = await apiClient.post(`/table-management/tables/item_info/data`, {
page: 1, size: 50,
dataFilter: filters.length > 0 ? { enabled: true, filters } : undefined,

11
frontend/app/(main)/COMPANY_7/sales/order/page.tsx
View File

@ -474,16 +474,9 @@ export default function SalesOrderPage() {
if (itemSearchKeyword) {
filters.push({ columnName: "item_name", operator: "contains", value: itemSearchKeyword });
}
// division 필터는 다중값(쉼표 구분)이므로 contains로 부분 매칭
if (itemSearchDivision !== "all") {
filters.push({ columnName: "division", operator: "equals", value: itemSearchDivision });
} else {
// 기본: 영업관련 division만 (판매품, 제품, 영업관리 등)
const salesDivCodes = (categoryOptions["item_division"] || [])
.filter((o) => ["판매품", "제품", "영업관리"].some((label) => o.label.includes(label)))
.map((o) => o.code);
if (salesDivCodes.length > 0) {
filters.push({ columnName: "division", operator: "in", value: salesDivCodes });
}
filters.push({ columnName: "division", operator: "contains", value: itemSearchDivision });
}
const res = await apiClient.post(`/table-management/tables/item_info/data`, {
page: p, size: s,

4
frontend/app/(main)/COMPANY_7/sales/sales-item/page.tsx
View File

@ -166,8 +166,8 @@ export default function SalesItemPage() {
try {
const filters: { columnName: string; operator: string; value: any }[] = searchFilters.map((f) => ({ columnName: f.columnName, operator: f.operator, value: f.value }));
// 판매품목 division 필터 (다중값 컬럼이므로 contains로 매칭)
filters.push({ columnName: "division", operator: "contains", value: "CAT_DIV_SALES" });
// 판매품목/영업관리 division 필터 (다중값 컬럼이므로 contains로 매칭)
filters.push({ columnName: "division", operator: "contains", value: "CAT_ML8ZFVEL_1TOR" });
const res = await apiClient.post(`/table-management/tables/${ITEM_TABLE}/data`, {
page: 1, size: 500,