fixing kpi progress

src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue

@@ -18,7 +18,14 @@ const numLevel = ref<string>("");
 const store = useKpiDataStore();
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogConfirm, showLoader, hideLoader, messageError, success,dialogMessageNotify } = mixin;
+const {
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  dialogMessageNotify,
+} = mixin;
 
 const check = ref<string>("");
 const rows = defineModel<any>("rows");
@@ -87,8 +94,12 @@ function clickList(index: string, data: any) {
 
 function onSubmitAdd() {
   // type
-  if (numLevel.value == "") {
-    dialogMessageNotify($q,'กรุณาเลือกคะแนน')
+  if (
+    numLevel.value == "" &&
+    type.value != "capacity" &&
+    type.value != "development"
+  ) {
+    dialogMessageNotify($q, "กรุณาเลือกคะแนน");
   } else {
     dialogConfirm($q, () => {
       showLoader();
@@ -139,6 +150,7 @@ function closeAdd() {
   modalAdd.value = false;
   formDataAdd.topic = "";
   formDataAdd.reason = "";
+  numLevel.value = "";
 }
 
 function getList() {
@@ -246,6 +258,13 @@ watch(
             <template v-slot:before>
               <div class="q-pa-sm">
                 <q-btn
+                  v-if="
+                    type == 'capacity' ||
+                    type == 'development' ||
+                    (type != 'capacity' &&
+                      type != 'development' &&
+                      store.rolePerson == 'USER')
+                  "
                   icon="add"
                   color="teal"
                   flat
@@ -263,7 +282,12 @@ watch(
                   }}</q-tooltip>
                 </q-btn>
 
-                <q-card bordered flat class="no-shadow bg-white col-12">
+                <q-card
+                  bordered
+                  flat
+                  class="no-shadow bg-white col-12"
+                  style="min-height: 300px"
+                >
                   <div class="row q-px-md q-py-sm items-center bg-grey-1">
                     <div class="col-12">
                       <span>{{
@@ -356,11 +380,15 @@ watch(
                     <div class="col-4 text-grey-6">ผู้สร้าง</div>
                     <div class="col-8">{{ formDataView.createdFullName }}</div>
                   </div>
-                  <div class="col-12">
-                    <q-separator />
-                  </div>
 
-                  <div if="type == 'capacity' || type == 'development'">
+                  <div
+                    class="col-12"
+                    v-if="type != 'capacity' && type != 'development'"
+                  >
+                    <div class="col-12">
+                      <q-separator />
+                    </div>
+
                     <!-- ความคิดเห็นของผู้ประเมิน -->
                     <q-form
                       v-if="store.dataEvaluation.evaluatorId"
@@ -572,6 +600,10 @@ watch(
               class="col-12"
               v-if="type !== 'capacity' && type !== 'development'"
             >
+              <div class="col-12">
+                <q-label class="text-grey-6">คะแนนความก้าวหน้า</q-label>
+              </div>
+
               <q-btn-group outline>
                 <q-btn
                   v-for="i in 5"