Merge branch 'develop' into warunee-dev

src/api/reports/api.report.ts

@@ -29,8 +29,8 @@ export default {
     reportAssign:(type:string, id:string) => `${reportProbation}/13/${type}/${id}`,
     reportEvaluateRecord1:(type:string, id:string) => `${reportProbation}/14/${type}/${id}`,
     reportEvaluateRecord2:(type:string, id:string) => `${reportProbation}/15/${type}/${id}`,
-    reportEvaluate:(type:string, id:string) => `${reportProbation}/16/${type}/${id}`,
+    reportEvaluate:(type:string, id:string,no:number) => `${reportProbation}/16/${type}/${id}/${no}`,
-    reportEvaluateChairman:(type:string, id:string) => `${reportProbation}/17/${type}/${id}`,
+    reportEvaluateChairman:(type:string, id:string,no:number) => `${reportProbation}/17/${type}/${id}/${no}`,
     reportEvaluateResult:(type:string, id:string) => `${reportProbation}/18/${type}/${id}`,
     reportSurvey:(type:string, id:string) => `${reportProbation}/19/${type}/${id}`,
 

src/modules/05_placement/components/probation/FormEvaluation/Template2.vue

@@ -76,7 +76,7 @@ const FileDownload = async (type: string) => {
   let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value);
   showLoader();
   await http
-    .get(config.API.reportEvaluate(type, numTab.id), {
+    .get(config.API.reportEvaluate(type, numTab.id,numTab.no), {
       responseType: "blob",
     })
     .then(async (res) => {

src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue

@@ -72,7 +72,7 @@ const FileDownload = async (type: string) => {
   let numTab = evaluate.value.find((e: any) => e.no === dataArrayNumber.value);
   showLoader();
   await http
-    .get(config.API.reportEvaluateChairman(type, numTab.id), {
+    .get(config.API.reportEvaluateChairman(type, numTab.id,numTab.no), {
       responseType: "blob",
     })
     .then(async (res) => {

src/modules/07_insignia/components/1_Proposals/listProposals.vue

@@ -80,7 +80,7 @@ const columns = ref<QTableProps["columns"]>([
     align: "center",
     label: "สถานะราชกิจจานุเบกษา",
     sortable: true,
-    field: "institution",
+    field: "statusRoyal",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -110,8 +110,11 @@ const fetchData = async () => {
           period_end: e.period_end == null ? null : date2Thai(new Date(e.period_end)),
           period_isActive: e.period_isActive,
           period_doc: e.period_doc,
+          period_status: e.period_status.result
         })
+     
       );
+      console.log(rows.value)
     })
     .catch((e) => {
       messageError($q, e);
@@ -122,7 +125,7 @@ const fetchData = async () => {
 };
 
 const clickEdit = (col: any) => {
-  router.push(`/insignia/round-add/${col.id}`);
+  router.push(`/insignia/round-add/${col.period_id}`);
 };
 
 const clickDelete = (id: string) => {
@@ -301,7 +304,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
               <q-td key="period_end" :props="props" @click="clickEdit(props.row)">
                 {{ props.row.period_end }}
               </q-td>
-              <q-td key="status" :props="props" @click="clickEdit(props.row)">
+              <q-td key="period_isActive" :props="props" @click="clickEdit(props.row)">
                 <q-icon
                   v-if="props.row.period_isActive == true"
                   name="mdi-close"

src/modules/07_insignia/interface/request/Main.ts

@@ -15,5 +15,6 @@ interface FormProprsalsRound2 {
   period_end: any;
   period_isActive: boolean;
   period_doc: any;
+  period_status:any
 }
 export type { FormProprsalsRound, FormProprsalsRound2 };

src/modules/10_order/components/step/step02.vue

@@ -41,9 +41,9 @@ const {
 const route = useRoute();
 const $q = useQuasar();
 const modalData = ref<any>({
-  salaryAmount: null,
+  salaryAmount: 0,
-  positionSalaryAmount: null,
+  positionSalaryAmount: 0,
-  monthSalaryAmount: null,
+  monthSalaryAmount: 0,
 });
 const myForm = ref<QForm | null>(null);
 const myFormAdd = ref<QForm | null>(null);
@@ -293,14 +293,17 @@ const fetchSalary = async (personalId: string) => {
 };
 
 const putSalary = async (salary: any) => {
-  //   modalData.value = {
-  //     salaryAmount: Number(salary.salaryAmount),
-  //     positionSalaryAmount: Number(salary.positionSalaryAmount),
-  //     monthSalaryAmount: Number(salary.monthSalaryAmount),
-  //   };
-
   dialogConfirm($q, async () => {
     showLoader();
+    if (modalData.value.salaryAmount === null) {
+      modalData.value.salaryAmount = 0;
+    }
+    if (modalData.value.positionSalaryAmount === null) {
+      modalData.value.positionSalaryAmount = 0;
+    }
+    if (modalData.value.monthSalaryAmount === null) {
+      modalData.value.monthSalaryAmount = 0;
+    }
     await http
       .put(config.API.salaryOrder(personalId.value), modalData.value)
       .then((res: any) => {