Browse Source

矩阵

han_v1
herenshan112 7 months ago
parent
commit
2b2a27ece0
  1. 9
      src/api/matrixapi/type.ts
  2. 465
      src/components/workflow/dialog/matrix.vue
  3. 76
      src/components/workflow/nodeWrap.vue
  4. 864
      src/views/sysworkflow/flow/flowDrawingBoard.vue
  5. 1122
      src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
  6. 1145
      src/views/sysworkflow/lowcodepage/workFlow.vue

9
src/api/matrixapi/type.ts

@ -48,7 +48,10 @@ export interface martixFieldStruct{
pinyin:string; //拼音(标识使用) pinyin:string; //拼音(标识使用)
isedit:boolean; //是否可更改 isedit:boolean; //是否可更改
pyedit:boolean; //拼音是否可更改 pyedit:boolean; //拼音是否可更改
} }
/** /**
* *
*/ */
@ -117,4 +120,10 @@ export interface matrixInfo{
factorName:string; factorName:string;
outcomeid:number; outcomeid:number;
outcomeName:string; outcomeName:string;
list:martOpter[], //多选矩阵
}
//矩阵列表
export interface martOpter{
outcomeid:number;
outcomeName:string;
} }

465
src/components/workflow/dialog/matrix.vue

@ -3,221 +3,302 @@
@ 时间: 2023-10-28 13:56:34 @ 时间: 2023-10-28 13:56:34
@ 备注: 矩阵选项 @ 备注: 矩阵选项
--> -->
<script lang='ts' setup> <script lang="ts" setup>
import { searchMatrix,matrixCont,martixFieldStruct,matrixInfo } from '@/api/matrixapi/type' import {
import { getMatrixList,getMatrixField } from '@/api/matrixapi/index' searchMatrix,
matrixCont,
martixFieldStruct,
matrixInfo,
martOpter,
} from "@/api/matrixapi/type";
import { getMatrixList, getMatrixField } from "@/api/matrixapi/index";
const props = defineProps({ const props = defineProps({
isshow:{ isshow: {
type:Boolean, type: Boolean,
default:false default: false,
}, },
data: { data: {
type: Object, type: Object,
default: () => { default: () => {
return { return {
"matrixid":0, matrixid: 0,
"matrixName":"", matrixName: "",
"factorid":0, factorid: 0,
"factorName":"", factorName: "",
"outcomeid":0, outcomeid: 0,
"outcomeName":"", outcomeName: "",
} list: [],
} };
}, },
}) },
const emits = defineEmits(["update:isshow","change"]); // });
const emits = defineEmits(["update:isshow", "change"]); //
const isShow = computed({ const isShow = computed({
get: () => props.isshow, get: () => props.isshow,
set: (val) => { set: (val) => {
emits("update:isshow", val); emits("update:isshow", val);
}, },
}); });
const loading = ref(true); const loading = ref(true);
const loadingVal = ref(true); const loadingVal = ref(true);
const matrixContList = ref<matrixCont[]>(); const matrixContList = ref<matrixCont[]>();
const matrixIsClick = reactive<matrixInfo>({ const matrixIsClick = reactive<matrixInfo>({
matrixid:0, matrixid: 0,
factorid:0, factorid: 0,
outcomeid:0, outcomeid: 0,
matrixName:"", matrixName: "",
factorName:"", factorName: "",
outcomeName:"", outcomeName: "",
list: [],
}); });
// //
watch(() => props.isshow,(val:any) => { watch(
if(val){ () => props.isshow,
// console.log("") (val: any) => {
searchMatrixList(); if (val) {
// console.log("")
matrixIsClick.matrixid = props.data.matrixid; searchMatrixList();
matrixIsClick.matrixName = props.data.matrixName; matrixIsClick.matrixid = props.data.matrixid;
matrixIsClick.factorid = props.data.factorid; matrixIsClick.matrixName = props.data.matrixName;
matrixIsClick.factorName = props.data.factorName; matrixIsClick.factorid = props.data.factorid;
matrixIsClick.outcomeid = props.data.outcomeid; matrixIsClick.factorName = props.data.factorName;
matrixIsClick.outcomeName = props.data.outcomeName; matrixIsClick.outcomeid = props.data.outcomeid;
} matrixIsClick.outcomeName = props.data.outcomeName;
}) matrixIsClick.list = props.data.list ? props.data.list : [];
}
}
);
watch(
() => props.data,
(val: any) => {
matrixIsClick.matrixid = val.matrixid;
matrixIsClick.matrixName = val.matrixName;
matrixIsClick.factorid = val.factorid;
matrixIsClick.factorName = val.factorName;
matrixIsClick.outcomeid = val.outcomeid;
matrixIsClick.outcomeName = val.outcomeName;
matrixIsClick.list = val.list ? val.list : [];
console.log("数据变换---->", val);
searchMatrixList();
},
(deep) => true
);
// //
const searchArchiveQuery = reactive<searchMatrix>({ const searchArchiveQuery = reactive<searchMatrix>({
page:1, page: 1,
pagesize:10 pagesize: 10,
}) });
const total = ref(0); // const total = ref(0); //
const farstId = ref<number>(0) const farstId = ref<number>(0);
/** /**
* 获取矩阵列表 * 获取矩阵列表
*/ */
function searchMatrixList(){ function searchMatrixList() {
loading.value = true loading.value = true;
// console.log("---->",matrixIsClick) // console.log("---->",matrixIsClick)
getMatrixList(searchArchiveQuery) getMatrixList(searchArchiveQuery)
.then(({ data })=>{ .then(({ data }) => {
// console.log("->",data) // console.log("->",data)
matrixContList.value = data.list matrixContList.value = data.list;
total.value = data.total total.value = data.total;
if(data.list.length > 0){ if (data.list.length > 0) {
farstId.value = data.list[0].id*1 farstId.value = data.list[0].id * 1;
// matrixIsClick.matrixid = data.list[0].id*1 // matrixIsClick.matrixid = data.list[0].id*1
// matrixIsClick.matrixName = data.list[0].name // matrixIsClick.matrixName = data.list[0].name
} }
}).finally(()=>{ })
loading.value = false .finally(() => {
gainMatrixNeed(farstId.value); loading.value = false;
}) gainMatrixNeed(farstId.value);
});
} }
const factorList = ref<martixFieldStruct[]>() const factorList = ref<martixFieldStruct[]>();
const outcomeList = ref<martixFieldStruct[]>() const outcomeList = ref<martixFieldStruct[]>();
// //
const gainMatrixNeed = (val:any) =>{ const gainMatrixNeed = (val: any) => {
loadingVal.value = true loadingVal.value = true;
getMatrixField({id:val*1}) getMatrixField({ id: val * 1 })
.then(({data})=>{ .then(({ data }) => {
// console.log("---->",data) console.log("监听数据---->", data);
factorList.value = data.factor factorList.value = data.factor;
outcomeList.value = data.outcome outcomeList.value = data.outcome;
if(data.factor.length>0){ if (data.factor.length > 0) {
// matrixIsClick.factorid = data.factor[0].id*1 // matrixIsClick.factorid = data.factor[0].id*1
// matrixIsClick.factorName = data.factor[0].name // matrixIsClick.factorName = data.factor[0].name
} }
if(data.outcome.length>0){ if (data.outcome.length > 0) {
// matrixIsClick.outcomeid = data.outcome[0].id*1 // matrixIsClick.outcomeid = data.outcome[0].id*1
// matrixIsClick.outcomeName = data.outcome[0].name // matrixIsClick.outcomeName = data.outcome[0].name
} }
}) })
.finally(()=>{ .finally(() => {
loadingVal.value = false loadingVal.value = false;
}) });
} };
// //
const pickmatirval = (val:matrixCont) =>{ const pickmatirval = (val: matrixCont) => {
matrixIsClick.matrixid = val.id*1 matrixIsClick.matrixid = val.id * 1;
matrixIsClick.matrixName = val.name matrixIsClick.matrixName = val.name;
gainMatrixNeed(val.id*1); gainMatrixNeed(val.id * 1);
} };
// //
const pickval = (val:martixFieldStruct) =>{ const pickval = (val: martixFieldStruct) => {
matrixIsClick.outcomeid = val.id*1 matrixIsClick.outcomeid = val.id * 1;
matrixIsClick.outcomeName = val.name matrixIsClick.outcomeName = val.name;
} console.log("监听数据--123-->", matrixIsClick);
var isAdd = true;
if (matrixIsClick.list && matrixIsClick.list.length > 0) {
matrixIsClick.list.forEach((item: martOpter, index: number) => {
console.log("监听数据--1-->", item.outcomeid == val.id * 1);
if (item.outcomeid == val.id * 1) {
matrixIsClick.list.splice(index, 1);
isAdd = false;
}
});
}
if (isAdd) {
matrixIsClick.list.push({
outcomeid: val.id * 1,
outcomeName: val.name,
});
}
console.log("监听数据---->", matrixIsClick);
};
// //
const pickSelect = (val:any) =>{ const pickSelect = (val: any) => {
factorList.value.forEach((item:any)=>{ factorList.value.forEach((item: any) => {
if(item.id==val){ if (item.id == val) {
matrixIsClick.factorid = item.id*1 matrixIsClick.factorid = item.id * 1;
matrixIsClick.factorName = item.name matrixIsClick.factorName = item.name;
} }
}) });
} };
watch(matrixIsClick,(val:any) => { watch(matrixIsClick, (val: any) => {
// console.log("---->",val) // console.log("---->",val)
emits("change", val); emits("change", val);
}) });
onMounted(()=>{ onMounted(() => {
matrixIsClick.matrixid = props.data.matrixid; matrixIsClick.matrixid = props.data.matrixid;
matrixIsClick.matrixName = props.data.matrixName; matrixIsClick.matrixName = props.data.matrixName;
matrixIsClick.factorid = props.data.factorid; matrixIsClick.factorid = props.data.factorid;
matrixIsClick.factorName = props.data.factorName; matrixIsClick.factorName = props.data.factorName;
matrixIsClick.outcomeid = props.data.outcomeid; matrixIsClick.outcomeid = props.data.outcomeid;
matrixIsClick.outcomeName = props.data.outcomeName; matrixIsClick.outcomeName = props.data.outcomeName;
searchMatrixList(); matrixIsClick.list = props.data.list ? props.data.list : [];
searchMatrixList();
}) });
/**
@ 作者: 秦东
@ 时间: 2025-04-23 09:46:10
@ 功能: 判断是否已经选中
*/
const jugdeIsTrue = (id: number) => {
var isAdd = false;
if (matrixIsClick.list && matrixIsClick.list.length > 0) {
matrixIsClick.list.forEach((item: martOpter) => {
console.log("数据变换--111111-->", item.outcomeid == id, item.outcomeid, id);
if (item.outcomeid == id) {
isAdd = true;
}
});
}
console.log("判断--111111111-->", id);
return isAdd;
};
</script> </script>
<template> <template>
<div> <div>
<el-divider content-position="left">矩阵选项</el-divider> <el-divider content-position="left">矩阵选项</el-divider>
<el-descriptions <el-descriptions
v-if="isShow" v-if="isShow"
title="" title=""
direction="vertical" direction="vertical"
:column="2" :column="2"
:size="size" :size="size"
border border
class="suojin" class="suojin"
> >
<el-descriptions-item label="可用矩阵" width="50%"> <el-descriptions-item label="可用矩阵" width="50%">
<el-row v-loading="loading"> <el-row v-loading="loading">
<el-col :span="24" class="materBody"> <el-col :span="24" class="materBody">
<ul> <ul>
<li v-for="item in matrixContList" :key="item.id" :class="matrixIsClick.matrixid==item.id?'active':''" @click="pickmatirval(item)"> <li
<el-text class="mx-1">{{item.name}}</el-text> <el-text class="mx-1">{{item.orgname}}</el-text> v-for="item in matrixContList"
</li> :key="item.id"
</ul> :class="matrixIsClick.matrixid == item.id ? 'active' : ''"
</el-col> @click="pickmatirval(item)"
<el-col :span="24"> >
<el-pagination v-model:total="total" v-model:current-page="searchArchiveQuery.page" small layout="prev, pager, next" :page-size="searchArchiveQuery.pagesize" :pager-count="5" /> <el-text class="mx-1">{{ item.name }}</el-text>
</el-col> <el-text class="mx-1">{{ item.orgname }}</el-text>
</el-row> </li>
</ul>
</el-descriptions-item> </el-col>
<el-col :span="24">
<el-descriptions-item label="矩阵选项" width="50%"> <el-pagination
<el-row v-loading="loadingVal"> v-model:total="total"
<el-col :span="24"> v-model:current-page="searchArchiveQuery.page"
<el-select v-model="matrixIsClick.factorid" filterable placeholder="Select" style="width:100%" @change="pickSelect"> small
<el-option layout="prev, pager, next"
:key="0" :page-size="searchArchiveQuery.pagesize"
label="请选择" :pager-count="5"
:value="0" />
/> </el-col>
<el-option </el-row>
v-for="item in factorList" </el-descriptions-item>
:key="item.id"
:label="item.name" <el-descriptions-item label="矩阵选项" width="50%">
:value="item.id" <el-row v-loading="loadingVal">
/> <el-col :span="24">
</el-select> <el-select
</el-col> v-model="matrixIsClick.factorid"
<el-col :span="24" class="materBody"> filterable
<ul> placeholder="Select"
<li v-for="item in outcomeList" :key="item.id" :class="matrixIsClick.outcomeid==item.id?'active':''" @click="pickval(item)"> style="width: 100%"
<el-text class="mx-1">{{item.name}}</el-text> <el-text class="mx-1">{{}}{{item.pinyin}}</el-text> @change="pickSelect"
</li> >
</ul> <el-option :key="0" label="请选择" :value="0" />
<el-option
</el-col> v-for="item in factorList"
</el-row> :key="item.id"
</el-descriptions-item> :label="item.name"
</el-descriptions> :value="item.id"
</div> />
</el-select>
</el-col>
<el-col :span="24" class="materBody">
<ul>
<li
v-for="item in outcomeList"
:key="item.id"
:class="jugdeIsTrue(item.id) ? 'active' : ''"
@click="pickval(item)"
>
<el-text class="mx-1">{{ item.name }}</el-text>
<el-text class="mx-1">{{ item.pinyin }}</el-text>
</li>
</ul>
</el-col>
</el-row>
</el-descriptions-item>
</el-descriptions>
</div>
</template> </template>
<style lang='scss' scoped> <style lang="scss" scoped>
.materBody{ .materBody {
padding:5px 0 5px 0; padding: 5px 0 5px 0;
li{ li {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
cursor:pointer; cursor: pointer;
} }
li.active span { li.active span {
color:#409EFF; color: #409eff;
} }
} }
.suojin{ .suojin {
padding: 0px 20px; padding: 0px 20px;
} }
</style> </style>

76
src/components/workflow/nodeWrap.vue

@ -44,11 +44,10 @@ let defaultText = computed(() => {
return placeholderList[props.nodeConfig.type]; return placeholderList[props.nodeConfig.type];
}); });
let showText = computed(() => { let showText = computed(() => {
// console.log("props.nodeConfig.type===>",props.nodeConfig,props.nodeConfig.type); console.log("props.nodeConfig.type===>", props.nodeConfig);
if (props.nodeConfig.type == 0) if (props.nodeConfig.type == 0) return $func.arrToStr(props.flowPermission) || "所有人";
return $func.arrToStr(props.flowPermission) || "所有人";
if (props.nodeConfig.type == 1) return $func.setApproverStr(props.nodeConfig); if (props.nodeConfig.type == 1) return $func.setApproverStr(props.nodeConfig);
if (props.nodeConfig.type == 3) return $func.setApproverStr(props.nodeConfig); if (props.nodeConfig.type == 3) return $func.setApproverStr(props.nodeConfig);
// console.log("props.nodeConfig.type",props.nodeConfig); // console.log("props.nodeConfig.type",props.nodeConfig);
return $func.copyerStr(props.nodeConfig); return $func.copyerStr(props.nodeConfig);
}); });
@ -104,7 +103,7 @@ const addTerm = () => {
const delTerm = (index: any) => { const delTerm = (index: any) => {
// eslint-disable-next-line vue/no-mutating-props // eslint-disable-next-line vue/no-mutating-props
props.nodeConfig.conditionNodes.splice(index, 1); props.nodeConfig.conditionNodes.splice(index, 1);
props.nodeConfig.conditionNodes.map((item:any, index:any) => { props.nodeConfig.conditionNodes.map((item: any, index: any) => {
item.priorityLevel = index + 1; item.priorityLevel = index + 1;
item.nodeName = `条件${index + 1}`; item.nodeName = `条件${index + 1}`;
}); });
@ -113,14 +112,10 @@ const delTerm = (index: any) => {
if (props.nodeConfig.conditionNodes.length == 1) { if (props.nodeConfig.conditionNodes.length == 1) {
if (props.nodeConfig.childNode) { if (props.nodeConfig.childNode) {
if (props.nodeConfig.conditionNodes[0].childNode) { if (props.nodeConfig.conditionNodes[0].childNode) {
reData( reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode);
props.nodeConfig.conditionNodes[0].childNode,
props.nodeConfig.childNode
);
} else { } else {
// eslint-disable-next-line vue/no-mutating-props // eslint-disable-next-line vue/no-mutating-props
props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode;
props.nodeConfig.childNode;
} }
} }
emits("update:nodeConfig", props.nodeConfig.conditionNodes[0].childNode); emits("update:nodeConfig", props.nodeConfig.conditionNodes[0].childNode);
@ -136,8 +131,7 @@ const reData = (data: any, addData: any) => {
const setPerson = (priorityLevel: any) => { const setPerson = (priorityLevel: any) => {
var { type } = props.nodeConfig; var { type } = props.nodeConfig;
// console.log("--->",type,props.nodeConfig) // console.log("--->",type,props.nodeConfig)
if (type == 0) { if (type == 0) {
setPromoter(true); setPromoter(true);
@ -183,7 +177,7 @@ const arrTransfer = (index: any, type = 1) => {
1, 1,
props.nodeConfig.conditionNodes[index] props.nodeConfig.conditionNodes[index]
)[0]; )[0];
props.nodeConfig.conditionNodes.map((item:any, index:any) => { props.nodeConfig.conditionNodes.map((item: any, index: any) => {
item.priorityLevel = index + 1; item.priorityLevel = index + 1;
}); });
resetConditionNodesErr(); resetConditionNodesErr();
@ -234,10 +228,7 @@ onMounted(() => {
" "
> >
<!--标签头部--> <!--标签头部-->
<div <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
class="title"
:style="`background: rgb(${bgColors[nodeConfig.type]});`"
>
<span v-if="nodeConfig.type == 0" class="iconfont" <span v-if="nodeConfig.type == 0" class="iconfont"
><i class="fa fa-play-circle-o"></i> {{ nodeConfig.nodeName }}</span ><i class="fa fa-play-circle-o"></i> {{ nodeConfig.nodeName }}</span
> >
@ -252,18 +243,26 @@ onMounted(() => {
><i class="fa fa-pencil-square-o"></i ><i class="fa fa-pencil-square-o"></i
></span> ></span>
<!--eslint-disable-next-line vue/no-mutating-props--> <!--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}}</span> <span v-else class="editable-title" @click="clickEvent()">{{
nodeConfig.nodeName
}}</span>
<i class="fa fa-close close" @click="delNode"></i> <i class="fa fa-close close" @click="delNode"></i>
</template> </template>
</div> </div>
<!--标签主体--> <!--标签主体-->
<div class="content" @click="setPerson"> <div class="content" @click="setPerson">
<div class="text"> <div class="text">
<span v-if="!showText" class="placeholder" <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
>请选择{{ defaultText }}</span
>
{{ showText }} {{ showText }}
</div> </div>
<i class="fa fa-angle-right arrow"></i> <i class="fa fa-angle-right arrow"></i>
@ -292,11 +291,7 @@ onMounted(() => {
class="auto-judge" class="auto-judge"
:class="isTried && item.error ? 'error active' : ''" :class="isTried && item.error ? 'error active' : ''"
> >
<div <div v-if="index != 0" class="sort-left" @click="arrTransfer(index, -1)">
v-if="index != 0"
class="sort-left"
@click="arrTransfer(index, -1)"
>
&lt; &lt;
</div> </div>
<div class="title-wrapper"> <div class="title-wrapper">
@ -309,15 +304,10 @@ onMounted(() => {
@blur="blurEvent(index)" @blur="blurEvent(index)"
@focus="$event.currentTarget.select()" @focus="$event.currentTarget.select()"
/> />
<span <span v-else class="editable-title" @click="clickEvent(index)">{{
v-else item.nodeName
class="editable-title" }}</span>
@click="clickEvent(index)" <span class="priority-title" @click="setPerson(item.priorityLevel)"
>{{ item.nodeName }}</span
>
<span
class="priority-title"
@click="setPerson(item.priorityLevel)"
>优先级{{ item.priorityLevel }}</span >优先级{{ item.priorityLevel }}</span
> >
<i class="fa fa-close close" @click="delTerm(index)"></i> <i class="fa fa-close close" @click="delTerm(index)"></i>
@ -336,10 +326,7 @@ onMounted(() => {
<i class="fa fa-exclamation-circle fa-2x"></i> <i class="fa fa-exclamation-circle fa-2x"></i>
</div> </div>
</div> </div>
<addNode <addNode v-model:childNodeP="item.childNode" :node-config="item" />
v-model:childNodeP="item.childNode"
:node-config="item"
/>
</div> </div>
</div> </div>
<nodeWrap v-if="item.childNode" v-model:nodeConfig="item.childNode" /> <nodeWrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
@ -354,12 +341,15 @@ onMounted(() => {
</div> </div>
</div> </div>
<!--eslint-disable-next-line vue/no-mutating-props--> <!--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>
</div> </div>
<!--循环组件--> <!--循环组件-->
<!--eslint-disable-next-line vue/no-mutating-props--> <!--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> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.nodeIcon { .nodeIcon {

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

@ -3,14 +3,22 @@
@ 时间: 2023-10-18 09:02:53 @ 时间: 2023-10-18 09:02:53
@ 备注: 工作流画板 @ 备注: 工作流画板
--> -->
<script lang='ts' setup> <script lang="ts" setup>
import '@/styles/workflowcss/workflow.scss' import "@/styles/workflowcss/workflow.scss";
import { useStore } from '@/store/workflow/index' import { useStore } from "@/store/workflow/index";
import { flowversion } from '@/api/workflowapi/types' import { flowversion } from "@/api/workflowapi/types";
import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList,saveFlowCont,gainFlowInfo,editFlowCont,saveNewFlow,switchFlowVersion } from '@/api/workflowapi/index'
import {
initializeWorkFlow,
setWorkFlowData,
gainFlowVersionList,
saveFlowCont,
gainFlowInfo,
editFlowCont,
saveNewFlow,
switchFlowVersion,
} from "@/api/workflowapi/index";
// //
import errorDialog from "@/components/workflow/dialog/errorDialog.vue"; import errorDialog from "@/components/workflow/dialog/errorDialog.vue";
@ -20,196 +28,190 @@ import copyerDrawer from "@/components/workflow/drwer/copyerDrawer.vue";
import conditionDrawer from "@/components/workflow/drwer/conditionDrawer.vue"; import conditionDrawer from "@/components/workflow/drwer/conditionDrawer.vue";
const props = defineProps({ const props = defineProps({
openDrawer:{ openDrawer: {
type:Boolean, type: Boolean,
default:true default: true,
}, },
drawerWidht:{ drawerWidht: {
type:Number, type: Number,
default:100 default: 100,
}, },
isFormFlow:{ isFormFlow: {
type:Boolean, type: Boolean,
default:true default: true,
}, },
customerFormKey:{ customerFormKey: {
type:String, type: String,
default:"" default: "",
}, },
customerFormName:{ customerFormName: {
type:String, type: String,
default:"" default: "",
}, },
flowKey:{ flowKey: {
type:String, type: String,
default:"" default: "",
} },
}) });
const emits = defineEmits(["update:openDrawer","chanerequest"]); const emits = defineEmits(["update:openDrawer", "chanerequest"]);
const isShow = computed({ const isShow = computed({
get: () => props.openDrawer, get: () => props.openDrawer,
set: (val) => { set: (val) => {
emits("update:openDrawer", val); emits("update:openDrawer", val);
}, },
}); });
let { setTableId, setIsTried } = useStore() let { setTableId, setIsTried } = useStore();
let tipList = ref<any>([]); let tipList = ref<any>([]);
let tipVisible = ref(false); let tipVisible = ref(false);
let nowVal = ref(100); // let nowVal = ref(100); //
let processConfig = ref<any>({}); let processConfig = ref<any>({});
let nodeConfig = ref({}); let nodeConfig = ref({});
let workFlowDef = ref({}); let workFlowDef = ref({});
let flowPermission = ref([]); let flowPermission = ref([]);
let directorMaxLeveling = ref<number>(0); let directorMaxLeveling = ref<number>(0);
const shenPiTitle = ref<string>("") const shenPiTitle = ref<string>("");
const activeTabs = ref<string>(""); // const activeTabs = ref<string>(""); //
const versionList = reactive<flowversion[]>([]); // const versionList = reactive<flowversion[]>([]); //
const enableFlow = ref<any>(); const enableFlow = ref<any>();
const isRead = ref(false) const isRead = ref(false);
const enableVersion = ref<string>("1"); const enableVersion = ref<string>("1");
// //
const getFlowVerList = ()=>{ const getFlowVerList = () => {
gainFlowVersionList({id:props.customerFormKey.toString()}) gainFlowVersionList({ id: props.customerFormKey.toString() })
.then(({data})=>{ .then(({ data }) => {
// console.log("-->",data) // console.log("-->",data)
// versionList = data; // versionList = data;
versionList.splice(0,versionList.length) versionList.splice(0, versionList.length);
if(data){ if (data) {
if(data.length>0){ if (data.length > 0) {
data.forEach((item: any) => {
data.forEach((item:any)=>{ if (item.state == 1) {
activeTabs.value = item.id;
enableFlow.value = item;
enableVersion.value = item.id;
}
versionList.push({
id: item.id,
key: item.key,
state: item.state,
version: item.version,
});
});
if(item.state == 1){ isRead.value = true;
activeTabs.value = item.id } else {
enableFlow.value = item isRead.value = false;
enableVersion.value = item.id }
} }
versionList.push({ // console.log("---1-->",activeTabs.value);
id:item.id, // console.log("---2-->",enableFlow.value);
key:item.key, // console.log("---3-->",enableVersion.value);
state:item.state, })
version:item.version .finally(() => {
}) if (isRead.value == true) {
}) gainFlowCont();
} else {
isRead.value = true clearCanvas(1);
}else{ }
isRead.value = false clickOpenOrClose();
});
} };
}
// console.log("---1-->",activeTabs.value);
// console.log("---2-->",enableFlow.value);
// console.log("---3-->",enableVersion.value);
})
.finally(()=>{
if(isRead.value == true){
gainFlowCont();
}else{
clearCanvas(1);
}
clickOpenOrClose();
})
}
// //
onMounted(async ()=>{ onMounted(async () => {
// getFlowVerList() // getFlowVerList()
}) });
// //
const initWorkFlowData = async() => { const initWorkFlowData = async () => {
let { data } = await initializeWorkFlow({name:props.customerFormName}) let { data } = await initializeWorkFlow({ name: props.customerFormName });
// console.log("data-=------>",data) console.log("data-=------>", data);
processConfig.value = data; processConfig.value = data;
let { let {
nodeConfig:nodes, nodeConfig: nodes,
flowPermission:flowPermissiones, flowPermission: flowPermissiones,
directorMaxLevel:levels, directorMaxLevel: levels,
workFlowDef:workName, workFlowDef: workName,
tableId, tableId,
} = data; } = data;
processConfig.value.workFlowDef.formKey = props.customerFormKey processConfig.value.workFlowDef.formKey = props.customerFormKey;
nodeConfig.value = nodes; nodeConfig.value = nodes;
flowPermission.value = flowPermissiones; flowPermission.value = flowPermissiones;
directorMaxLeveling = levels; directorMaxLeveling = levels;
workFlowDef.value = workName; workFlowDef.value = workName;
setTableId(tableId); setTableId(tableId);
// console.log("max--1->",data) // console.log("max--1->",data)
// console.log("max--6->",tableId) // console.log("max--6->",tableId)
// console.log("max--2->",flowPermission) // console.log("max--2->",flowPermission)
// console.log("max--3->",nodeConfig) // console.log("max--3->",nodeConfig)
// console.log("max--4->",directorMaxLevel) // console.log("max--4->",directorMaxLevel)
// console.log("max--5->",processConfig) // console.log("max--5->",processConfig)
} };
// //
const reErr = ({ childNode }:any) => { const reErr = ({ childNode }: any) => {
if (childNode) { if (childNode) {
let { type, error, nodeName, conditionNodes } = childNode; let { type, error, nodeName, conditionNodes } = childNode;
if (type == 1 || type == 2 || type == 3) { if (type == 1 || type == 2 || type == 3) {
if (error) { if (error) {
tipList.value.push({ tipList.value.push({
name: nodeName, name: nodeName,
type: ["", "审核人", "抄送人", "执行人"][type], type: ["", "审核人", "抄送人", "执行人"][type],
}); });
} }
reErr(childNode); reErr(childNode);
} else if (type == 4) { } else if (type == 4) {
reErr(childNode); reErr(childNode);
} else if (type == 5) { } else if (type == 5) {
reErr(childNode); reErr(childNode);
for (var i = 0; i < conditionNodes.length; i++) { for (var i = 0; i < conditionNodes.length; i++) {
if (conditionNodes[i].error) { if (conditionNodes[i].error) {
tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" }); tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
} }
reErr(conditionNodes[i]); reErr(conditionNodes[i]);
} }
} }
} else { } else {
childNode = null; childNode = null;
} }
}; };
// //
const saveSet = async () => { const saveSet = async () => {
setIsTried(true); setIsTried(true);
tipList.value = []; tipList.value = [];
reErr(nodeConfig.value); reErr(nodeConfig.value);
if (tipList.value.length != 0) { if (tipList.value.length != 0) {
tipVisible.value = true; tipVisible.value = true;
return; return;
} }
processConfig.value.flowPermission = flowPermission.value; processConfig.value.flowPermission = flowPermission.value;
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
// console.log("processConfig",processConfig.value); console.log("processConfig", processConfig.value);
// console.log("flowPermission",flowPermission.value); // console.log("flowPermission",flowPermission.value);
// console.log("nodeConfig",nodeConfig.value); // console.log("nodeConfig", nodeConfig.value);
saveFlowCont(processConfig.value) saveFlowCont(processConfig.value)
.then((data:any) => { .then((data: any) => {
if(data.code == 0){ if (data.code == 0) {
ElMessage.success("设置成功"); ElMessage.success("设置成功");
emits("update:openDrawer", false); emits("update:openDrawer", false);
clearCanvas(1); clearCanvas(1);
} }
}) })
.finally(()=>{ .finally(() => {
emits("chanerequest"); emits("chanerequest");
});
}) // let res = await setWorkFlowData(processConfig.value);
// let res = await setWorkFlowData(processConfig.value); // if (res.code == 200) {
// if (res.code == 200) { // ElMessage.success("")
// ElMessage.success("") // setTimeout(function () {
// setTimeout(function () { // window.location.href = "";
// window.location.href = ""; // }, 200);
// }, 200); // }
// }
}; };
// //
const zoomSize = (type:number) => { const zoomSize = (type: number) => {
if (type == 1) { if (type == 1) {
if (nowVal.value == 50) { if (nowVal.value == 50) {
return; return;
@ -223,267 +225,301 @@ const zoomSize = (type:number) => {
} }
}; };
// //
const clearCanvas = (isOk?:any) =>{ const clearCanvas = (isOk?: any) => {
if(isOk==1){ if (isOk == 1) {
initWorkFlowData() initWorkFlowData();
setIsTried(false); setIsTried(false);
tipList.value = [] tipList.value = [];
}else{ } else {
ElMessageBox.confirm('确定要清空画布?') ElMessageBox.confirm("确定要清空画布?").then(() => {
.then(() => { initWorkFlowData();
initWorkFlowData() setIsTried(false);
setIsTried(false); tipList.value = [];
tipList.value = [] });
}) }
}
enableFlow.value = "";
enableFlow.value = "" };
} watch(
watch(()=>props.openDrawer,(val)=>{ () => props.openDrawer,
// console.log("1111",props.customerFormKey,val) (val) => {
if(val){ // console.log("1111",props.customerFormKey,val)
if(props.customerFormKey != ""){ if (val) {
getFlowVerList() if (props.customerFormKey != "") {
}else{ getFlowVerList();
initWorkFlowData() } else {
} initWorkFlowData();
}
shenPiTitle.value = props.customerFormName shenPiTitle.value = props.customerFormName;
}else{ } else {
setIsTried(false); setIsTried(false);
tipList.value = [] tipList.value = [];
enableFlow.value = "" enableFlow.value = "";
isRead.value=false isRead.value = false;
} }
}) }
);
// //
const clickFormTable = (val:any) =>{ const clickFormTable = (val: any) => {
// console.log("",val,activeTabs.value) // console.log("",val,activeTabs.value)
enableVersion.value = val enableVersion.value = val;
gainFlowCont(); gainFlowCont();
clickOpenOrClose(); clickOpenOrClose();
// getTableFieldList(versionIndex.value,val) // getTableFieldList(versionIndex.value,val)
} };
// //
const saveEdit =()=>{ const saveEdit = () => {
setIsTried(true); setIsTried(true);
tipList.value = []; tipList.value = [];
reErr(nodeConfig.value); reErr(nodeConfig.value);
if (tipList.value.length != 0) { if (tipList.value.length != 0) {
tipVisible.value = true; tipVisible.value = true;
return; return;
} }
processConfig.value.flowPermission = flowPermission.value; processConfig.value.flowPermission = flowPermission.value;
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
// console.log("processConfig",flowPermission); console.log("processConfig", processConfig.value);
// console.log("flowPermission",flowPermission.value); // console.log("flowPermission",flowPermission.value);
// console.log("activeTabs",enableFlow.value); // console.log("activeTabs",enableFlow.value);
let sendCont = { let sendCont = {
id:enableVersion.value.toString(), id: enableVersion.value.toString(),
flowinfo:processConfig.value flowinfo: processConfig.value,
} };
editFlowCont(sendCont) editFlowCont(sendCont)
.then((data:any) => { .then((data: any) => {
if(data.code == 0){ if (data.code == 0) {
ElMessage.success("设置成功"); ElMessage.success("设置成功");
emits("update:openDrawer", false); emits("update:openDrawer", false);
clearCanvas(1); clearCanvas(1);
} }
}) })
.finally(()=>{ .finally(() => {
emits("chanerequest"); emits("chanerequest");
});
}) };
}
// //
const saveNew = () => { const saveNew = () => {
setIsTried(true); setIsTried(true);
tipList.value = []; tipList.value = [];
reErr(nodeConfig.value); reErr(nodeConfig.value);
if (tipList.value.length != 0) { if (tipList.value.length != 0) {
tipVisible.value = true; tipVisible.value = true;
return; return;
} }
processConfig.value.flowPermission = flowPermission.value; processConfig.value.flowPermission = flowPermission.value;
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
// console.log("processConfig",flowPermission); // console.log("processConfig",flowPermission);
// console.log("flowPermission",flowPermission.value); // console.log("flowPermission",flowPermission.value);
// console.log("activeTabs",enableFlow.value); // console.log("activeTabs",enableFlow.value);
let sendCont = { let sendCont = {
id:enableVersion.value.toString(), id: enableVersion.value.toString(),
flowinfo:processConfig.value flowinfo: processConfig.value,
} };
saveNewFlow(sendCont) saveNewFlow(sendCont)
.then((data:any) => { .then((data: any) => {
if(data.code == 0){ if (data.code == 0) {
ElMessage.success("设置成功"); ElMessage.success("设置成功");
emits("update:openDrawer", false); emits("update:openDrawer", false);
clearCanvas(1); clearCanvas(1);
} }
}) })
.finally(()=>{ .finally(() => {
emits("chanerequest"); emits("chanerequest");
});
}) };
}
// //
const gainFlowCont = () =>{ const gainFlowCont = () => {
gainFlowInfo({id:enableVersion.value.toString()}) gainFlowInfo({ id: enableVersion.value.toString() }).then((data: any) => {
.then((data:any)=>{ console.log("获取工作流版本列表-1->", data, enableFlow.value);
// console.log("-1->",data,enableFlow.value) if (data.code == 0) {
if(data.code == 0){ processConfig.value = data.data;
processConfig.value = data.data; processConfig.value.workFlowDef.formKey = props.customerFormKey;
processConfig.value.workFlowDef.formKey = props.customerFormKey nodeConfig.value = data.data.nodeConfig;
nodeConfig.value = data.data.nodeConfig; flowPermission.value = data.data.flowPermission;
flowPermission.value = data.data.flowPermission; directorMaxLeveling = data.data.directorMaxLevel;
directorMaxLeveling = data.data.directorMaxLevel; workFlowDef.value = data.data.workFlowDef;
workFlowDef.value = data.data.workFlowDef; setTableId(data.data.tableId);
setTableId(data.data.tableId); // console.log("max--1->",data)
// console.log("max--1->",data) // console.log("max--6->",data.data.tableId)
// console.log("max--6->",data.data.tableId) // console.log("max--2->",data.data.flowPermission)
// console.log("max--2->",data.data.flowPermission) // console.log("max--3->",nodeConfig)
// console.log("max--3->",nodeConfig) // console.log("max--4->",data.data.directorMaxLevel)
// console.log("max--4->",data.data.directorMaxLevel) // console.log("max--5->",processConfig.value)
// console.log("max--5->",processConfig.value) } else {
}else{ clearCanvas(1);
clearCanvas(1); }
} // initWorkFlowData();
// initWorkFlowData(); });
}) };
}
// //
const setupState = (val:number) =>{ const setupState = (val: number) => {
let sendCont = { let sendCont = {
id:enableVersion.value.toString(), id: enableVersion.value.toString(),
status:val status: val,
} };
switchFlowVersion(sendCont) switchFlowVersion(sendCont)
.then((data:any)=>{ .then((data: any) => {
ElMessage.success(data.msg); ElMessage.success(data.msg);
// activeTabs.value = enableVersion.value // activeTabs.value = enableVersion.value
// enableFlow.value.id = enableVersion.value // enableFlow.value.id = enableVersion.value
if(versionList.length > 0){ if (versionList.length > 0) {
versionList.forEach(item=>{ versionList.forEach((item) => {
if(item.id == enableVersion.value){ if (item.id == enableVersion.value) {
enableFlow.value = item enableFlow.value = item;
} }
}) });
} }
})
}) .finally(() => {
.finally(()=>{ clickOpenOrClose();
clickOpenOrClose(); });
}) // console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs)
// console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs) };
} const openOfClise = ref(false);
const openOfClise = ref(false)
const clickOpenOrClose = () => { const clickOpenOrClose = () => {
if(enableFlow.value.id==activeTabs.value){ if (enableFlow.value.id == activeTabs.value) {
openOfClise.value = true openOfClise.value = true;
}else{ } else {
openOfClise.value = false openOfClise.value = false;
} }
// console.log("openOfClise",openOfClise.value) // console.log("openOfClise",openOfClise.value)
// console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value) // console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
} };
</script> </script>
<template> <template>
<el-drawer v-model="isShow" :size="props.drawerWidht" :show-close="false"> <el-drawer v-model="isShow" :size="props.drawerWidht" :show-close="false">
<template #header="{ close, titleId, titleClass }"> <template #header="{ close, titleId, titleClass }">
<div style="display: flex; width:50%"> <div style="display: flex; width: 50%">
<div class="right_kongx"><h4 :id="titleId" :class="titleClass">{{ shenPiTitle }}审批流程</h4></div> <div class="right_kongx">
<h4 :id="titleId" :class="titleClass">{{ shenPiTitle }}审批流程</h4>
</div> </div>
<el-button type="warning" @click="clearCanvas"> </div>
<el-icon class="el-icon--left"><Delete /></el-icon> <el-button type="warning" @click="clearCanvas">
清空 <el-icon class="el-icon--left"><Delete /></el-icon>
</el-button> 清空
<el-button v-if="!isRead" type="primary" @click="saveSet"> </el-button>
<el-icon class="el-icon--left"><Promotion /></el-icon> <el-button v-if="!isRead" type="primary" @click="saveSet">
发布 <el-icon class="el-icon--left"><Promotion /></el-icon>
</el-button> 发布
<el-button v-if="isRead" type="primary" @click="saveEdit"> </el-button>
<el-icon class="fa fa-save" style="margin-right:5px"></el-icon> <el-button v-if="isRead" type="primary" @click="saveEdit">
保存 <el-icon class="fa fa-save" style="margin-right: 5px"></el-icon>
</el-button> 保存
<el-button v-if="isRead" color="#626aef" @click="saveNew"> </el-button>
<el-icon class="el-icon--left"><Share /></el-icon> <el-button v-if="isRead" color="#626aef" @click="saveNew">
另存为新版 <el-icon class="el-icon--left"><Share /></el-icon>
</el-button> 另存为新版
<el-button type="danger" @click="close"> </el-button>
<el-icon class="el-icon--left"><CircleCloseFilled /></el-icon> <el-button type="danger" @click="close">
关闭 <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
</el-button> 关闭
</template> </el-button>
</template>
<div class="canvas_body">
<el-row v-if="isRead" :gutter="20"> <div class="canvas_body">
<el-col :span="22"> <el-row v-if="isRead" :gutter="20">
<el-tabs v-model="activeTabs" class="flow_version" @tab-change="clickFormTable"> <el-col :span="22">
<el-tab-pane v-for="item in versionList" :key="item.id" :label="item.version" :name="item.id"> <el-tabs v-model="activeTabs" class="flow_version" @tab-change="clickFormTable">
<template #label> <el-tab-pane
<span class="custom-tabs-label"> v-for="item in versionList"
<span>V{{ item.version }}</span> :key="item.id"
</span> :label="item.version"
</template> :name="item.id"
</el-tab-pane> >
</el-tabs> <template #label>
</el-col> <span class="custom-tabs-label">
<el-col :span="1" style="text-align: center; display: flex; margin: auto;"> <span>V{{ item.version }}</span>
<el-button v-if="openOfClise" type="danger" size="small" round @click="setupState(2)">禁用</el-button> </span>
<el-button v-if="!openOfClise" type="success" size="small" round @click="setupState(1)">启用</el-button> </template>
</el-col> </el-tab-pane>
</el-row> </el-tabs>
<div class="fd-nav-content-new"> </el-col>
<!--画板--> <el-col :span="1" style="text-align: center; display: flex; margin: auto">
<section class="dingflow-design"> <el-button
<div class="zoom"> v-if="openOfClise"
<div class="zoom-out" :class="nowVal == 50 && 'disabled'" @click="zoomSize(1)"></div> type="danger"
<span>{{ nowVal }}%</span> size="small"
<div class="zoom-in" :class="nowVal == 300 && 'disabled'" @click="zoomSize(2)"></div> round
</div> @click="setupState(2)"
<div class="box-scale" :style="`transform: scale(${ nowVal / 100});`"> >禁用</el-button
<nodeWrap v-model:nodeConfig="nodeConfig" v-model:flowPermission="flowPermission" /> >
<div class="end-node"> <el-button
<div class="end-node-circle"></div> v-if="!openOfClise"
<div class="end-node-text">4</div> type="success"
</div> size="small"
</div> round
</section> @click="setupState(1)"
</div> >启用</el-button
<errorDialog v-model:visible="tipVisible" :list="tipList" /> >
<promoterDrawer /> </el-col>
<approverDrawer :directormaxlevel="directorMaxLeveling" :node-config="nodeConfig" :is-form-flow="props.isFormFlow" :customer-form-key="props.customerFormKey" /> </el-row>
<copyerDrawer /> <div class="fd-nav-content-new">
<conditionDrawer :is-form-flow="props.isFormFlow" :customer-form-key="props.customerFormKey" /> <!--画板-->
</div> <section class="dingflow-design">
</el-drawer> <div class="zoom">
<div
class="zoom-out"
:class="nowVal == 50 && 'disabled'"
@click="zoomSize(1)"
></div>
<span>{{ nowVal }}%</span>
<div
class="zoom-in"
:class="nowVal == 300 && 'disabled'"
@click="zoomSize(2)"
></div>
</div>
<div class="box-scale" :style="`transform: scale(${nowVal / 100});`">
<nodeWrap
v-model:nodeConfig="nodeConfig"
v-model:flowPermission="flowPermission"
/>
<div class="end-node">
<div class="end-node-circle"></div>
<div class="end-node-text">4</div>
</div>
</div>
</section>
</div>
<errorDialog v-model:visible="tipVisible" :list="tipList" />
<promoterDrawer />
<approverDrawer
:directormaxlevel="directorMaxLeveling"
:node-config="nodeConfig"
:is-form-flow="props.isFormFlow"
:customer-form-key="props.customerFormKey"
/>
<copyerDrawer />
<conditionDrawer
:is-form-flow="props.isFormFlow"
:customer-form-key="props.customerFormKey"
/>
</div>
</el-drawer>
</template> </template>
<style> <style>
.canvas_body{ .canvas_body {
height: 100%; height: 100%;
width: inherit; width: inherit;
} }
.flow_version{ .flow_version {
} }
.flow_version > .el-tabs__content{ .flow_version > .el-tabs__content {
padding: 0px; padding: 0px;
height:0px; height: 0px;
} }
.flow_version > .el-tabs__header{ .flow_version > .el-tabs__header {
margin:0px; margin: 0px;
} }
.flow_version .custom-tabs-label span { .flow_version .custom-tabs-label span {
padding:0 10px; padding: 0 10px;
} }
.right_kongx{ .right_kongx {
margin-right:50px margin-right: 50px;
} }
</style> </style>

1122
src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue

File diff suppressed because it is too large

1145
src/views/sysworkflow/lowcodepage/workFlow.vue

File diff suppressed because it is too large
Loading…
Cancel
Save