fix : 修复列表左侧选择框,及正确json格式

This commit is contained in:
2024-06-18 21:27:03 +08:00
parent 5100281c1f
commit 6ab1dc806e
8 changed files with 54 additions and 43 deletions

View File

@@ -34,7 +34,8 @@ const searchConfig = reactive([
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
colProps: {}
}, {
},
{
label: '项目费用',
prop: 'projectCost',
component: shallowRef(fvSelect),
@@ -44,7 +45,8 @@ const searchConfig = reactive([
filterable: true,
cacheKey: 'project_cost',
}
}, {
},
{
label: '项目阶段',
prop: 'researchStage',
component: shallowRef(fvSelect),

View File

@@ -53,7 +53,8 @@ const searchConfig = reactive([
filterable: true,
checkStrictly: true
}
}, {
},
{
label: '分摊月份',
prop: 'apportionmentMonth',
component: 'el-date-picker',

View File

@@ -61,10 +61,10 @@ const auths = {
}
const tableConfig = reactive({
columns: [
{
type: 'selection',
prop: 'selection'
},
// {
// type: 'selection',
// prop: 'selection'
// },
{
prop: 'requirementName',
label: '征集名称',

View File

@@ -78,10 +78,10 @@ const auths = {
}
const tableConfig = reactive({
columns: [
{
type: 'selection',
prop: 'selection'
},
// {
// type: 'selection',
// prop: 'selection'
// },
{
prop: 'requirementName',
label: '征集名称',

View File

@@ -136,10 +136,10 @@ const searchConfig = reactive([
const tableIns = ref()
const tableConfig = reactive({
columns: [
{
type: 'selection',
prop: 'selection'
},
// {
// type: 'selection',
// prop: 'selection'
// },
{
prop: 'projectName',
label: '项目名称',

View File

@@ -42,7 +42,8 @@ const searchConfig = reactive([
clearable: true,
placeholder: '请输入资金金额查询'
}
}, {
},
{
label: '剩余金额(元)',
prop: 'residualAmount',
component: 'el-input',
@@ -50,7 +51,8 @@ const searchConfig = reactive([
clearable: true,
placeholder: '请输入剩余金额查询'
}
}, {
},
{
label: '项目数量',
prop: 'projectNumber',
component: 'el-input',

View File

@@ -57,7 +57,7 @@ import ProcessSetting from "./ProcessSetting.vue";
import Ellipsis from '@/views/workflow/process/common/Ellipsis.vue'
import {getCurrentInstance} from '@vue/runtime-core';
import {useTagsView} from '@/stores/tagsview.js'
import {ElMessageBox,ElNotification} from "element-plus";
import {ElMessageBox, ElNotification} from "element-plus";
const tagsViewStore = useTagsView()
@@ -87,7 +87,7 @@ const validOptions = ref([
{title: '审批流程', description: '', icon: '', status: ''},
// {title: '扩展设置', description: '', icon: '', status: ''}
])
onActivated(()=>{
onActivated(() => {
activeSelect.value = 'processSetting'
init()
})
@@ -157,27 +157,31 @@ const loadInitFrom = () => {
type: "END",
}
],
processFromPerms: [{
id: "projectName",
title: "项目名称",
required: true,
perm: "R"
}, {
id: "projectType",
title: "项目类型",
required: true,
perm: "R"
}, {
id: "projectDesc",
title: "项目描述",
required: true,
perm: "R"
}, {
id: "projectManager",
title: "项目经理",
required: true,
perm: "R"
}],
processFromPerms: [
{
id: "projectName",
title: "项目名称",
required: true,
perm: "R"
},
{
id: "projectType",
title: "项目类型",
required: true,
perm: "R"
},
{
id: "projectDesc",
title: "项目描述",
required: true,
perm: "R"
},
{
id: "projectManager",
title: "项目经理",
required: true,
perm: "R"
}],
remark: "备注说明"
}
processStore.setDesign(design)
@@ -332,7 +336,7 @@ const doPublish = () => {
ElNotification({
title: '提示',
message: err,
type:'error'
type: 'error'
})
})
})

View File

@@ -402,7 +402,8 @@ const insertConditionsNode = (node) => {
props: deepCopy(DefaultProps.CONDITION_PROPS),
name: "条件1",
children: {}
}, {
},
{
id: getRandomId(),
parentId: node.id,
type: "CONDITION",
@@ -437,7 +438,8 @@ const insertConcurrentsNode = (node) => {
props: deepCopy(DefaultProps.CONDITION_PROPS),
name: "分支1",
children: {}
}, {
},
{
id: getRandomId(),
parentId: node.id,
type: "CONCURRENT",