Ver código fonte

修复显示问题

hubin 1 ano atrás
pai
commit
35834f97f8

+ 1 - 1
src/components/scWorkflow/nodes/branch.vue

@@ -286,7 +286,7 @@ export default {
 		toText(nodeConfig, index) {
 			var { conditionList } = nodeConfig.conditionNodes[index]
 			if (conditionList && conditionList.length == 1) {
-				const text = conditionList.map(conditionGroup => conditionGroup.map(item => `${item.label}${item.operator}${item.value}`)).join(' 和 ')
+				const text = conditionList.map(conditionGroup => conditionGroup.map(item => `${item.label}${item.operator}${item.value}`).join(' 和 '))
 				return text
 			} else if (conditionList && conditionList.length > 1) {
 				return conditionList.length + '个条件,或满足'

+ 2 - 3
src/views/approve/launch/ItemDrawer.vue

@@ -11,7 +11,6 @@
 		<div class="info-wrap">
 			<el-divider content-position="left">{{ record.processName }}表单</el-divider>
 			<div class="self-Everright-formEditor">
-				<!-- :is-show-complete-button="false" -->
 				<er-form-preview ref="EReditorRef" :is-show-complete-button="false" :file-upload-u-r-i="uploadFileApi" />
 			</div>
 			<el-divider content-position="left">审批流程</el-divider>
@@ -24,6 +23,7 @@
 					</template>
 					<template v-else>
 						<div style="padding-bottom: 6px">{{ v.nodeName }}</div>
+						<span v-if="v.type === 8" class="text-gray-500">调用子流程 [ {{ v.callProcess.split(':')[1] }} ]</span>
 						<div v-if="assigneeMap[v.nodeKey]" style="display: flex; align-items: center; gap: 6px; flex-wrap: wrap">
 							<template v-if="assigneeMap[v.nodeKey].type === 1">
 								<el-tooltip v-if="!assigneeMap[v.nodeKey].disabled" content="添加用户" placement="left">
@@ -70,8 +70,7 @@
 <script setup lang="ts">
 import model from '@/api/flow/process'
 import { erFormPreview } from '@ER/formEditor'
-// import { erFormPreview } from 'everright-formeditor'
-import { ref, computed, reactive, inject } from 'vue'
+import { ref, computed, reactive } from 'vue'
 import { ElMessage } from 'element-plus'
 import UseSelect from '@/components/scWorkflow/select.vue'
 import FlowNodeAvatar from '@/components/Flow/FlowNodeAvatar.vue'