Merge pull request 'fix: 任务审批模块字段错误修复' (#128) from fix/task_flied_error into test

Reviewed-on: #128
pull/133/head
刘释隆 1 year ago
commit 4eba08b97d

@ -132,7 +132,7 @@ export const asideMap: Recordable<AsideEntity> = {
// 审批添加筛选配置 (左侧)
export const asideTaskMap: Recordable<AsideEntity> = {
izstatus: {
izApprovalStatus: {
label: '审批状态',
defaultValue: null,
isDefaultFilter: true,

@ -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

Loading…
Cancel
Save