odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/DetailComponent/ExpenseDetail.vue
View File

@@ -2,8 +2,7 @@
<el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button> <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
<el-table ref="reportTable" :data="tableData" style="width: 100%;height: 479px" <el-table ref="reportTable" :data="tableData" style="width: 100%;height: 479px"
:span-method="objectSpanMethod" v-loading="loading"> :span-method="objectSpanMethod" v-loading="loading">
<!-- <el-table-column label="四川省国有资产经营投资管理有限责任公司--> <el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目人工成本分摊明细表" align="center">
<!-- 科技创新项目人工成本分摊明细表" align="center">-->
<el-table-column v-for="column in columnInfo" :prop="column.prop" :label="column.label" align="center" <el-table-column v-for="column in columnInfo" :prop="column.prop" :label="column.label" align="center"
:fixed="(!column.children) ? ((column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') ? 'right' : 'left') : false" :fixed="(!column.children) ? ((column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') ? 'right' : 'left') : false"
:width="(column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') ? 160:130"> :width="(column.prop === 'totalSeparation' || column.prop === 'totalSeparationCost') ? 160:130">
@@ -41,7 +40,7 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<!-- </el-table-column>--> </el-table-column>
</el-table> </el-table>
</template> </template>

1
src/views/workflow/process/DefaultNodeProps.js
View File

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

24
src/views/workflow/process/common/InsertButton.vue
View File

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

4
src/views/workflow/process/config/ApprovalNodeConfig.vue
View File

@@ -102,6 +102,10 @@
<el-form-item label="是否使用矩阵审批" prop="text"> <el-form-item label="是否使用矩阵审批" prop="text">
<el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch> <el-switch inactive-text="不用" active-text="使用" v-model="nodeProps.matrixApproval"></el-switch>
</el-form-item> </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-form-item label="审批期限（为 0 则不生效）" prop="timeLimit">-->
<!-- <el-input style="width: 180px;" placeholder="时长" type="number"--> <!-- <el-input style="width: 180px;" placeholder="时长" type="number"-->
<!-- v-model="nodeProps.timeLimit.timeout.value">--> <!-- v-model="nodeProps.timeLimit.timeout.value">-->