Browse Source

调整参数

liwenxuan_v2
超级管理员 2 years ago
parent
commit
6acd47d90e
  1. 1
      src/api/DesignForm/type.ts
  2. 12
      src/components/workflow/addNode.vue
  3. 30
      src/components/workflow/nodeWrap.vue
  4. 109
      src/components/workflow/selectBox.vue
  5. 2
      src/components/workflow/selectBoxs.vue
  6. 2
      src/views/sysworkflow/flow/flowDrawingBoard.vue
  7. 2
      src/views/sysworkflow/flow/flowcanvas.vue

1
src/api/DesignForm/type.ts

@ -12,6 +12,7 @@ export interface customerFormCont{
classify:number;
creatername:string;
creatertime:string;
flowkey:any;
}
export type CustomerFormPageResult = PageResult<customerFormCont[]>;

12
src/components/workflow/addNode.vue

@ -51,10 +51,10 @@ const addType = (type:any)=> {
var data;
if (type == 1) {
data = {
"nodeNumber":onlyNumber,
"nodeName": "审核人",
"error": true,
"type": 1,
"nodeNumber":onlyNumber, //
"nodeName": "审核人", //
"error": true, //
"type": 1, // 0 1 2 3 4 5
"settype": 1,
"selectMode": 0,
"selectRange": 0,
@ -123,7 +123,7 @@ const addType = (type:any)=> {
"nodeNumber":snowflake1,
"nodeName": "条件1",
"error": true,
"type": 3,
"type": 4,
"priorityLevel": 1,
"conditionList": [],
"nodeUserList": [],
@ -133,7 +133,7 @@ const addType = (type:any)=> {
}, {
"nodeNumber":snowflake2,
"nodeName": "条件2",
"type": 3,
"type": 4,
"priorityLevel": 2,
"conditionList": [],
"nodeUserList": [],

30
src/components/workflow/nodeWrap.vue

@ -62,7 +62,7 @@ const resetConditionNodesErr = () => {
}
};
const clickEvent = (index: any) => {
const clickEvent = (index?: any) => {
if (index || index === 0) {
isInputList.value[index] = true;
} else {
@ -172,12 +172,13 @@ const arrTransfer = (index: any, type = 1) => {
//-1,1
// eslint-disable-next-line vue/no-mutating-props
props.nodeConfig.conditionNodes[index] =
// eslint-disable-next-line vue/no-mutating-props
props.nodeConfig.conditionNodes.splice(
index + type,
1,
props.nodeConfig.conditionNodes[index]
)[0];
props.nodeConfig.conditionNodes.map((item, index) => {
props.nodeConfig.conditionNodes.map((item:any, index:any) => {
item.priorityLevel = index + 1;
});
resetConditionNodesErr();
@ -246,15 +247,7 @@ onMounted(() => {
><i class="fa fa-pencil-square-o"></i
></span>
<!--eslint-disable-next-line vue/no-mutating-props-->
<input
v-if="isInput"
v-model="nodeConfig.nodeName"
v-focus:placeholder="defaultText"
type="text"
class="ant-input editable-title-input"
@blur="blurEvent()"
@focus="$event.currentTarget.select()"
/>
<input v-if="isInput" v-model="nodeConfig.nodeName" v-focus:placeholder="defaultText" type="text" class="ant-input editable-title-input" @blur="blurEvent()" @focus="$event.currentTarget.select()"/>
<span v-else class="editable-title" @click="clickEvent()">{{
nodeConfig.nodeName
@ -278,10 +271,7 @@ onMounted(() => {
</div>
</div>
<!--eslint-disable-next-line vue/no-mutating-props-->
<addNode
v-model:childNodeP="nodeConfig.childNode"
:node-config="props.nodeConfig"
/>
<addNode v-model:childNodeP="nodeConfig.childNode" :node-config="props.nodeConfig" />
</div>
<!--路由模块-->
<div v-if="nodeConfig.type == 5" class="node-wrap">
@ -361,18 +351,12 @@ onMounted(() => {
</div>
</div>
<!--eslint-disable-next-line vue/no-mutating-props-->
<addNode
v-model:childNodeP="nodeConfig.childNode"
:node-config="props.nodeConfig"
/>
<addNode v-model:childNodeP="nodeConfig.childNode" :node-config="props.nodeConfig" />
</div>
</div>
<!--循环组件-->
<!--eslint-disable-next-line vue/no-mutating-props-->
<nodeWrap
v-if="nodeConfig.childNode"
v-model:nodeConfig="nodeConfig.childNode"
/>
<nodeWrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode"/>
</template>
<style lang="scss" scoped>
.nodeIcon {

109
src/components/workflow/selectBox.vue

@ -1,109 +0,0 @@
<!--
@ 作者: 秦东
@ 时间: 2023-10-13 08:48:13
@ 备注: 选在人员或角色通用模块
-->
<script lang='ts' setup>
defineProps({
list: {
type: Array,
default: () => []
}
})
</script>
<template>
<ul class="select-box">
<template v-for="(elem, i) in list" :key="i">
<template v-if="elem.type === 'role'">
<li v-for="item in elem.data" :key="item.roleId"
class="check_box"
:class="{active: elem.isActive && elem.isActive(item), not: elem.not}"
@click="elem.change(item)">
<a :title="item.description" :class="{active: elem.isActiveItem && elem.isActiveItem(item)}">
<img src="@/assets/images/icon_role.png">{{item.roleName}}
</a>
</li>
</template>
<template v-if="elem.type === 'department'">
<li v-for="item in elem.data" :key="item.id" class="check_box not" :class="{not: !elem.isDepartment}">
<a v-if="elem.isDepartment" :class="elem.isActive(item) && 'active'" @click="elem.change(item)">
<img src="@/assets/images/icon_file.png">{{item.departmentName}}
</a>
<a v-else><img src="@/assets/images/icon_file.png">{{item.departmentName}}</a>
<i @click="elem.next(item)">下级</i>
</li>
</template>
<template v-if="elem.type === 'employee'">
<li v-for="item in elem.data" :key="item.id" class="check_box">
<a :class="elem.isActive(item) && 'active'" :title="item.departmentNames" @click="elem.change(item)" >
<img v-if="item.icon != ''" :src="item.icon">
<img v-if="item.icon == '' && item.iconToBase64 != ''" :src="item.iconToBase64">
<img v-if="item.icon == '' && item.iconToBase64 == ''" src="@/assets/images/icon_people.png">{{item.employeeName}}
</a>
</li>
</template>
</template>
</ul>
</template>
<style lang="less">
.select-box {
height: 420px;
overflow-y: auto;
li {
padding: 5px 0;
i {
float: right;
padding-left: 24px;
padding-right: 10px;
color: #3195f8;
font-size: 12px;
cursor: pointer;
background: url('../../assets/images/next_level_active.png') no-repeat 10px center;
border-left: 1px solid rgb(238, 238, 238);
}
a.active+i {
color: rgb(197, 197, 197);
background-image: url('../../assets/images/next_level.png');
pointer-events: none;
}
img {
width: 14px;
vertical-align: middle;
margin-right: 5px;
}
}
}
.not{
a{
padding-left:20px
}
}
.not a::before {
position: absolute;
width: 14px;
height: 14px;
border: 1px solid #dcdfe6;
border-radius: 2px;
left: 0;
top: 1px;
content: "";
}
.not a.active {
position: absolute;
width: 10px;
height: 10px;
border-radius: 50%;
top: 3px;
left: 3px;
content: "";
background: url("../../assets/images/check_box.png") no-repeat center;
}
</style>

2
src/components/workflow/selectBoxs.vue

@ -7,7 +7,7 @@
defineProps({
list: {
type: Array,
default: () => []
default: () => [{ type: 'role', data:any, cancel:()=>{} }]
}
})
</script>

2
src/views/sysworkflow/flow/flowDrawingBoard.vue

@ -7,7 +7,7 @@
import '@/styles/workflowcss/workflow.scss'
import { useStore } from '@/store/workflow/index'
import { tipListStrucr,flowversion } from '@/api/workflowapi/types'
import { flowversion } from '@/api/workflowapi/types'
import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList } from '@/api/workflowapi/index'
//

2
src/views/sysworkflow/flow/flowcanvas.vue

@ -7,7 +7,7 @@
import '@/styles/workflowcss/workflow.scss'
import { useStore } from '@/store/workflow/index'
import { tipListStrucr } from '@/api/workflowapi/types'
import { initializeWorkFlow,setWorkFlowData } from '@/api/workflowapi/index'
let { setTableId, setIsTried } = useStore()

Loading…
Cancel
Save