feat : 抄送

This commit is contained in:
clay
2024-07-25 21:24:26 +08:00
parent 45104ecc87
commit e0b937fce9
4 changed files with 21 additions and 14 deletions

View File

@@ -13,6 +13,7 @@ export const APPROVAL_PROPS = {
generalManager: true,
president: true,
duplicateApproval: false,
optionalChargeLeadership: false,
skipSelf: true,
timeLimit: { //边界事件
timeout: { //超时提醒时间

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/>

View File

@@ -106,11 +106,17 @@
<el-form-item label="是否使用矩阵审批" prop="matrixApproval">
<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' || nodeProps.assignedType === 'ASSIGN_USER')" label="是否跳过自己" prop="skipSelf">
<el-form-item
v-if="nodeProps.matrixApproval && (nodeProps.assignedType === 'SELF' || nodeProps.assignedType === 'ASSIGN_USER')"
label="是否跳过自己" prop="skipSelf">
<!-- {{nodeProps.skipSelf}}-->
<el-switch inactive-text="不跳过" active-text="跳过" v-model="nodeProps.skipSelf"></el-switch>
</el-form-item>
</span>
<el-form-item label="分管领导" prop="optionalChargeLeadership" v-if="nodeProps.matrixApproval">
<el-switch inactive-text="系统" active-text="自选"
v-model="nodeProps.optionalChargeLeadership"></el-switch>
</el-form-item>
<el-form-item label="科创跳过" prop="dstiMatrix">
<el-switch inactive-text="审批" active-text="跳过"
v-model="nodeProps.dstiMatrix"></el-switch>
@@ -123,10 +129,10 @@
<el-switch inactive-text="不审批" active-text="审批" v-model="nodeProps.president"></el-switch>
</el-form-item>
</span>
<el-form-item label="重复跳过" prop="duplicateApproval">
<el-switch inactive-text="" active-text=""
v-model="nodeProps.duplicateApproval"></el-switch>
</el-form-item>
<!-- <el-form-item label="重复跳过" prop="duplicateApproval">-->
<!-- <el-switch inactive-text="" active-text=""-->
<!-- v-model="nodeProps.duplicateApproval"></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">-->

View File

@@ -1,8 +1,8 @@
<template>
<el-button size="mini" icon="Plus" type="primary" @click="selectUser" round>选择抄送人</el-button>
<div class="option">
<el-checkbox label="允许发起人添加抄送人" v-model="shouldAdd"></el-checkbox>
</div>
<!-- <div class="option">-->
<!-- <el-checkbox label="允许发起人添加抄送人" v-model="shouldAdd"></el-checkbox>-->
<!-- </div>-->
<!-- <org-items v-model="select"/>-->
<avatar-ellipsis :row="3" :user-info="assignedUser"/>
<user-picker title="请选择抄送人" multiple ref="userPicker" :v-model="assignedUser" @ok="selectedUser"/>