@@ -399,6 +448,7 @@ function ocClikcHistory() {
outlined
dense
borderless
+ class="inputgreen"
:model-value="date2Thai(formData.date)"
:rules="[
(val) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี'}`,
@@ -427,6 +477,7 @@ function ocClikcHistory() {
lazy-rules
borderless
v-model="formData.reference"
+ class="inputgreen"
:rules="[(val) => !!val || `${'กรุณากรอกเอกสารอ้างอิง'}`]"
hide-bottom-space
:label="`${'เอกสารอ้างอิง'}`"
@@ -441,6 +492,7 @@ function ocClikcHistory() {
lazy-rules
borderless
v-model="formData.detail"
+ class="inputgreen"
:rules="[(val) => !!val || `${'กรุณากรอกรายละเอียด'}`]"
hide-bottom-space
:label="`${'รายละเอียด'}`"
@@ -453,6 +505,7 @@ function ocClikcHistory() {
lazy-rules
borderless
v-model="formData.refCommandNo"
+ class="inputgreen"
hide-bottom-space
:label="`${'เลขที่คำสั่ง'}`"
>
@@ -478,6 +531,7 @@ function ocClikcHistory() {
outlined
dense
borderless
+ class="inputgreen"
:model-value="
formData.refCommandDate == null ? null : date2Thai(formData.refCommandDate as Date)
"
@@ -508,11 +562,11 @@ function ocClikcHistory() {
บันทึกข้อมูล
-
+
-
+
diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
index 86a2cc12c..21b8f1936 100644
--- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
+++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue
@@ -1,22 +1,33 @@
@@ -162,20 +196,17 @@ function closeDialog() {
>
-
-
{{ col.label }}
-
-
-
+
+
{{ col.value ? col.value : "-" }}
-
+
diff --git a/src/modules/04_registryNew/interface/index/salary.ts b/src/modules/04_registryNew/interface/index/salary.ts
index a7f3c2fe5..f15c117e3 100644
--- a/src/modules/04_registryNew/interface/index/salary.ts
+++ b/src/modules/04_registryNew/interface/index/salary.ts
@@ -1,20 +1,9 @@
-interface ObjectSalaryRef {
- date: object | null;
- posNo: object | null;
- position: object | null;
- typePosition: object | null;
- levelPosition: object | null;
- salary: object | null;
- doc: object | null;
-
- [key: string]: any;
+interface RowList {
+ id: string;
+ date: Date | null;
+ reference: string;
+ detail: string;
+ refCommandNo: string;
+ refCommandDate: Date | null;
}
-
-interface ObjectReceiveRef {
- date: object | null;
- reference: object | null;
- detail: object | null;
-
- [key: string]: any;
-}
-export type { ObjectSalaryRef,ObjectReceiveRef };
+export type { RowList };
diff --git a/src/modules/04_registryNew/interface/request/Salary.ts b/src/modules/04_registryNew/interface/request/Salary.ts
index fdaea5559..bb94551a0 100644
--- a/src/modules/04_registryNew/interface/request/Salary.ts
+++ b/src/modules/04_registryNew/interface/request/Salary.ts
@@ -16,4 +16,13 @@ interface FormSalaryNew {
doc: string;
}
-export type { FormSalaryNew };
+interface RequestNoPaidObject {
+ profileId?: string;
+ date: Date | null;
+ detail: string;
+ reference: string;
+ refCommandDate: Date | null;
+ refCommandNo: string;
+}
+
+export type { FormSalaryNew, RequestNoPaidObject };