修改查询逻辑

src/components/statusDict.ts

@@ -55,12 +55,12 @@ export const reviewManageTaskTypeMsg = [
 // 评价管理  问卷任务状态 卡片展示
 export const reviewManageCardStatusMsg = [
     {
-        statusFlag:0,
+        statusFlag:1,
         title:'进行中',
         themeClass:'ongoing'
     },
     {
-        statusFlag:1,
+        statusFlag:2,
         title:'已结束',
         themeClass:'end'
     },
@@ -70,12 +70,12 @@ export const reviewManageCardStatusMsg = [
 // 评价管理  问卷任务状态 行展示
 export const reviewManageRowStatusConvert = [
     {
-        statusFlag:0,
+        statusFlag:1,
         title:'进行中',
         themeClass: 'normal_icon'
     },
     {
-        statusFlag:1,
+        statusFlag:2,
         title:'已结束',
         themeClass: 'not_included_icon'
     },

src/views/reviewManagement/ReviewManagement.vue

@@ -60,7 +60,7 @@
                 
             </div>
             <!-- 列表展示数据 -->
-            <Table v-else
+            <Table v-else-if="defaultViewMode == 'list'"
                 :currentPage="currentPage" 
                 :pageSize="pageSize" 
                 :totalNum="totalNum"
@@ -148,8 +148,6 @@ import FormSearchGroup from '@/baseComponents/FormSearchGroup.vue';
 import SearchBlock from '@/baseComponents/SearchBlock.vue';
 
 import QuestionnaireCard from '@/components/questionnaireCard/QuestionnaireCard.vue';
-
-
 import {reviewManageRowStatusConvert, reviewManageTaskTypeMsg, reviewManageCardStatusMsg} from '@/components/statusDict'
 
 import {
@@ -173,7 +171,7 @@ interface QuestionnaireItm {
     evaluationStartDatetime:String,   //开始时间
     evaluationEndDatetime:String,   //结束时间
     time:String,  //开始时间 + 结束时间
-    evaluationStatus:Number,   //1 已使用   0 未使用
+    evaluationStatus:Number,   // 评价状态，1-进行中，2-已结束
     cardStatus:Number,
     openStatus:Boolean,    // 0 关闭   1 开启 
     evaluationType:Number|String,
@@ -187,17 +185,23 @@ const router = useRouter()
 // 1. 视图模式切换
 const defaultViewMode = ref('list')
 const  HandleTabChage = (val)=>{    
+    console.log('当前模式',val)
     defaultViewMode.value = val
 }
 
 // 2. 查询参数
-const searchParams = ref()
-const HandleSearchChange = (params,key)=>{
-    console.log('获取到的查询参数',params)
+const searchParams = ref({
+    evaluationStatus:'',
+    evaluationName:'',
+    schoolYear:'',
+})
+const HandleSearchChange = async (params,key)=>{
+    // console.log('获取到的查询参数',params)
     searchParams.value = {
         ...searchParams.value,
         ...params
     }
+    await GetQuestionnaireTaskList()
 }
 // 获取学年列表信息 
 const GetSchoolYearList =  async()=>{
@@ -207,7 +211,7 @@ const GetSchoolYearList =  async()=>{
         schoolYearOpt = res?.data?.map(item=>{
             return {
                 label:item.schoolYearName,
-                value:item.schoolYearId
+                value:item.schoolYearCode
             }
         }) || []
     }
@@ -247,12 +251,14 @@ const HandleCardSwitchOnOff = async(params)=>{
 }
 // 、获取问卷任务列表
 const GetQuestionnaireTaskList = async ()=>{
+    console.log('获取到的查询参数',searchParams.value)
     let params = {
         pageNum:currentPage.value,
         pageSize: pageSize.value,
-        "evaluationStatus": '',
-        "evaluationName": "",
-        "schoolYearCode": "",
+
+        evaluationStatus: searchParams.value.evaluationStatus == 'all' ? '' : searchParams.value.evaluationStatus,
+        evaluationName: searchParams.value.evaluationName,
+        schoolYearCode: searchParams.value.schoolYear == 'all' ? '' : searchParams.value.schoolYear,
     }
     let res = await getQuestionnaireTaskListApi(params)
 
@@ -466,7 +472,7 @@ const HandleDialogConfirm = async ()=>{
 
 
 onMounted(async()=>{
-    GetSchoolYearList()
+    await GetSchoolYearList()
     await GetQuestionnaireTaskList()
 })
 

src/views/reviewManagement/searchListConfig.ts

@@ -16,7 +16,7 @@ export const searchList  = ref([
         options:[]
     },
     {
-        key:'queryString',
+        key:'evaluationName',  //模糊查询值
         type:'input',
         placeholder:'评价名称',
         defaultValue:'',
@@ -26,7 +26,7 @@ export const searchList  = ref([
 export const statusSearchList = ref([
     {
         label:'状态',
-        key:'status',
+        key:'evaluationStatus',
         type:"single",
         options:[
             {
@@ -35,11 +35,11 @@ export const statusSearchList = ref([
             },
             {
                 label:'进行中',
-                value:'0'
+                value:'1'
             },
             {
                 label:'已结束',
-                value:'1'
+                value:'2'
             },
         ],
         defaultValue:'all',

src/views/surveyManagement/SurveyManagement.vue

@@ -49,7 +49,7 @@
 
 
             <!-- 列表展示数据 -->
-            <Table v-else
+            <Table v-else-if="defaultViewMode == 'list'"
                 :currentPage="currentPage" 
                 :pageSize="pageSize" 
                 :totalNum="totalNum"