Merge branch 'develop'

src/modules/05_leave/components/FormLeave/12_FollowSpouseForm.vue

@@ -77,6 +77,7 @@ const formDataFollowSpouse = reactive<any>({
   coupleDayLevelCountry: "", //ไปปฏิบัติราชการ ณ ประเทศ
   coupleDayCountryHistory: "", //ประวัติการลาติดตามคู่สมรส
   coupleDayTotalHistory: null,
+  coupleDaySumTotalHistory: null,
   coupleDayStartDateHistory: null,
   coupleDayEndDateHistory: null,
   leaveDetail:
@@ -175,6 +176,10 @@ function onValidate() {
       "coupleDayTotalHistory",
       formDataFollowSpouse.coupleDayTotalHistory
     ); //
+    formData.append(
+      "coupleDaySumTotalHistory",
+      formDataFollowSpouse.coupleDaySumTotalHistory
+    ); //
     formData.append(
       "coupleDayCountryHistory",
       formDataFollowSpouse.coupleDayCountryHistory
@@ -258,8 +263,23 @@ function updateLeaveHistoryTotal() {
     formDataFollowSpouse.coupleDayEndDateHistory
   );
   formDataFollowSpouse.coupleDayTotalHistory = newLeaveTotal;
+  checkTotalHistory();
 }
 
+function checkTotalHistory() {
+  if (
+    formDataFollowSpouse.coupleDayStartDateHistory &&
+    formDataFollowSpouse.coupleDayEndDateHistory
+  ) {
+    const start = new Date(formDataFollowSpouse.coupleDayStartDateHistory);
+    const end = new Date(formDataFollowSpouse.coupleDayEndDateHistory);
+    const msInDay = 1000 * 60 * 60 * 24;
+    const diffTime = end.getTime() - start.getTime();
+    const diffDays = Math.abs(Math.ceil(diffTime / msInDay)) + 1;
+    formDataFollowSpouse.coupleDaySumTotalHistory =
+      diffDays + formDataFollowSpouse.leaveTotal;
+  }
+}
 /** แจ้งเมื่อวันลาไม่ถูกต้อง */
 const dateEndInputStyle = computed(() => {
   return !isLeave.value ? "input-alert" : "";
@@ -282,6 +302,8 @@ watch(props.data, async () => {
     formDataFollowSpouse.coupleDayLevel = props.data.coupleDayLevel;
     formDataFollowSpouse.leaveRange = props.data.leaveRange;
     formDataFollowSpouse.leaveRangeEnd = props.data.leaveRangeEnd;
+    formDataFollowSpouse.coupleDaySumTotalHistory =
+      props.data.coupleDaySumTotalHistory;
     formDataFollowSpouse.coupleDayLevelCountry =
       props.data.coupleDayLevelCountry;
     formDataFollowSpouse.coupleDayCountryHistory =
@@ -323,6 +345,8 @@ onMounted(async () => {
 
     formDataFollowSpouse.leaveSalaryText = props.data.leaveSalaryText;
     formDataFollowSpouse.leaveSalary = props.data.leaveSalary;
+    formDataFollowSpouse.coupleDaySumTotalHistory =
+      props.data.coupleDaySumTotalHistory;
     formDataFollowSpouse.coupleDayName = props.data.coupleDayName;
     formDataFollowSpouse.coupleDayPosition = props.data.coupleDayPosition;
     formDataFollowSpouse.coupleDayLevel = props.data.coupleDayLevel;

src/modules/05_leave/components/formDetail/13_RehabilitationForm.vue

@@ -51,7 +51,7 @@ const props = defineProps({
       <div class="col-xs-12 col-md-6 text-grey-8">เอกสารประกอบ</div>
       <div class="col-xs-12 col-md-6" v-if="props.data.leaveDocument">
         <q-btn
-          :href="props.data.leaveDocument"
+          :href="props.data.leaveDraftDocument"
           target="_blank"
           outline
           color="blue"