diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue index a1e271d..5a2a84d 100644 --- a/src/components/DetailComponent/ApprovalDetail.vue +++ b/src/components/DetailComponent/ApprovalDetail.vue @@ -145,6 +145,10 @@ const props = defineProps({ type: String, default: 'READ' }, + preProcessShow: { + type: String, + default: 'READ' + }, // approval 立项, execute 实施, 归档 archivist type: { type: String, @@ -220,30 +224,31 @@ const schema = computed(() => { ) }, - { - label: '项目立项附件', - prop: 'singleFile', - colProps: { - span: 24 - }, - labelWidth:'left', - component: () => ( -
- { - props.formData.singleFile?.originalFileName ? - handleDownload(props.formData.singleFile)} - > + ] + arr.push( + { + label: '项目立项附件', + prop: 'singleFile', + colProps: { + span: 24 + }, + labelWidth:'left', + component: () => ( +
+ { + props.formData.singleFile?.originalFileName ? + handleDownload(props.formData.singleFile)} + > {props.formData.singleFile?.originalFileName} : - {'--'} - } -
+ {'--'} + } +
- ) - }, - ] + ) + }) } else if (props.type == 'execute') { arr = [ { @@ -344,6 +349,29 @@ const schema = computed(() => { return arr }) +const setPreProcess = () => { + //preProcessShow 为 EDIT 是 可以选择前置流程 + let pre = { + label: '前置流程', + prop: 'preProcess', + colProps: { + span: 24 + }, + labelWidth:'left', + component: () => ( +
+ { + props.formData.preProcess ? props.formData.preProcess.map(item => { + return {item.requestName} + }) : {'--'} + } +
+ ) + } +} + + const route = useRoute() const emit = defineEmits(['update:value']) const _value = computed({ diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue index 8241058..253e260 100644 --- a/src/components/DetailComponent/ProjectApply.vue +++ b/src/components/DetailComponent/ProjectApply.vue @@ -59,7 +59,7 @@ v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/> - + {{ @@ -250,6 +250,10 @@ const props = defineProps({ step: { type: String, default: "20" + }, + preProcessShow: { + type: String, + default: "READ" } }) const preProcessList = ref([]) diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue index 1e5965e..ce570b1 100644 --- a/src/views/project-management/implementation/detail.vue +++ b/src/views/project-management/implementation/detail.vue @@ -21,6 +21,7 @@ :data="detailData" :processViewer="commonProvessViewer" :fileListShow="fileListShow" + :preProcessShow="preProcessShow" v-model:value="auditOpinion"/> @@ -64,6 +68,7 @@ const applyTitle = ref('filing') const loading = ref(false) const processStore = useProcessStore() const fileListShow = ref('READ') +const preProcessShow = ref('READ') const mode = ref('') const currentStep = ref() const auditOpinion = ref('') @@ -89,6 +94,7 @@ const getAllInfo = async (state) => { try { detailShow.value = false fileListShow.value = 'READ' + preProcessShow.value = 'READ' commonProvessViewer.value = false const {data, code, msg} = await getMapProjectStateInfo(route.query.projectId, state) if (code === 1000) { @@ -108,6 +114,9 @@ const getAllInfo = async (state) => { if (data.formPermMap && data.formPermMap["fileList"]) { fileListShow.value = data.formPermMap["fileList"].perm } + if (data.formPermMap && data.formPermMap["preProcess"]) { + preProcessShow.value = data.formPermMap["preProcess"].perm + } }) changeModel(state, mode.value) loading.close() diff --git a/src/views/workflow/process/config/FormAuthorityConfig.vue b/src/views/workflow/process/config/FormAuthorityConfig.vue index 97dd8f2..a29044b 100644 --- a/src/views/workflow/process/config/FormAuthorityConfig.vue +++ b/src/views/workflow/process/config/FormAuthorityConfig.vue @@ -99,6 +99,15 @@ const formPermsLoadMosr = (oldPermMap, perms) => { perm: nowNode.value.type === "ROOT" ? "E" : "R" }); } + if (perm.id === 'preProcess'){ + formPerms.value.push({ + id: perm.id, //todo ,id 就是字段名称 + title: perm.title, + required: perm.required, + perm: 'H' + }); + } + } }) }