Merge pull request 'feat:展示全部内容将高筛其他条件一并带上' (#233) from fix/change_task into test

Reviewed-on: #233

src/views/final/content/Content.vue

@@ -496,7 +496,7 @@ async function query(
 ) {
   console.log('query', taskName)
   const asideParmas = cloneDeep(unref(finalStore.getAsideValue))
-  // console.log(asideParmas);
+ console.log(asideParmas);
 
   if (asideParmas.izyear) {
     asideParmas.izuptime = cloneDeep(asideParmas.izyear)
@@ -515,10 +515,12 @@ async function query(
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
-  if (params?.izshowall == false)
-    params.isFail = false
-
-  params = params?.izshowall ? { isFail: true } : params
+ if (params?.izshowall == true)
+  {
+    params.isFail = true
+      delete params.izshowall;
+  }
+//  params = params?.izshowall ? { isFail: true } : params
 
   const result = await getFinalList({
     sortorder: sortorder.value,
@@ -925,11 +927,11 @@ async function initData(pageSize, page,  filterId?: any,
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
-  if (params?.izshowall == false)
-    params.isFail = false
-
-  params = params?.izshowall ? { isFail: true } : params
-
+  if (params?.izshowall == true)
+  {
+    params.isFail = true
+    delete params.izshowall;
+  }
   const result = await getFinalList({
     sortorder: sortorder.value,
     pageSize,

src/views/final/content/ListContent.vue

@@ -116,11 +116,11 @@ async function initData(
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
   let params = asideParmas
-  if (params?.izshowall == false)
-    params.isFail = false
-
-  params = params?.izshowall ? { isFail: true } : params
-
+  if (params?.izshowall == true)
+  {
+    params.isFail = true
+      delete params.izshowall;
+  }
   const result = await getFinalList({
     sortorder: sortorder.value,
     pageSize,
@@ -172,9 +172,11 @@ async function query(
      // delete asideParmas.izyear
     
   }
-let params = asideParmas;
-  if(params?.izshowall==false){
-    params.isFail=false
+  let params = asideParmas
+  if (params?.izshowall == true)
+  {
+    params.isFail = true
+      delete params.izshowall;
   }
   params = params?.izshowall ? {isFail:true} : params;
   const result = await getFinalList({
@@ -685,7 +687,7 @@ defineExpose({
                         : item.states == 2
                           ? "待审核"
                           : item.states == 5
-                            ? "未通过"
+                            ? "不通过"
                             : ""
                       : item.fromusername
                   }}