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

Merge pull request 'master' (#632) from master into prod

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/632
This commit is contained in:
odjbin
2024-07-25 14:48:39 +00:00
parent 6f505ba281 39cb9400f6
commit 925b4a2eb4
9 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/DetailComponent/ProjectApply.vue
View File

@@ -58,7 +58,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="title==='apply'||title==='check'">
<el-form-item label="分管领导" :required="true" prop=""
<el-form-item label="分管领导"
label-width="125">
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
{{ optionalChargeLeadershipList.length !== 0 ? '更改' : getOptionalChargeLeadershipList(optionalChargeLeadershipList) ? '更改' : '请选择' }}

2
src/views/project-demand/summary/add.vue
View File

@@ -246,7 +246,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="分管领导" :required="true" prop=""
<el-form-item label="分管领导"
label-width="125">
<el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
{{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }}

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

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

7
src/views/workflow/process/common/AvatarEllipsis.vue
View File

@@ -19,7 +19,7 @@
</el-icon>
</div>
</div>
<div class="arrow" v-if="(index+1)%3!==0&&userInfo.length!==1&&(index+1)!==userInfo.length">
<div class="arrow" v-if="(index+1)%3!==0&&userInfo.length!==1&&(index+1)!==userInfo.length&&showArrow">
<el-icon size="20">
<Right/>
</el-icon>
@@ -49,6 +49,11 @@ const props = defineProps({
mode: {
type: String,
default: 'design'
},
//是否显示箭头
showArrow: {
type: Boolean,
default: true
}
})

12
src/views/workflow/process/common/InsertButton.vue
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/>

16
src/views/workflow/process/config/ApprovalNodeConfig.vue
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">-->

36
src/views/workflow/process/config/CcNodeConfig.vue
View File

@@ -1,18 +1,20 @@
<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>
<el-button size="mini" icon="Plus" type="primary" @click="selectUser" round style="margin-bottom: 10px">选择抄送人
</el-button>
<!-- <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"/>
<avatar-ellipsis :row="3" :user-info="assignedUser" :showArrow="false" />
<user-picker title="请选择抄送人" multiple ref="userPicker" v-model:value="assignedUser" @ok="selectedUser"/>
</template>
<script setup>
import {computed, defineProps} from 'vue'
import UserPicker from "../common/UserPicker.vue";
import AvatarEllipsis from "../common/AvatarEllipsis.vue";
const userPicker=ref()
const userPicker = ref()
const props = defineProps({
config: {
type: Object,
@@ -41,16 +43,16 @@ const selectUser = () => {
userPicker.value.showUserPicker()
}
const selectedUser = (select) => {
let userInfoList = []
for (let val of select) {
let userInfo = {
id: val.id,
name: val.name,
avatar: val.avatar,
}
userInfoList.push(userInfo)
}
assignedUser.value = userInfoList
// let userInfoList = []
// for (let val of select) {
// let userInfo = {
// id: val.id,
// name: val.name,
// avatar: val.avatar,
// }
// userInfoList.push(userInfo)
// }
assignedUser.value = select
}
</script>

2
src/views/workflow/process/nodes/CcNode.vue
View File

@@ -1,6 +1,6 @@
<template>
<node :title="config.name" :show-error="showError" :select-user="selectUser" :mode="mode" :content="content" :node-id="config.id"
:error-info="errorInfo" :show-avatar="true" :user-info="config.props.assignedUser"
:error-info="errorInfo" :show-avatar="true" :user-info="config.props.assignedUser" nodeType="carbonCopyRecipient"
@selected="emit('selected')" @delNode="emit('delNode')" @insertNode="type => emit('insertNode', type)"
placeholder="请设置抄送人" :header-bgc="headerBgc" :header-icon="Promotion"/>
</template>

9
src/views/workflow/process/nodes/Node.vue
View File

@@ -18,12 +18,12 @@
<template v-if="selectUser.show && mode === 'view'">
<div class="avatar_button">
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :mode="mode" :user-info="userInfo"/>
<el-button type="primary" :icon="Plus" circle/>
<!-- <el-button type="primary" :icon="Plus" circle/>-->
</div>
</template>
<template v-else-if="showAvatar">
<span class="placeholder" v-if="userInfo.length === 0">{{ placeholder }}</span>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo" :mode="mode"/>
<avatar-ellipsis :row="3" v-if="userInfo.length > 0" :user-info="userInfo" :mode="mode" :show-arrow="nodeType!=='carbonCopyRecipient'"/>
</template>
<template v-else>
<span class="placeholder" v-if="(content || '').trim() === ''">{{ placeholder }}</span>
@@ -146,6 +146,11 @@ const props = defineProps({
mode: {
type: String,
default: 'design'
},
//节点类型,例如抄送人(区别该节点,去掉抄送人之间的箭头)
nodeType: {
type: String,
default: ''
}
})