fix : 矩阵审批选择自己时可以跳过自己审批

This commit is contained in:
clay
2024-07-06 15:05:19 +08:00
parent 8f3d97ec1c
commit bd57a54931
4 changed files with 51 additions and 47 deletions

View File

@@ -9,6 +9,7 @@ export const APPROVAL_PROPS = {
assignedUser: [] //审批人列表
},
matrixApproval: true,
skipSelf: true,
timeLimit: { //边界事件
timeout: { //超时提醒时间
unit: "H",

View File

@@ -7,12 +7,12 @@
</el-icon>
<span>审批人</span>
</div>
<div @click="addCcNode">
<el-icon style="color:rgb(50, 150, 250);">
<Promotion/>
</el-icon>
<span>抄送人</span>
</div>
<!-- <div @click="addCcNode">-->
<!-- <el-icon style="color:rgb(50, 150, 250);">-->
<!-- <Promotion/>-->
<!-- </el-icon>-->
<!-- <span>抄送人</span>-->
<!-- </div>-->
<div @click="addConditionsNode">
<el-icon style="color:rgb(21, 188, 131);">
<Share/>
@@ -25,12 +25,12 @@
</el-icon>
<span>并行分支</span>
</div>
<div @click="addDelayNode">
<el-icon style="color:#f25643;">
<Clock/>
</el-icon>
<span>延迟等待</span>
</div>
<!-- <div @click="addDelayNode">-->
<!-- <el-icon style="color:#f25643;">-->
<!-- <Clock/>-->
<!-- </el-icon>-->
<!-- <span>延迟等待</span>-->
<!-- </div>-->
<!-- <div @click="addTriggerNode">-->
<!-- <el-icon style="color:#15BC83;">-->
<!-- <SetUp/>-->

View File

@@ -102,6 +102,10 @@
<el-form-item label="是否使用矩阵审批" prop="text">
<el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
</el-form-item>
<el-form-item v-if="nodeProps.matrixApproval && nodeProps.assignedType === 'SELF'" label="是否跳过自己" prop="text">
<!-- {{nodeProps.skipSelf}}-->
<el-switch inactive-text="不跳过" active-text="跳过" v-model="nodeProps.skipSelf"></el-switch>
</el-form-item>
<!-- <el-form-item label="审批期限(为 0 则不生效)" prop="timeLimit">-->
<!-- <el-input style="width: 180px;" placeholder="时长" type="number"-->
<!-- v-model="nodeProps.timeLimit.timeout.value">-->