summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authordujinkim <dujin.kim@dtsolution.co.kr>2025-07-15 00:50:39 +0000
committerdujinkim <dujin.kim@dtsolution.co.kr>2025-07-15 00:50:39 +0000
commit15c3ae6536c264db0508e4fc4aaa59c3e6d1af30 (patch)
tree8e2ad5e6a06999bfaaf00ab4ee30083a87050bad /components
parentd5d27847a7eded9db59462fa744b76772bc9ce1d (diff)
(대표님) 기본계약 및 정기평가 작업사항, OCR 변경사항
Diffstat (limited to 'components')
-rw-r--r--components/form-data/add-formTag-dialog.tsx18
-rw-r--r--components/form-data/form-data-report-temp-upload-dialog.tsx2
2 files changed, 11 insertions, 9 deletions
diff --git a/components/form-data/add-formTag-dialog.tsx b/components/form-data/add-formTag-dialog.tsx
index a327523b..a8e51c4d 100644
--- a/components/form-data/add-formTag-dialog.tsx
+++ b/components/form-data/add-formTag-dialog.tsx
@@ -279,25 +279,28 @@ export function AddFormTagDialog({
if (subFields.length === 0) {
return;
}
-
+
const subscription = form.watch((value) => {
if (!value.rows || subFields.length === 0) {
return;
}
-
+
const rows = [...value.rows];
rows.forEach((row, rowIndex) => {
if (!row) return;
-
+
let combined = "";
subFields.forEach((sf, idx) => {
const fieldValue = row[sf.name] || "";
- combined += fieldValue;
- if (fieldValue && idx < subFields.length - 1 && sf.delimiter) {
+
+ // delimiter를 앞에 붙이기 (첫 번째 필드가 아니고, 현재 필드에 값이 있고, delimiter가 있는 경우)
+ if (idx > 0 && fieldValue && sf.delimiter) {
combined += sf.delimiter;
}
+
+ combined += fieldValue;
});
-
+
const currentTagNo = form.getValues(`rows.${rowIndex}.tagNo`);
if (currentTagNo !== combined) {
form.setValue(`rows.${rowIndex}.tagNo`, combined, {
@@ -308,10 +311,9 @@ export function AddFormTagDialog({
}
});
});
-
+
return () => subscription.unsubscribe();
}, [subFields, form]);
-
// ---------------
// Check if tag numbers are valid
// ---------------
diff --git a/components/form-data/form-data-report-temp-upload-dialog.tsx b/components/form-data/form-data-report-temp-upload-dialog.tsx
index fe137daf..78663d64 100644
--- a/components/form-data/form-data-report-temp-upload-dialog.tsx
+++ b/components/form-data/form-data-report-temp-upload-dialog.tsx
@@ -49,7 +49,7 @@ export const FormDataReportTempUploadDialog: FC<
{/* 사용하시고자 하는 Vendor Document Template(.docx)를 업로드
하여주시기 바랍니다. */}
<FileActionsDropdown
- filePath={"/vendorFormReportSample"}
+ filePath={"/vendorFormReportSample/sample_template_file.docx"}
fileName={"sample_template_file.docx"}
variant="ghost"
size="icon"