Merge pull request #119 from TaskFlow-CLAP/CLAP-311

CLAP-311

Author: seorang42

src/components/requested/RequestedListCard.vue

@@ -12,13 +12,23 @@
       :is-status="tab.isStatus" />
     <div class="w-[120px] flex gap-2 justify-center items-center shrink-0">
       <button
-        @click="router.push(`/request-approve?requestId=${info.taskId}`)"
-        class="button-medium-primary">
+        @click.stop="
+          userInfo.isReviewer && router.push(`/request-approve?requestId=${info.taskId}`)
+        "
+        :class="
+          userInfo.isReviewer
+            ? 'button-medium-primary'
+            : 'button-medium text-disabled bg-background-1'
+        ">
         승인
       </button>
       <button
-        @click.stop="toggleModal('reject')"
-        class="button-medium-default">
+        @click.stop="userInfo.isReviewer && toggleModal('reject')"
+        :class="
+          userInfo.isReviewer
+            ? 'button-medium-primary'
+            : 'button-medium text-disabled bg-background-1'
+        ">
         거부
       </button>
     </div>
@@ -62,6 +72,7 @@ import { useRouter } from 'vue-router'
 import ListCardTab from '../lists/ListCardTab.vue'
 import ModalView from '../ModalView.vue'
 import TaskDetail from '../task-detail/TaskDetail.vue'
+import { useMemberStore } from '@/stores/member'
 
 const { info } = defineProps<{ info: RequestedListData }>()
 const requestedTabList: ListCardProps[] = [
@@ -116,4 +127,6 @@ const rejectRequest = async () => {
     modalError.value = '작업 거부에 실패했습니다'
   }
 }
+
+const { info: userInfo } = useMemberStore()
 </script>

src/stores/params.ts

@@ -6,7 +6,7 @@ import type {
   TaskBoardParams
 } from '@/types/stores'
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 
 export const useRequestParamsStore = defineStore('requestParams', () => {
   const params = ref<RequestParams>({
@@ -22,6 +22,24 @@ export const useRequestParamsStore = defineStore('requestParams', () => {
     sortDirection: 'DESC'
   })
 
+  watch(
+    () => ({
+      pageSize: params.value.pageSize,
+      term: params.value.term,
+      mainCategoryIds: params.value.mainCategoryIds,
+      categoryIds: params.value.categoryIds,
+      title: params.value.title,
+      nickName: params.value.nickName,
+      taskStatus: params.value.taskStatus,
+      sortBy: params.value.sortBy,
+      sortDirection: params.value.sortDirection
+    }),
+    () => {
+      params.value.page = 0
+    },
+    { deep: true }
+  )
+
   const $reset = () => {
     params.value.page = 0
     params.value.pageSize = 20
@@ -50,6 +68,22 @@ export const useMemberManagementParamsStore = defineStore('userManagementParams'
     sortDirection: 'DESC'
   })
 
+  watch(
+    () => ({
+      pageSize: params.value.pageSize,
+      name: params.value.name,
+      email: params.value.email,
+      nickName: params.value.nickName,
+      departmentName: params.value.departmentName,
+      role: params.value.role,
+      sortDirection: params.value.sortDirection
+    }),
+    () => {
+      params.value.page = 0
+    },
+    { deep: true }
+  )
+
   return { params }
 })
 
@@ -64,6 +98,21 @@ export const useLogsParamsStore = defineStore('logsParams', () => {
     sortDirection: 'DESC'
   })
 
+  watch(
+    () => ({
+      pageSize: params.value.pageSize,
+      term: params.value.term,
+      logStatus: params.value.logStatus,
+      nickName: params.value.nickName,
+      clientIp: params.value.clientIp,
+      sortDirection: params.value.sortDirection
+    }),
+    () => {
+      params.value.page = 0
+    },
+    { deep: true }
+  )
+
   const $reset = () => {
     params.value.page = 0
     params.value.pageSize = 20