view ผลงาน

src/modules/12_evaluatePersonal/components/Detail/step/step2.vue

@@ -30,6 +30,8 @@ const formCommand = reactive<FormCommand>({
   abovelevelFullname: "",
   abovelevelPosition: "",
 });
+const author = ref<string>("");
+const subject = ref<string>("");
 
 const elementaryFullNameRef = ref<object | null>(null);
 const elementaryPositonRef = ref<object | null>(null);
@@ -105,10 +107,17 @@ function getSigner() {
     .get(config.API.evaluationSigner(id.value, 1))
     .then((res) => {
       const data = res.data.result;
-      formCommand.elementaryFullName = data == null ? "" : data.commanderFullname;
+      formCommand.elementaryFullName =
-      formCommand.elementaryPosition = data == null ? "" : data.commanderPosition;
+        data == null ? "" : data.commanderFullname;
-      formCommand.abovelevelFullname = data == null ? "" : data.commanderAboveFullname;
+      formCommand.elementaryPosition =
-      formCommand.abovelevelPosition = data == null ? "" : data.commanderAbovePosition;
+        data == null ? "" : data.commanderPosition;
+      formCommand.abovelevelFullname =
+        data == null ? "" : data.commanderAboveFullname;
+      formCommand.abovelevelPosition =
+        data == null ? "" : data.commanderAbovePosition;
+
+      author.value = data.author;
+      subject.value = data.subject;
     })
     .catch((e) => {
       messageError($q, e);
@@ -527,6 +536,43 @@ onMounted(() => {
         </div>
       </q-card>
     </div> -->
+    <div class="col-12">
+      <q-card bordered style="border: 1px solid #d6dee1">
+        <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">ผลงาน</div>
+        <div class="col-12"><q-separator /></div>
+        <div class="row">
+          <div class="col-12 q-pa-sm">
+            <div class="row q-col-gutter-md col-12">
+              <div class="col-xs-12 col-sm-12 row">
+                <div class="row col-12 q-col-gutter-md q-pa-sm">
+                  <q-input
+                    dense
+                    class="col-xs-12 col-sm-6"
+                    outlined
+                    label="ชื่อผลงาน"
+                    v-model="subject"
+                    @update:model-value="updateInput(formCommand)"
+                    :rules="[(val) => !!val || `${'กรุณากรอกชื่อผลงาน'}`]"
+                    lazy-rules
+                  />
+                  <q-input
+                    readonly
+                    class="col-xs-12 col-sm-6"
+                    dense
+                    outlined
+                    v-model="author"
+                    @update:model-value="updateInput(formCommand)"
+                    label="เจ้าของผลงาน"
+                    :rules="[(val) => !!val || `${'กรุณากรอกเจ้าของผลงาน'}`]"
+                    lazy-rules
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </q-card>
+    </div>
 
     <!-- เลือกผู้เซ็นเอกสาร -->
     <div class="col-12">

src/modules/12_evaluatePersonal/components/Detail/step/step6.vue

@@ -56,6 +56,10 @@ function getDate() {
     });
 }
 
+const author = ref<string>("");
+const subject = ref<string>("");
+const assignedPosition = ref<string>("");
+
 function getSigner() {
   showLoader();
   http
@@ -66,6 +70,9 @@ function getSigner() {
       formCommand.elementaryPosition = data.commanderPositionDoc2;
       formCommand.abovelevelFullname = data.commanderAboveFullnameDoc2;
       formCommand.abovelevelPosition = data.commanderAbovePositionDoc2;
+      author.value = data.authorDoc2;
+      subject.value = data.subjectDoc2;
+      assignedPosition.value = data.assignedPosition;
     })
     // .catch((e) => {
     //   messageError($q, e);
@@ -91,6 +98,55 @@ onMounted(() => {
         </div>
       </q-banner>
     </div>
+
+    <div class="col-12">
+      <q-card bordered style="border: 1px solid #d6dee1">
+        <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">ผลงาน</div>
+        <div class="col-12"><q-separator /></div>
+        <div class="row">
+          <div class="col-12 q-pa-sm">
+            <div class="row q-col-gutter-md col-12">
+              <div class="col-xs-12 col-sm-12 row">
+                <div class="row col-12 q-col-gutter-md q-pa-sm">
+                  <q-input
+                    dense
+                    class="col-xs-12 col-sm-6"
+                    outlined
+                    label="ชื่อผลงาน"
+                    v-model="subject"
+                    @update:model-value="updateInput(formCommand)"
+                    :rules="[(val) => !!val || `${'กรุณากรอกชื่อผลงาน'}`]"
+                    lazy-rules
+                  />
+                  <q-input
+                    readonly
+                    class="col-xs-12 col-sm-6"
+                    dense
+                    outlined
+                    v-model="author"
+                    @update:model-value="updateInput(formCommand)"
+                    label="เจ้าของผลงาน"
+                    :rules="[(val) => !!val || `${'กรุณากรอกเจ้าของผลงาน'}`]"
+                    lazy-rules
+                  />
+                  <q-input
+                    readonly
+                    class="col-xs-12 col-sm-6"
+                    dense
+                    outlined
+                    v-model="assignedPosition"
+                    @update:model-value="updateInput(formCommand)"
+                    label="ต่ำแหน่งที่ได้รับ"
+                    :rules="[(val) => !!val || `${'กรุณากรอกเจ้าของผลงาน'}`]"
+                    lazy-rules
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </q-card>
+    </div>
     <!-- <div class="col-6">
       <q-card bordered style="border: 1px solid #d6dee1">
         <div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">

src/modules/12_evaluatePersonal/components/Detail/step/step8.vue

@@ -377,7 +377,6 @@ async function fetchDataSigner() {
       author.value = data.authorDoc2;
       subject.value = data.subjectDoc2;
       assignedPosition.value = data.assignedPosition;
-      console.log(assignedPosition.value, data);
     })
     .catch((e) => {
       messageError($q, e);

src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue

@@ -55,7 +55,7 @@ onMounted(() => {
     formDetail.position = props.data.position;
     formDetail.oc = props.data.oc;
     formDetail.salary = props.data.salary
-      ? props.data.salary.toLocaleString("th-TH")
+      ? formattedNumber(props.data.salary)
       : "-";
     formDetail.positionLevel = props.data.positionLevel;
     formDetail.posNo = props.data.posNo;
@@ -118,6 +118,10 @@ onMounted(() => {
     formDetail.assessments = props.data.assessments;
   }
 });
+
+function formattedNumber(x: number) {
+  return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}
 </script>
 
 <template>