From cb8cd0c8d4cead3fc4daaa77e50d4e694bb82dfa Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 10 Jan 2024 17:15:15 +0700 Subject: [PATCH] =?UTF-8?q?-=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD-=E0=B8=99=E0=B8=B2=E0=B8=A1?= =?UTF-8?q?=E0=B8=AA=E0=B8=81=E0=B8=B8=E0=B8=A5=20-=20=E0=B8=82=E0=B8=A2?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=AA=E0=B8=B7?= =?UTF-8?q?=E0=B8=9A=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=AA=E0=B8=AD?= =?UTF-8?q?=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_organizational/views/ManageReport2.vue | 2 +- .../02_organizational/views/ManageReport2Add.vue | 2 +- .../views/ManageReport2History.vue | 2 +- .../03_recruiting/views/01_compete/Detail.vue | 2 +- .../views/02_qualify/DisableDetail.vue | 2 +- .../views/02_qualify/manageDetail.vue | 2 +- src/modules/04_registry/views/Main.vue | 14 +++++++------- .../components/probation/FormAssign.vue | 4 ++-- .../components/probation/MainProbation.vue | 4 ++-- .../components/ListRetirement/AddList.vue | 2 +- .../components/resign/DetailByidDeceased.vue | 4 ++-- .../07_insignia/components/4_Allocate/OrgAdd.vue | 2 +- .../components/DialogSendToCommand.vue | 2 +- src/modules/08_registryEmployee/views/Main.vue | 4 ++-- src/modules/10_order/components/step/step01.vue | 2 +- src/modules/10_order/components/step/step03.vue | 4 ++-- .../components/2_InvestigateFacts/Form.vue | 2 +- .../components/3_InvestigateDisciplinary/Form.vue | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/modules/02_organizational/views/ManageReport2.vue b/src/modules/02_organizational/views/ManageReport2.vue index 40e8c4190..b470e39a7 100644 --- a/src/modules/02_organizational/views/ManageReport2.vue +++ b/src/modules/02_organizational/views/ManageReport2.vue @@ -146,7 +146,7 @@ const columns = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "name", headerStyle: "font-size: 14px; min-width: 200px", diff --git a/src/modules/02_organizational/views/ManageReport2Add.vue b/src/modules/02_organizational/views/ManageReport2Add.vue index d08c975f1..dd7971c62 100644 --- a/src/modules/02_organizational/views/ManageReport2Add.vue +++ b/src/modules/02_organizational/views/ManageReport2Add.vue @@ -23,7 +23,7 @@
([ { name: "fullName", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "personName", headerStyle: "font-size: 14px; min-width: 250px", diff --git a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue index 774081eb1..aad8efb37 100644 --- a/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue +++ b/src/modules/03_recruiting/views/02_qualify/DisableDetail.vue @@ -182,7 +182,7 @@ const columns = ref([ { name: "fullName", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "personName", headerStyle: "font-size: 14px; min-width: 250px", diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue index 36a16eb1d..231e53eeb 100644 --- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue +++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue @@ -368,7 +368,7 @@ const columns = ref([ { name: "fullname", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "fullname", headerStyle: "font-size: 14px; min-width: 200px", diff --git a/src/modules/04_registry/views/Main.vue b/src/modules/04_registry/views/Main.vue index 94e239383..535afc63c 100644 --- a/src/modules/04_registry/views/Main.vue +++ b/src/modules/04_registry/views/Main.vue @@ -251,7 +251,7 @@ const columns = ref([ { name: "fullname", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "fullname", headerStyle: "font-size: 14px; min-width: 200px", @@ -498,7 +498,7 @@ const columns = ref([ { name: "fullnameOld", align: "left", - label: "ชื่อ-สกุล(เดิม)", + label: "ชื่อ-นามสกุล(เดิม)", sortable: true, field: "fullnameOld", headerStyle: "font-size: 14px; min-width: 200px", @@ -583,7 +583,7 @@ const columnsEmployee = ref([ { name: "fullname", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "fullname", headerStyle: "font-size: 14px; min-width: 200px", @@ -802,7 +802,7 @@ const columnsEmployee = ref([ { name: "fullnameOld", align: "left", - label: "ชื่อ-สกุล(เดิม)", + label: "ชื่อ-นามสกุล(เดิม)", sortable: true, field: "fullnameOld", headerStyle: "font-size: 14px; min-width: 200px", @@ -886,7 +886,7 @@ const columnsEmployeeTemp = ref([ { name: "fullname", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "fullname", headerStyle: "font-size: 14px; min-width: 200px", @@ -1105,7 +1105,7 @@ const columnsEmployeeTemp = ref([ { name: "fullnameOld", align: "left", - label: "ชื่อ-สกุล(เดิม)", + label: "ชื่อ-นามสกุล(เดิม)", sortable: true, field: "fullnameOld", headerStyle: "font-size: 14px; min-width: 200px", @@ -1370,7 +1370,7 @@ const doSearch = async () => { const onExport = () => { const head = [ "ลำดับ", - "ชื่อ-สกุล", + "ชื่อ-นามสกุล", "ตำแหน่ง", "สายงาน", "ตำแหน่งในสายงาน", diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue index eeebdbda2..a59048fd8 100644 --- a/src/modules/05_placement/components/probation/FormAssign.vue +++ b/src/modules/05_placement/components/probation/FormAssign.vue @@ -1089,7 +1089,7 @@ onMounted(async () => { borderless outlined v-model="fullname" - label="ชื่อ-สกุล" + label="ชื่อ-นามสกุล" />
@@ -2359,7 +2359,7 @@ onMounted(async () => { borderless :outlined="status == true" v-model="fullname" - label="ชื่อ-สกุล" + label="ชื่อ-นามสกุล" /> diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index e8dcc6e51..2cb48755f 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -79,7 +79,7 @@ const columns = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "name", headerStyle: "font-size: 14px", @@ -155,7 +155,7 @@ const columns2 = ref([ { name: "fullname", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "fullname", headerStyle: "font-size: 14px", diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue index 754cfddfe..6a440ba58 100644 --- a/src/modules/06_retirement/components/ListRetirement/AddList.vue +++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue @@ -41,7 +41,7 @@ const columns = ref([ { name: "fullname", required: true, - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", field: "fullname", align: "left", }, diff --git a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue index 12af75555..aa02175fa 100644 --- a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue +++ b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue @@ -84,7 +84,7 @@ const columnsModal = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", field: "name", sortable: true, sort: (a: string, b: string) => @@ -132,7 +132,7 @@ const columns = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", field: "name", sortable: true, sort: (a: string, b: string) => diff --git a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue index 065bb916f..d472db3ff 100644 --- a/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue +++ b/src/modules/07_insignia/components/4_Allocate/OrgAdd.vue @@ -155,7 +155,7 @@ const columns2 = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "name", headerStyle: "font-size: 14px", diff --git a/src/modules/08_registryEmployee/components/DialogSendToCommand.vue b/src/modules/08_registryEmployee/components/DialogSendToCommand.vue index 5dc935268..b87a817cc 100644 --- a/src/modules/08_registryEmployee/components/DialogSendToCommand.vue +++ b/src/modules/08_registryEmployee/components/DialogSendToCommand.vue @@ -198,7 +198,7 @@ const columnsOrder = ref([ { name: "fullnameOld", align: "left", - label: "ชื่อ-สกุล(เดิม)", + label: "ชื่อ-นามสกุล(เดิม)", sortable: true, field: "fullnameOld", headerStyle: "font-size: 14px; min-width: 200px", diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 90a83ccae..bfbd77bf1 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -77,7 +77,7 @@ const columns = ref([ { name: "fullname", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", sortable: true, field: "fullname", headerStyle: "font-size: 14px; min-width: 200px", @@ -192,7 +192,7 @@ const columns = ref([ { name: "fullnameOld", align: "left", - label: "ชื่อ-สกุล(เดิม)", + label: "ชื่อ-นามสกุล(เดิม)", sortable: true, field: "fullnameOld", headerStyle: "font-size: 14px; min-width: 200px", diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index 6e1539111..dfc96ed0d 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -594,7 +594,7 @@ const columnsModal = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", field: "name", sortable: true, sort: (a: string, b: string) => diff --git a/src/modules/10_order/components/step/step03.vue b/src/modules/10_order/components/step/step03.vue index 4f2951e23..bc51e2cce 100644 --- a/src/modules/10_order/components/step/step03.vue +++ b/src/modules/10_order/components/step/step03.vue @@ -71,7 +71,7 @@ const columnsModal = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", field: "name", sortable: true, sort: (a: string, b: string) => @@ -117,7 +117,7 @@ const columns = ref([ { name: "name", align: "left", - label: "ชื่อ-สกุล", + label: "ชื่อ-นามสกุล", field: "name", sortable: true, sort: (a: string, b: string) => diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index 3cea9cef9..783979380 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -245,7 +245,7 @@ async function calEndDate(val: string) { changeFormData(); const date = await new Date(props.data.investigationDateEnd); formData.investigationDateEnd = await new Date( - date.setDate(date.getDate() + (Number(val) + 1)) + date.setDate(date.getDate() + (Number(val))) ); } diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 310c9543e..077aa4c07 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -230,7 +230,7 @@ async function calEndDate(val: string) { changeFormData(); const date = await new Date(props.data.disciplinaryDateEnd); formData.disciplinaryDateEnd = await new Date( - date.setDate(date.getDate() + (Number(val) + 1)) + date.setDate(date.getDate() + (Number(val))) ); }