Merge branch 'develop' of github.com:Frappet/BMA-EHR-USER into develop

# Conflicts: # src/modules/09_scholarship/views/main.vue
2024-11-06 09:32:27 +07:00 · 2024-11-06 09:32:27 +07:00 · 864815ef12
commit 864815ef12
parent b875a9c0e5 335cc52ba0
31 changed files with 59 additions and 54 deletions
--- a/src/modules/02_transfer/views/Main.vue
+++ b/src/modules/02_transfer/views/Main.vue
@ -231,7 +231,9 @@ onMounted(async () => {
                option-value="name"
                map-options
                emit-value
-                style="min-width: 150px"
+                style="min-width: 140px"
+
+                
                class="gt-xs"
              >
                <template> </template>
--- a/src/modules/03_retire/views/main.vue
+++ b/src/modules/03_retire/views/main.vue
@ -181,7 +181,7 @@ onMounted(async () => {
                option-value="name"
                map-options
                emit-value
-                style="min-width: 150px"
+                style="min-width: 140px"
                class="gt-xs"
              >
                <template> </template>
--- a/src/modules/05_leave/components/Table.vue
+++ b/src/modules/05_leave/components/Table.vue
@ -222,7 +222,7 @@ watch([() => currentPage.value, () => pagination.value.rowsPerPage], () => {
          option-value="name"
          map-options
          emit-value
-          style="min-width: 150px"
+          style="min-width: 140px"
          class="gt-xs"
        >
          <template> </template>
--- a/src/modules/06_evaluate/views/EvaluateMain.vue
+++ b/src/modules/06_evaluate/views/EvaluateMain.vue
@ -306,7 +306,8 @@ onMounted(async () => {
                map-options
                :options="store.columns"
                option-value="name"
-                options-cover
+                style="min-width: 140px"
+                
              />
            </div>
          </div>
--- a/src/modules/07_appealComplain/views/Main.vue
+++ b/src/modules/07_appealComplain/views/Main.vue
@ -370,7 +370,8 @@ onMounted(async () => {
              map-options
              :options="dataStore.columns"
              option-value="name"
-              options-cover
+              
+              style="min-width: 140px"
              class="col-xs-12 col-sm-3 col-md-2"
            />

--- a/src/modules/08_KPI/components/Tab/02_Evaluator.vue
+++ b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
@ -181,8 +181,8 @@ onMounted(() => {
          map-options
          :options="columns"
          option-value="name"
-          options-cover
-          style="min-width: 150px"
+          
+          style="min-width: 140px"
        />
      </div>
    </q-toolbar>
--- a/src/modules/08_KPI/views/main.vue
+++ b/src/modules/08_KPI/views/main.vue
@ -482,7 +482,8 @@ onMounted(async () => {
                map-options
                :options="columns"
                option-value="name"
-                options-cover
+                
+                style="min-width: 140px"
              />
            </div>
          </div>
--- a/src/modules/08_KPI/views/mainEvaluator.vue
+++ b/src/modules/08_KPI/views/mainEvaluator.vue
@ -299,7 +299,8 @@ onMounted(async () => {
              map-options
              :options="columns"
              option-value="name"
-              options-cover
+              style="min-width: 140px"
+              
            />
          </div>

--- a/src/modules/09_scholarship/views/main.vue
+++ b/src/modules/09_scholarship/views/main.vue
@ -237,8 +237,6 @@ onMounted(async () => {
              map-options
              :options="columns"
              option-value="name"
-              options-cover
-              style="min-width: 140px"
              class="col-xs-12 col-md-1"
            />
          </div>
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@ -238,10 +238,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@ -518,10 +518,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@ -239,10 +239,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/02_Government/02_Discipline.vue
+++ b/src/modules/10_registry/02_Government/02_Discipline.vue
@ -210,10 +210,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/02_Government/03_Leave.vue
+++ b/src/modules/10_registry/02_Government/03_Leave.vue
@ -332,10 +332,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@ -290,10 +290,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/03_Salary/01_Salary.vue
+++ b/src/modules/10_registry/03_Salary/01_Salary.vue
@ -401,10 +401,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@ -267,10 +267,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@ -267,10 +267,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/04_Achievement/02_Training.vue
+++ b/src/modules/10_registry/04_Achievement/02_Training.vue
@ -394,10 +394,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@ -471,10 +471,10 @@ onMounted(async () => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@ -272,10 +272,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/04_Achievement/05_Assessments.vue
+++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue
@ -349,10 +349,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
+++ b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
@ -199,10 +199,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/05_Other/01_Other.vue
+++ b/src/modules/10_registry/05_Other/01_Other.vue
@ -181,10 +181,10 @@ onMounted(() => {
        outlined
        emit-value
        map-options
-        options-cover
+        
        options-dense
        option-value="name"
-        style="min-width: 150px"
+        style="min-width: 140px"
        v-model="visibleColumns"
        :options="columns"
        :display-value="$q.lang.table.columns"
--- a/src/modules/10_registry/Dialog/DialogHistory.vue
+++ b/src/modules/10_registry/Dialog/DialogHistory.vue
@ -99,12 +99,13 @@ watch(
              outlined
              emit-value
              map-options
-              options-cover
+              
              options-dense
              option-value="name"
              v-model="visibleColumns"
              :options="columns"
              :display-value="$q.lang.table.columns"
+              style="min-width: 140px"
            />
          </div>
        </div>
--- a/src/modules/10_registry/views/requestEditMain.vue
+++ b/src/modules/10_registry/views/requestEditMain.vue
@ -369,8 +369,9 @@ onMounted(() => {
              map-options
              :options="columns"
              option-value="name"
-              options-cover
+              
              class="col-xs-12 col-sm-3 col-md-2"
+              style="min-width: 140px"
            />
          </div>
        </div>
--- a/src/modules/11_probation/views/main.vue
+++ b/src/modules/11_probation/views/main.vue
@ -315,10 +315,10 @@ onMounted(async () => {
                outlined
                emit-value
                map-options
-                options-cover
+                
                options-dense
                option-value="name"
-                style="min-width: 150px"
+                style="min-width: 140px"
                v-model="visibleColumns"
                :options="columns"
                :display-value="$q.lang.table.columns"
--- a/src/modules/11_probation/views/mainDetail.vue
+++ b/src/modules/11_probation/views/mainDetail.vue
@ -325,10 +325,10 @@ onMounted(async () => {
                outlined
                emit-value
                map-options
-                options-cover
+                
                options-dense
                option-value="name"
-                style="min-width: 150px"
+                style="min-width: 140px"
                v-model="visibleColumns"
                :options="columns"
                :display-value="$q.lang.table.columns"
--- a/src/modules/13_portfolio/views/Main.vue
+++ b/src/modules/13_portfolio/views/Main.vue
@ -180,7 +180,7 @@ onMounted(async () => {
                option-value="name"
                map-options
                emit-value
-                style="min-width: 150px"
+                style="min-width: 140px"
                class="gt-xs"
              >
                <template> </template>
--- a/src/modules/14_IDP/views/main.vue
+++ b/src/modules/14_IDP/views/main.vue
@ -268,9 +268,9 @@ function onDetail(id: string) {
  router.push(`/idp-registry-detail/${id}`);
 }

-function getSerach(){
-  pagination.value.page = 1
-  getListData()
+function getSerach() {
+  pagination.value.page = 1;
+  getListData();
 }

 watch(
@ -370,8 +370,7 @@ onMounted(async () => {
              map-options
              :options="columns"
              option-value="name"
-              options-cover
-              style="width: 200px"
+              style="min-width: 140px"
            />
          </div>