1
This commit is contained in:
@@ -33,15 +33,15 @@
|
||||
<!-- Content Area -->
|
||||
<el-scrollbar class="h-[calc(100vh-20px)]">
|
||||
<step1 v-show="activeStep === 0" :groupId="paramGroupId" ref="step1Ref" />
|
||||
<step2 v-show="activeStep === 1" ref="step2Ref" />
|
||||
<step3 v-show="activeStep === 2" :nodeConfigObj="step3NodeConfig" ref="step3Ref" />
|
||||
<!-- <step2 v-show="activeStep === 1" ref="step2Ref" />-->
|
||||
<step3 v-show="activeStep === 1" :nodeConfigObj="step3NodeConfig" ref="step3Ref" />
|
||||
</el-scrollbar>
|
||||
|
||||
<!-- Validation Dialog -->
|
||||
<el-dialog v-model="validateDialogShow" :title="$t('flow.processCheck')">
|
||||
<el-steps :active="validateFlowStep" finish-status="success" simple class="mt-5">
|
||||
<el-step :title="$t('flow.basicInformation')" />
|
||||
<el-step :title="$t('flow.formDesign')" />
|
||||
<!-- <el-step :title="$t('flow.formDesign')" />-->
|
||||
<el-step :title="$t('flow.processDesign')" />
|
||||
</el-steps>
|
||||
|
||||
@@ -181,7 +181,7 @@ const checkStep1 = () => {
|
||||
validateFlowStep.value = 1;
|
||||
|
||||
setTimeout(function () {
|
||||
checkStep2();
|
||||
checkStep3();
|
||||
}, 500);
|
||||
} else {
|
||||
validatingShow.value = false;
|
||||
@@ -251,5 +251,7 @@ const submitFlow = () => {
|
||||
};
|
||||
|
||||
// Add steps data
|
||||
const steps = [{ title: 'flow.basicInformation' }, { title: 'flow.formDesign' }, { title: 'flow.processDesign' }];
|
||||
const steps = [{ title: 'flow.basicInformation' },
|
||||
// { title: 'flow.formDesign' },
|
||||
{ title: 'flow.processDesign' }];
|
||||
</script>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import selectShow from '/@/components/OrgSelector/index.vue';
|
||||
|
||||
import uploadImg from "/@/components/Upload/Image.vue"
|
||||
interface UserVo {
|
||||
id: string;
|
||||
name: string;
|
||||
@@ -28,6 +28,7 @@ const props = defineProps<{
|
||||
nodeUser: Record<string, any>;
|
||||
row: FlowNode[];
|
||||
disableSelect: boolean;
|
||||
disabled: boolean;
|
||||
}>();
|
||||
|
||||
// Create a map to store active tabs for each node
|
||||
@@ -71,7 +72,7 @@ import { Check, Plus, Refresh } from '@element-plus/icons-vue';
|
||||
<div v-if="node.userVoList?.length" class="flex flex-wrap gap-2 mb-3">
|
||||
<div v-for="(item1, index1) in node.userVoList" :key="index1" class="w-10 text-center">
|
||||
<div class="flex flex-col items-center">
|
||||
<upload-img v-model:image-url="item1.avatar" width="30px" height="30px"></upload-img>
|
||||
<upload-img v-model:image-url="item1.avatar" width="30px" height="30px" :disabled="disabled"></upload-img>
|
||||
<div class="mt-1 w-full text-xs truncate">{{ item1.name }}</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -89,7 +90,7 @@ import { Check, Plus, Refresh } from '@element-plus/icons-vue';
|
||||
<span class="ml-1 text-gray-500">(添加了评论) {{ item1.showTime }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-3 text-sm bg-gray-50 rounded">{{ item1.approveDesc }}</div>
|
||||
<div class="p-3 text-sm bg-gray-50 rounded break-words break-all whitespace-pre-wrap">{{ item1.approveDesc }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -28,6 +28,10 @@ let props = defineProps({
|
||||
type: Array,
|
||||
dafault: () => [],
|
||||
},
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
const row = ref([]);
|
||||
|
||||
@@ -88,5 +92,5 @@ defineExpose({ validate, formatSelectNodeUser });
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<flow-node-format :row="row" :node-user="nodeUser" :disableSelect="disableSelect" ref="flowNodeFormatRef"></flow-node-format>
|
||||
<flow-node-format :row="row" :node-user="nodeUser" :disableSelect="disableSelect" ref="flowNodeFormatRef" :disabled="disabled"></flow-node-format>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user