From 6ab1dc806ec538e8e6da11c230e652c7ea62a638 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Tue, 18 Jun 2024 21:27:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E9=80=89=E6=8B=A9=E6=A1=86,=E5=8F=8A?= =?UTF-8?q?=E6=AD=A3=E7=A1=AEjson=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/expense-management/ledger/index.vue | 6 ++- src/views/expense-management/share/index.vue | 3 +- .../project-demand/requirement/index.vue | 8 +-- src/views/project-demand/summary/index.vue | 8 +-- .../implementation/index.vue | 8 +-- src/views/special-fund/index.vue | 6 ++- src/views/workflow/process/ProcessEdit.vue | 52 ++++++++++--------- src/views/workflow/process/ProcessTree.vue | 6 ++- 8 files changed, 54 insertions(+), 43 deletions(-) diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue index df7d90e..b72e195 100644 --- a/src/views/expense-management/ledger/index.vue +++ b/src/views/expense-management/ledger/index.vue @@ -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), diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue index d8db8d1..3120035 100644 --- a/src/views/expense-management/share/index.vue +++ b/src/views/expense-management/share/index.vue @@ -53,7 +53,8 @@ const searchConfig = reactive([ filterable: true, checkStrictly: true } - }, { + }, + { label: '分摊月份', prop: 'apportionmentMonth', component: 'el-date-picker', diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue index aac9045..6a00740 100644 --- a/src/views/project-demand/requirement/index.vue +++ b/src/views/project-demand/requirement/index.vue @@ -61,10 +61,10 @@ const auths = { } const tableConfig = reactive({ columns: [ - { - type: 'selection', - prop: 'selection' - }, + // { + // type: 'selection', + // prop: 'selection' + // }, { prop: 'requirementName', label: '征集名称', diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 9525468..69fff49 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -78,10 +78,10 @@ const auths = { } const tableConfig = reactive({ columns: [ - { - type: 'selection', - prop: 'selection' - }, + // { + // type: 'selection', + // prop: 'selection' + // }, { prop: 'requirementName', label: '征集名称', diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index 1abb366..73e644a 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -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: '项目名称', diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue index ee3e509..713a75d 100644 --- a/src/views/special-fund/index.vue +++ b/src/views/special-fund/index.vue @@ -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', diff --git a/src/views/workflow/process/ProcessEdit.vue b/src/views/workflow/process/ProcessEdit.vue index 02854ee..31aa1c6 100644 --- a/src/views/workflow/process/ProcessEdit.vue +++ b/src/views/workflow/process/ProcessEdit.vue @@ -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' }) }) }) diff --git a/src/views/workflow/process/ProcessTree.vue b/src/views/workflow/process/ProcessTree.vue index 79c1cf9..e41759b 100644 --- a/src/views/workflow/process/ProcessTree.vue +++ b/src/views/workflow/process/ProcessTree.vue @@ -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",