Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/15_development/views/EmployeeHistory.vue
#	src/modules/15_development/views/History.vue

src/modules/15_development/components/Record.vue

@@ -205,9 +205,10 @@ async function clickUpload(file: any) {
       formData.append("file", selectedFile);
       await http
         .post(config.API.developmentMainTab("tab6", id.value), formData)
-        .then((res) => {
+        .then(() => {
           success($q, "อัปโหลดไฟล์สำเร็จ");
           getData();
+          files.value = null;
         })
         .catch((err) => {
           messageError($q, err);
@@ -365,8 +366,13 @@ onMounted(() => {
     </template>
     <template v-slot:body="props">
       <q-tr :props="props" class="cursor-pointer">
-        <q-td v-if="props.row.isDone">
-          <q-icon name="mdi-check" color="green" size="xs">
+        <q-td>
+          <q-icon
+            name="mdi-check"
+            color="green"
+            size="xs"
+            v-if="props.row.isDone"
+          >
             <q-tooltip>ส่งไปบันทึกที่ทะเบียนประวัติแล้ว</q-tooltip>
           </q-icon>
         </q-td>