diff --git a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue index 65e8531..553bd8f 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue @@ -44,7 +44,7 @@ const formDetail = reactive({ includingName: "", including: "", target: "", - unit: null, + unit: "", weight: null, achievement1: "", achievement2: "", @@ -59,6 +59,7 @@ const formDetail = reactive({ strategy: null, strategyId: "", strategyName: "", + documentInfoEvidence: "", }); function fetchIndicators() { @@ -219,7 +220,7 @@ function onSubmit() { const formBody = { target: formDetail.target, - unit: Number(formDetail.unit), + unit: formDetail.unit, weight: Number(formDetail.weight), meaning: formDetail.meaning, formula: formDetail.formula, @@ -305,12 +306,8 @@ watch(
-
- รหัสตัวชี้วัด -
-
- ชื่อตัวชี้วัด -
+
ลำดับ/รหัสตัวชี้วัด
+
ชื่อตัวชี้วัด
@@ -363,7 +360,7 @@ watch(
-
รหัสตัวชี้วัด
+
ลำดับ/รหัสตัวชี้วัด
{{ formDetail.including }}
@@ -399,7 +396,6 @@ watch( (val) => !!val || `${'กรุณากรอกหน่วยนับ'}`, ]" hide-bottom-space - mask="#" reverse-fill-mask />
@@ -490,6 +486,19 @@ watch( class="inputgreen" /> + +
+ +
diff --git a/src/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue b/src/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue index 9d103c4..14410a1 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue @@ -33,7 +33,7 @@ const formData = reactive({ including: "", //รหัสตัวชี้วัด includingName: "", //ชื่อตัวชี้วัด target: "", //ค่าเป้าหมาย - unit: null, //หน่วยนับ + unit: "", //หน่วยนับ weight: null, //น้ำหนัก (ร้อยละ) meaning: "", //นิยามหรือความหมายของตัวชี้วัด formula: "", //สูตรคำนวณ @@ -80,7 +80,7 @@ function closeDialog() { formData.including = ""; formData.includingName = ""; formData.target = ""; - formData.unit = null; + formData.unit = ""; formData.achievement1 = ""; formData.achievement2 = ""; formData.achievement3 = ""; @@ -95,7 +95,7 @@ function onSubmit() { dialogConfirm($q, async () => { showLoader(); formData.weight = Number(formData.weight); - formData.unit = Number(formData.unit); + formData.unit = formData.unit; formData.kpiUserEvaluationId = store.dataEvaluation.id; try { @@ -140,11 +140,11 @@ watch( @@ -182,7 +182,6 @@ watch( :rules="[(val:string) => !!val || `${'กรุณากรอกหน่วยนับ'}`,]" hide-bottom-space class="inputgreen" - mask="#" reverse-fill-mask lazy-rules /> diff --git a/src/modules/08_KPI/interface/request/index.ts b/src/modules/08_KPI/interface/request/index.ts index effe18a..c8eb73b 100644 --- a/src/modules/08_KPI/interface/request/index.ts +++ b/src/modules/08_KPI/interface/request/index.ts @@ -15,7 +15,7 @@ interface FormDataAssigned { including: string; includingName: string; target: string; - unit: number | null; + unit: string; weight: number | null; achievement1: string; achievement2: string;