From 1b8c56ac49e806213ee277daa0743ba6d3f0c3ae Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Tue, 9 Apr 2024 21:43:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/final.ts                     |  2 +-
 src/views/task/modal/NewFilterModal.vue | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/config/final.ts b/src/config/final.ts
index 2df2d66..23cbfc5 100644
--- a/src/config/final.ts
+++ b/src/config/final.ts
@@ -132,7 +132,7 @@ export const asideMap: Recordable<AsideEntity> = {
 
 // 审批添加筛选配置 (左侧)
 export const asideTaskMap: Recordable<AsideEntity> = {
-  izstatus: {
+  izApprovalStatus: {
     label: '审批状态',
     defaultValue: null,
     isDefaultFilter: true,
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index 2ebc24b..c001d87 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { FormInst, FormItemRule, FormRules } from "naive-ui";
 import { computed, onBeforeMount, reactive, ref, unref, watch } from "vue";
-import { asideTaskMap as asideMap } from "@/config/final";
+import { asideTaskMap } from "@/config/final";
 import { useDictionary } from "@/store/modules/dictonary";
 import { useConfig } from "@/store/modules/asideConfig";
 import type { FilterCondition } from "/#/api";
@@ -203,9 +203,10 @@ function closeModal() {
 
 function generateAllData(): Option[] {
   const initVal: Option[] = [];
-  const list = Object.keys(asideMap).reduce((acc, value) => {
-    if (value.startsWith("iz") && asideMap[value]?.inFilterList !== false) {
-      const name = asideMap[value]?.label;
+  console.log(asideTaskMap,'asideTaskMap')
+  const list = Object.keys(asideTaskMap).reduce((acc, value) => {
+    if (value.startsWith("iz") && asideTaskMap[value]?.inFilterList !== false) {
+      const name = asideTaskMap[value]?.label;
 
       name &&
         acc.push({
@@ -222,6 +223,8 @@ function generateAllData(): Option[] {
 typeOptions.value = generateAllData();
 
 function getOptions(key: string) {
+  console.log('key',key,'getOptions');
+  console.log(formValue.conditions,'formValue.conditions')
   const getterName = `get${key}`;
   const options = unref(dicStore[getterName]);
   return options || [];
@@ -320,7 +323,7 @@ defineExpose({
                 v-model:value="item.type"
                 placeholder="请选择筛选项名称"
                 :options="typeOptions"
-                @change="item.result = ''"
+                @update="item.result = ''"
               />
               <n-select
                 filterable