From 2b2a27ece067c7174f02716d0627808012eabebf Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Wed, 23 Apr 2025 10:57:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9F=A9=E9=98=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/matrixapi/type.ts                     |    9 +
 src/components/workflow/dialog/matrix.vue     |  465 ++++---
 src/components/workflow/nodeWrap.vue          |   76 +-
 .../sysworkflow/flow/flowDrawingBoard.vue     |  864 +++++++------
 .../appPage/appPageForm/pageFlow.vue          | 1122 ++++++++--------
 .../sysworkflow/lowcodepage/workFlow.vue      | 1145 +++++++++--------
 6 files changed, 1930 insertions(+), 1751 deletions(-)

diff --git a/src/api/matrixapi/type.ts b/src/api/matrixapi/type.ts
index 8716705..7b4e696 100644
--- a/src/api/matrixapi/type.ts
+++ b/src/api/matrixapi/type.ts
@@ -48,7 +48,10 @@ export interface martixFieldStruct{
 	pinyin:string;	//拼音（标识使用）
 	isedit:boolean;	//是否可更改
 	pyedit:boolean;	//拼音是否可更改
+	
 }
+
+
 /**
  * 矩阵字段列表
  */
@@ -117,4 +120,10 @@ export interface matrixInfo{
 	factorName:string;
 	outcomeid:number;
 	outcomeName:string;
+	list:martOpter[], //多选矩阵
+}
+//矩阵列表
+export interface martOpter{
+	outcomeid:number;
+	outcomeName:string;
 }
diff --git a/src/components/workflow/dialog/matrix.vue b/src/components/workflow/dialog/matrix.vue
index 2599304..e939f94 100644
--- a/src/components/workflow/dialog/matrix.vue
+++ b/src/components/workflow/dialog/matrix.vue
@@ -3,221 +3,302 @@
 @ 时间: 2023-10-28 13:56:34
 @ 备注: 矩阵选项
 -->
-<script lang='ts' setup>
-import { searchMatrix,matrixCont,martixFieldStruct,matrixInfo } from '@/api/matrixapi/type'
-import { getMatrixList,getMatrixField } from '@/api/matrixapi/index'
-
+<script lang="ts" setup>
+import {
+  searchMatrix,
+  matrixCont,
+  martixFieldStruct,
+  matrixInfo,
+  martOpter,
+} from "@/api/matrixapi/type";
+import { getMatrixList, getMatrixField } from "@/api/matrixapi/index";
 
 const props = defineProps({
-	isshow:{
-		type:Boolean,
-		default:false
-	},
-	data: {
-		type: Object,
-		default: () => {
-			return {
-				"matrixid":0,
-				"matrixName":"",
-				"factorid":0,
-				"factorName":"",
-				"outcomeid":0,
-				"outcomeName":"",
-			}
-		}
-	},
-})
-const emits = defineEmits(["update:isshow","change"]);	//父级元素
+  isshow: {
+    type: Boolean,
+    default: false,
+  },
+  data: {
+    type: Object,
+    default: () => {
+      return {
+        matrixid: 0,
+        matrixName: "",
+        factorid: 0,
+        factorName: "",
+        outcomeid: 0,
+        outcomeName: "",
+        list: [],
+      };
+    },
+  },
+});
+const emits = defineEmits(["update:isshow", "change"]); //父级元素
 const isShow = computed({
-	get: () => props.isshow,
-	set: (val) => {
-		emits("update:isshow", val);
-	},
+  get: () => props.isshow,
+  set: (val) => {
+    emits("update:isshow", val);
+  },
 });
 const loading = ref(true);
 const loadingVal = ref(true);
 const matrixContList = ref<matrixCont[]>();
 const matrixIsClick = reactive<matrixInfo>({
-	matrixid:0,
-	factorid:0,
-	outcomeid:0,
-	matrixName:"",
-	factorName:"",
-	outcomeName:"",
+  matrixid: 0,
+  factorid: 0,
+  outcomeid: 0,
+  matrixName: "",
+  factorName: "",
+  outcomeName: "",
+  list: [],
 });
 //执行监听
-watch(() => props.isshow,(val:any) => {
-	if(val){
-		// console.log("执行监听")
-		searchMatrixList();
-
-		matrixIsClick.matrixid = props.data.matrixid;
-		matrixIsClick.matrixName =  props.data.matrixName;
-		matrixIsClick.factorid =  props.data.factorid;
-		matrixIsClick.factorName =  props.data.factorName;
-		matrixIsClick.outcomeid =  props.data.outcomeid;
-		matrixIsClick.outcomeName =  props.data.outcomeName;
-	}
-})
+watch(
+  () => props.isshow,
+  (val: any) => {
+    if (val) {
+      // console.log("执行监听")
+      searchMatrixList();
+      matrixIsClick.matrixid = props.data.matrixid;
+      matrixIsClick.matrixName = props.data.matrixName;
+      matrixIsClick.factorid = props.data.factorid;
+      matrixIsClick.factorName = props.data.factorName;
+      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>({
-	page:1,
-	pagesize:10
-})
-const total = ref(0);				//总记录数
-const farstId = ref<number>(0)
+  page: 1,
+  pagesize: 10,
+});
+const total = ref(0); //总记录数
+const farstId = ref<number>(0);
 /**
  * 获取矩阵列表
  */
-function searchMatrixList(){
-	loading.value = true
-	// console.log("值改变---->",matrixIsClick)
-	getMatrixList(searchArchiveQuery)
-		.then(({ data })=>{
-			// console.log("获取矩阵列表->",data)
-			matrixContList.value = data.list
-			total.value = data.total
-			if(data.list.length > 0){
-				farstId.value = data.list[0].id*1
-				// matrixIsClick.matrixid = data.list[0].id*1
-				// matrixIsClick.matrixName = data.list[0].name
-			}
-		}).finally(()=>{
-			loading.value = false
-			gainMatrixNeed(farstId.value);
-		})
+function searchMatrixList() {
+  loading.value = true;
+  // console.log("值改变---->",matrixIsClick)
+  getMatrixList(searchArchiveQuery)
+    .then(({ data }) => {
+      // console.log("获取矩阵列表->",data)
+      matrixContList.value = data.list;
+      total.value = data.total;
+      if (data.list.length > 0) {
+        farstId.value = data.list[0].id * 1;
+        // matrixIsClick.matrixid = data.list[0].id*1
+        // matrixIsClick.matrixName = data.list[0].name
+      }
+    })
+    .finally(() => {
+      loading.value = false;
+      gainMatrixNeed(farstId.value);
+    });
 }
-const factorList = ref<martixFieldStruct[]>()
-const outcomeList = ref<martixFieldStruct[]>()
+const factorList = ref<martixFieldStruct[]>();
+const outcomeList = ref<martixFieldStruct[]>();
 //获取矩阵相关字段
-const gainMatrixNeed = (val:any) =>{
-	loadingVal.value = true
-	getMatrixField({id:val*1})
-		.then(({data})=>{
-			// console.log("监听数据---->",data)
-			factorList.value = data.factor
-			outcomeList.value = data.outcome
-			if(data.factor.length>0){
-				// matrixIsClick.factorid = data.factor[0].id*1
-				// matrixIsClick.factorName = data.factor[0].name
-			}
-			if(data.outcome.length>0){
-				// matrixIsClick.outcomeid = data.outcome[0].id*1
-				// matrixIsClick.outcomeName = data.outcome[0].name
-			}
-		})
-		.finally(()=>{
-			loadingVal.value = false
-		})
-}
+const gainMatrixNeed = (val: any) => {
+  loadingVal.value = true;
+  getMatrixField({ id: val * 1 })
+    .then(({ data }) => {
+      console.log("监听数据---->", data);
+      factorList.value = data.factor;
+      outcomeList.value = data.outcome;
+      if (data.factor.length > 0) {
+        // matrixIsClick.factorid = data.factor[0].id*1
+        // matrixIsClick.factorName = data.factor[0].name
+      }
+      if (data.outcome.length > 0) {
+        // matrixIsClick.outcomeid = data.outcome[0].id*1
+        // matrixIsClick.outcomeName = data.outcome[0].name
+      }
+    })
+    .finally(() => {
+      loadingVal.value = false;
+    });
+};
 //选择矩阵
-const pickmatirval = (val:matrixCont) =>{
-	matrixIsClick.matrixid = val.id*1
-	matrixIsClick.matrixName = val.name
-	gainMatrixNeed(val.id*1);
-}
+const pickmatirval = (val: matrixCont) => {
+  matrixIsClick.matrixid = val.id * 1;
+  matrixIsClick.matrixName = val.name;
+  gainMatrixNeed(val.id * 1);
+};
 //选择矩阵值
-const pickval = (val:martixFieldStruct) =>{
-	matrixIsClick.outcomeid = val.id*1
-	matrixIsClick.outcomeName = val.name
-}
+const pickval = (val: martixFieldStruct) => {
+  matrixIsClick.outcomeid = val.id * 1;
+  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) =>{
-	factorList.value.forEach((item:any)=>{
-		if(item.id==val){
-			matrixIsClick.factorid = item.id*1
-			matrixIsClick.factorName = item.name
-		}
-	})
-}
-watch(matrixIsClick,(val:any) => {
-	// console.log("值改变---->",val)
-	emits("change", val);
-})
-onMounted(()=>{
-	matrixIsClick.matrixid = props.data.matrixid;
-	matrixIsClick.matrixName =  props.data.matrixName;
-	matrixIsClick.factorid =  props.data.factorid;
-	matrixIsClick.factorName =  props.data.factorName;
-	matrixIsClick.outcomeid =  props.data.outcomeid;
-	matrixIsClick.outcomeName =  props.data.outcomeName;
-	searchMatrixList();
-
-})
+const pickSelect = (val: any) => {
+  factorList.value.forEach((item: any) => {
+    if (item.id == val) {
+      matrixIsClick.factorid = item.id * 1;
+      matrixIsClick.factorName = item.name;
+    }
+  });
+};
+watch(matrixIsClick, (val: any) => {
+  // console.log("值改变---->",val)
+  emits("change", val);
+});
+onMounted(() => {
+  matrixIsClick.matrixid = props.data.matrixid;
+  matrixIsClick.matrixName = props.data.matrixName;
+  matrixIsClick.factorid = props.data.factorid;
+  matrixIsClick.factorName = props.data.factorName;
+  matrixIsClick.outcomeid = props.data.outcomeid;
+  matrixIsClick.outcomeName = props.data.outcomeName;
+  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>
 <template>
-	<div>
-	<el-divider content-position="left">矩阵选项</el-divider>
-		<el-descriptions
-			v-if="isShow"
-			title=""
-			direction="vertical"
-			:column="2"
-			:size="size"
-			border
-			class="suojin"
-		>
-			<el-descriptions-item  label="可用矩阵" width="50%">
-				<el-row  v-loading="loading">
-					<el-col  :span="24"  class="materBody">
-						<ul>
-							<li  v-for="item in matrixContList" :key="item.id" :class="matrixIsClick.matrixid==item.id?'active':''" @click="pickmatirval(item)">
-								<el-text class="mx-1">{{item.name}}</el-text> <el-text class="mx-1">{{item.orgname}}</el-text>
-							</li>
-						</ul>
-					</el-col>
-					<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-col>
-				</el-row>
-				
-			</el-descriptions-item>
-			
-			<el-descriptions-item  label="矩阵选项" width="50%">
-				<el-row  v-loading="loadingVal">
-					<el-col :span="24">
-						<el-select v-model="matrixIsClick.factorid" filterable placeholder="Select" style="width:100%" @change="pickSelect">
-							<el-option
-								:key="0"
-								label="请选择"
-								:value="0"
-							/>
-							<el-option
-								v-for="item in factorList"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							/>
-						</el-select>
-					</el-col>
-					<el-col  :span="24"  class="materBody">
-						<ul>
-							<li  v-for="item in outcomeList" :key="item.id" :class="matrixIsClick.outcomeid==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>
+  <div>
+    <el-divider content-position="left">矩阵选项</el-divider>
+    <el-descriptions
+      v-if="isShow"
+      title=""
+      direction="vertical"
+      :column="2"
+      :size="size"
+      border
+      class="suojin"
+    >
+      <el-descriptions-item label="可用矩阵" width="50%">
+        <el-row v-loading="loading">
+          <el-col :span="24" class="materBody">
+            <ul>
+              <li
+                v-for="item in matrixContList"
+                :key="item.id"
+                :class="matrixIsClick.matrixid == item.id ? 'active' : ''"
+                @click="pickmatirval(item)"
+              >
+                <el-text class="mx-1">{{ item.name }}</el-text>
+                <el-text class="mx-1">{{ item.orgname }}</el-text>
+              </li>
+            </ul>
+          </el-col>
+          <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-col>
+        </el-row>
+      </el-descriptions-item>
+
+      <el-descriptions-item label="矩阵选项" width="50%">
+        <el-row v-loading="loadingVal">
+          <el-col :span="24">
+            <el-select
+              v-model="matrixIsClick.factorid"
+              filterable
+              placeholder="Select"
+              style="width: 100%"
+              @change="pickSelect"
+            >
+              <el-option :key="0" label="请选择" :value="0" />
+              <el-option
+                v-for="item in factorList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </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>
-<style  lang='scss' scoped>
-.materBody{
-	padding:5px 0 5px 0;
-	
-	li{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		cursor:pointer;
-	}
-	li.active span {
-		color:#409EFF;
-	}
+<style lang="scss" scoped>
+.materBody {
+  padding: 5px 0 5px 0;
+
+  li {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    cursor: pointer;
+  }
+  li.active span {
+    color: #409eff;
+  }
 }
-.suojin{
-	padding: 0px 20px;
+.suojin {
+  padding: 0px 20px;
 }
 </style>
diff --git a/src/components/workflow/nodeWrap.vue b/src/components/workflow/nodeWrap.vue
index 1e10abe..ec47630 100644
--- a/src/components/workflow/nodeWrap.vue
+++ b/src/components/workflow/nodeWrap.vue
@@ -44,11 +44,10 @@ let defaultText = computed(() => {
   return placeholderList[props.nodeConfig.type];
 });
 let showText = computed(() => {
-  // console.log("props.nodeConfig.type===>",props.nodeConfig,props.nodeConfig.type);
-  if (props.nodeConfig.type == 0)
-    return $func.arrToStr(props.flowPermission) || "所有人";
+  console.log("props.nodeConfig.type===>", props.nodeConfig);
+  if (props.nodeConfig.type == 0) return $func.arrToStr(props.flowPermission) || "所有人";
   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);
   return $func.copyerStr(props.nodeConfig);
 });
@@ -104,7 +103,7 @@ const addTerm = () => {
 const delTerm = (index: any) => {
   // eslint-disable-next-line vue/no-mutating-props
   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.nodeName = `条件${index + 1}`;
   });
@@ -113,14 +112,10 @@ const delTerm = (index: any) => {
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
-        reData(
-          props.nodeConfig.conditionNodes[0].childNode,
-          props.nodeConfig.childNode
-        );
+        reData(props.nodeConfig.conditionNodes[0].childNode, props.nodeConfig.childNode);
       } else {
         // eslint-disable-next-line vue/no-mutating-props
-        props.nodeConfig.conditionNodes[0].childNode =
-          props.nodeConfig.childNode;
+        props.nodeConfig.conditionNodes[0].childNode = props.nodeConfig.childNode;
       }
     }
     emits("update:nodeConfig", props.nodeConfig.conditionNodes[0].childNode);
@@ -136,8 +131,7 @@ const reData = (data: any, addData: any) => {
 const setPerson = (priorityLevel: any) => {
   var { type } = props.nodeConfig;
 
-// console.log("选中节点--->",type,props.nodeConfig)
-
+  // console.log("选中节点--->",type,props.nodeConfig)
 
   if (type == 0) {
     setPromoter(true);
@@ -183,7 +177,7 @@ const arrTransfer = (index: any, type = 1) => {
       1,
       props.nodeConfig.conditionNodes[index]
     )[0];
-  props.nodeConfig.conditionNodes.map((item:any, index:any) => {
+  props.nodeConfig.conditionNodes.map((item: any, index: any) => {
     item.priorityLevel = index + 1;
   });
   resetConditionNodesErr();
@@ -234,10 +228,7 @@ onMounted(() => {
       "
     >
       <!--标签头部-->
-      <div
-        class="title"
-        :style="`background: rgb(${bgColors[nodeConfig.type]});`"
-      >
+      <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type == 0" class="iconfont"
           ><i class="fa fa-play-circle-o"></i> {{ nodeConfig.nodeName }}</span
         >
@@ -252,18 +243,26 @@ 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}}</span>
+          <span v-else class="editable-title" @click="clickEvent()">{{
+            nodeConfig.nodeName
+          }}</span>
           <i class="fa fa-close close" @click="delNode"></i>
         </template>
       </div>
       <!--标签主体-->
       <div class="content" @click="setPerson">
         <div class="text">
-          <span v-if="!showText" class="placeholder"
-            >请选择{{ defaultText }}</span
-          >
+          <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
         <i class="fa fa-angle-right arrow"></i>
@@ -292,11 +291,7 @@ onMounted(() => {
                 class="auto-judge"
                 :class="isTried && item.error ? 'error active' : ''"
               >
-                <div
-                  v-if="index != 0"
-                  class="sort-left"
-                  @click="arrTransfer(index, -1)"
-                >
+                <div v-if="index != 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
                 <div class="title-wrapper">
@@ -309,15 +304,10 @@ onMounted(() => {
                     @blur="blurEvent(index)"
                     @focus="$event.currentTarget.select()"
                   />
-                  <span
-                    v-else
-                    class="editable-title"
-                    @click="clickEvent(index)"
-                    >{{ item.nodeName }}</span
-                  >
-                  <span
-                    class="priority-title"
-                    @click="setPerson(item.priorityLevel)"
+                  <span v-else class="editable-title" @click="clickEvent(index)">{{
+                    item.nodeName
+                  }}</span>
+                  <span class="priority-title" @click="setPerson(item.priorityLevel)"
                     >优先级{{ item.priorityLevel }}</span
                   >
                   <i class="fa fa-close close" @click="delTerm(index)"></i>
@@ -336,10 +326,7 @@ onMounted(() => {
                   <i class="fa fa-exclamation-circle fa-2x"></i>
                 </div>
               </div>
-              <addNode
-                v-model:childNodeP="item.childNode"
-                :node-config="item"
-              />
+              <addNode v-model:childNodeP="item.childNode" :node-config="item" />
             </div>
           </div>
           <nodeWrap v-if="item.childNode" v-model:nodeConfig="item.childNode" />
@@ -354,12 +341,15 @@ 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 {
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index 198d4c2..f59cad2 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -3,14 +3,22 @@
 @ 时间: 2023-10-18 09:02:53
 @ 备注: 工作流画板
 -->
-<script lang='ts' setup>
-import '@/styles/workflowcss/workflow.scss'
+<script lang="ts" setup>
+import "@/styles/workflowcss/workflow.scss";
 
-import { useStore } from '@/store/workflow/index' 
-import { flowversion } from '@/api/workflowapi/types'
-
-import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList,saveFlowCont,gainFlowInfo,editFlowCont,saveNewFlow,switchFlowVersion } from '@/api/workflowapi/index'
+import { useStore } from "@/store/workflow/index";
+import { flowversion } from "@/api/workflowapi/types";
 
+import {
+  initializeWorkFlow,
+  setWorkFlowData,
+  gainFlowVersionList,
+  saveFlowCont,
+  gainFlowInfo,
+  editFlowCont,
+  saveNewFlow,
+  switchFlowVersion,
+} from "@/api/workflowapi/index";
 
 //引入页面
 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";
 
 const props = defineProps({
-	openDrawer:{
-		type:Boolean,
-		default:true
-	},
-	drawerWidht:{
-		type:Number,
-		default:100
-	},
-	isFormFlow:{
-		type:Boolean,
-		default:true
-	},
-	customerFormKey:{
-		type:String,
-		default:""
-	},
-	customerFormName:{
-		type:String,
-		default:""
-	},
-	flowKey:{
-		type:String,
-		default:""
-	}
-})
-const emits = defineEmits(["update:openDrawer","chanerequest"]);
-const isShow =   computed({
-	get: () => props.openDrawer,
-	set: (val) => {
-		emits("update:openDrawer", val);
-	},
+  openDrawer: {
+    type: Boolean,
+    default: true,
+  },
+  drawerWidht: {
+    type: Number,
+    default: 100,
+  },
+  isFormFlow: {
+    type: Boolean,
+    default: true,
+  },
+  customerFormKey: {
+    type: String,
+    default: "",
+  },
+  customerFormName: {
+    type: String,
+    default: "",
+  },
+  flowKey: {
+    type: String,
+    default: "",
+  },
+});
+const emits = defineEmits(["update:openDrawer", "chanerequest"]);
+const isShow = computed({
+  get: () => props.openDrawer,
+  set: (val) => {
+    emits("update:openDrawer", val);
+  },
 });
 
-let { setTableId, setIsTried } = useStore()
+let { setTableId, setIsTried } = useStore();
 
 let tipList = ref<any>([]);
 let tipVisible = ref(false);
-let nowVal = ref(100);	//缩放比例
+let nowVal = ref(100); //缩放比例
 let processConfig = ref<any>({});
 let nodeConfig = ref({});
 let workFlowDef = ref({});
 let flowPermission = ref([]);
 let directorMaxLeveling = ref<number>(0);
-const shenPiTitle = ref<string>("")
-const activeTabs = ref<string>("");			//当前版本
+const shenPiTitle = ref<string>("");
+const activeTabs = ref<string>(""); //当前版本
 
 const versionList = reactive<flowversion[]>([]); //工作流版本列表
 const enableFlow = ref<any>();
-const isRead = ref(false)
+const isRead = ref(false);
 const enableVersion = ref<string>("1");
 //获取工作流版本列表
-const getFlowVerList = ()=>{
-	gainFlowVersionList({id:props.customerFormKey.toString()})
-		.then(({data})=>{
-			// console.log("获取工作流版本列表-->",data)
-			// versionList = data;
-			versionList.splice(0,versionList.length)
-			if(data){
-				if(data.length>0){
-
-					data.forEach((item:any)=>{
+const getFlowVerList = () => {
+  gainFlowVersionList({ id: props.customerFormKey.toString() })
+    .then(({ data }) => {
+      // console.log("获取工作流版本列表-->",data)
+      // versionList = data;
+      versionList.splice(0, versionList.length);
+      if (data) {
+        if (data.length > 0) {
+          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){
-							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
-						})
-					})
-
-					isRead.value = true
-				}else{
-					isRead.value = false
-
-				}
-			}
-			// 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();
-			
-		})
-}
+          isRead.value = true;
+        } else {
+          isRead.value = false;
+        }
+      }
+      // 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 ()=>{
-	// getFlowVerList()
-})
+onMounted(async () => {
+  // getFlowVerList()
+});
 //初始化工作流数据
-const initWorkFlowData = async() => {
-	let { data } = await initializeWorkFlow({name:props.customerFormName})
-	// console.log("data-=------>",data)
-	processConfig.value = data;
-	let {
-		nodeConfig:nodes,
-		flowPermission:flowPermissiones,
-		directorMaxLevel:levels,
-		workFlowDef:workName,
-		tableId,
-	} = data;
-	processConfig.value.workFlowDef.formKey = props.customerFormKey
-	nodeConfig.value = nodes;
-	flowPermission.value = flowPermissiones;
-	directorMaxLeveling = levels;
-	workFlowDef.value = workName;
-	setTableId(tableId);
-	// console.log("max--1->",data)
-	// console.log("max--6->",tableId)
-	// console.log("max--2->",flowPermission)
-	// console.log("max--3->",nodeConfig)
-	// console.log("max--4->",directorMaxLevel)
-	// console.log("max--5->",processConfig)
-}
+const initWorkFlowData = async () => {
+  let { data } = await initializeWorkFlow({ name: props.customerFormName });
+  console.log("data-=------>", data);
+  processConfig.value = data;
+  let {
+    nodeConfig: nodes,
+    flowPermission: flowPermissiones,
+    directorMaxLevel: levels,
+    workFlowDef: workName,
+    tableId,
+  } = data;
+  processConfig.value.workFlowDef.formKey = props.customerFormKey;
+  nodeConfig.value = nodes;
+  flowPermission.value = flowPermissiones;
+  directorMaxLeveling = levels;
+  workFlowDef.value = workName;
+  setTableId(tableId);
+  // console.log("max--1->",data)
+  // console.log("max--6->",tableId)
+  // console.log("max--2->",flowPermission)
+  // console.log("max--3->",nodeConfig)
+  // console.log("max--4->",directorMaxLevel)
+  // console.log("max--5->",processConfig)
+};
 //错误提示
-const reErr = ({ childNode }:any) => {
-	if (childNode) {
-		let { type, error, nodeName, conditionNodes } = childNode;
-		if (type == 1 || type == 2 || type == 3) {
-		if (error) {
-			tipList.value.push({
-			name: nodeName,
-			type: ["", "审核人", "抄送人", "执行人"][type],
-			});
-		}
-		reErr(childNode);
-		} else if (type == 4) {
-		reErr(childNode);
-		} else if (type == 5) {
-		reErr(childNode);
-		for (var i = 0; i < conditionNodes.length; i++) {
-			if (conditionNodes[i].error) {
-			tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
-			}
-			reErr(conditionNodes[i]);
-		}
-		}
-	} else {
-		childNode = null;
-	}
+const reErr = ({ childNode }: any) => {
+  if (childNode) {
+    let { type, error, nodeName, conditionNodes } = childNode;
+    if (type == 1 || type == 2 || type == 3) {
+      if (error) {
+        tipList.value.push({
+          name: nodeName,
+          type: ["", "审核人", "抄送人", "执行人"][type],
+        });
+      }
+      reErr(childNode);
+    } else if (type == 4) {
+      reErr(childNode);
+    } else if (type == 5) {
+      reErr(childNode);
+      for (var i = 0; i < conditionNodes.length; i++) {
+        if (conditionNodes[i].error) {
+          tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
+        }
+        reErr(conditionNodes[i]);
+      }
+    }
+  } else {
+    childNode = null;
+  }
 };
 //保存
 const saveSet = async () => {
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",processConfig.value);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("nodeConfig",nodeConfig.value);
-	saveFlowCont(processConfig.value)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				emits("update:openDrawer", false);
-				clearCanvas(1);
-			}
-		})
-		.finally(()=>{
-			emits("chanerequest");
-			
-		})
-	// let res = await setWorkFlowData(processConfig.value);
-	// if (res.code == 200) {
-	// 	ElMessage.success("设置成功")
-	// 	setTimeout(function () {
-	// 		window.location.href = "";
-	// 	}, 200);
-	// }
-	
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  console.log("processConfig", processConfig.value);
+  // console.log("flowPermission",flowPermission.value);
+  //   console.log("nodeConfig", nodeConfig.value);
+  saveFlowCont(processConfig.value)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        emits("update:openDrawer", false);
+        clearCanvas(1);
+      }
+    })
+    .finally(() => {
+      emits("chanerequest");
+    });
+  // let res = await setWorkFlowData(processConfig.value);
+  // if (res.code == 200) {
+  // 	ElMessage.success("设置成功")
+  // 	setTimeout(function () {
+  // 		window.location.href = "";
+  // 	}, 200);
+  // }
 };
 //缩放画布
-const zoomSize = (type:number) => {
+const zoomSize = (type: number) => {
   if (type == 1) {
     if (nowVal.value == 50) {
       return;
@@ -223,267 +225,301 @@ const zoomSize = (type:number) => {
   }
 };
 //清空画布
-const clearCanvas = (isOk?:any) =>{
-	if(isOk==1){
-		initWorkFlowData()
-		setIsTried(false);
-		tipList.value = []
-	}else{
-		ElMessageBox.confirm('确定要清空画布?')
-		.then(() => {
-			initWorkFlowData()
-			setIsTried(false);
-			tipList.value = []
-		})
-	}
-	
-	enableFlow.value = ""
-}
-watch(()=>props.openDrawer,(val)=>{
-	// console.log("1111",props.customerFormKey,val)
-	if(val){
-		if(props.customerFormKey != ""){
-			getFlowVerList()
-		}else{
-			initWorkFlowData()
-		}
-		
-		
-		shenPiTitle.value = props.customerFormName
-	}else{
-		setIsTried(false);
-		tipList.value = []
-		enableFlow.value = ""
-		isRead.value=false
-	}
-})
+const clearCanvas = (isOk?: any) => {
+  if (isOk == 1) {
+    initWorkFlowData();
+    setIsTried(false);
+    tipList.value = [];
+  } else {
+    ElMessageBox.confirm("确定要清空画布?").then(() => {
+      initWorkFlowData();
+      setIsTried(false);
+      tipList.value = [];
+    });
+  }
+
+  enableFlow.value = "";
+};
+watch(
+  () => props.openDrawer,
+  (val) => {
+    // console.log("1111",props.customerFormKey,val)
+    if (val) {
+      if (props.customerFormKey != "") {
+        getFlowVerList();
+      } else {
+        initWorkFlowData();
+      }
+
+      shenPiTitle.value = props.customerFormName;
+    } else {
+      setIsTried(false);
+      tipList.value = [];
+      enableFlow.value = "";
+      isRead.value = false;
+    }
+  }
+);
 
 //选择工作流版本
-const clickFormTable = (val:any) =>{
-	// console.log("切换表单",val,activeTabs.value)
-	enableVersion.value = val
-	gainFlowCont();
-	clickOpenOrClose();
-	// getTableFieldList(versionIndex.value,val)
-}
+const clickFormTable = (val: any) => {
+  // console.log("切换表单",val,activeTabs.value)
+  enableVersion.value = val;
+  gainFlowCont();
+  clickOpenOrClose();
+  // getTableFieldList(versionIndex.value,val)
+};
 //编辑
-const saveEdit =()=>{
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",flowPermission);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("activeTabs",enableFlow.value);
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		flowinfo:processConfig.value
-	}
-	editFlowCont(sendCont)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				emits("update:openDrawer", false);
-				clearCanvas(1);
-			}
-		})
-		.finally(()=>{
-			emits("chanerequest");
-			
-		})
-}
+const saveEdit = () => {
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  console.log("processConfig", processConfig.value);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("activeTabs",enableFlow.value);
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    flowinfo: processConfig.value,
+  };
+  editFlowCont(sendCont)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        emits("update:openDrawer", false);
+        clearCanvas(1);
+      }
+    })
+    .finally(() => {
+      emits("chanerequest");
+    });
+};
 //另存为新版
 const saveNew = () => {
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",flowPermission);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("activeTabs",enableFlow.value);
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		flowinfo:processConfig.value
-	}
-	saveNewFlow(sendCont)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				emits("update:openDrawer", false);
-				clearCanvas(1);
-			}
-		})
-		.finally(()=>{
-			emits("chanerequest");
-			
-		})
-}
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  // console.log("processConfig",flowPermission);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("activeTabs",enableFlow.value);
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    flowinfo: processConfig.value,
+  };
+  saveNewFlow(sendCont)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        emits("update:openDrawer", false);
+        clearCanvas(1);
+      }
+    })
+    .finally(() => {
+      emits("chanerequest");
+    });
+};
 //获取流程内容
-const gainFlowCont = () =>{
-	gainFlowInfo({id:enableVersion.value.toString()})
-		.then((data:any)=>{
-						// console.log("获取工作流版本列表-1->",data,enableFlow.value)
-			if(data.code == 0){
-				processConfig.value = data.data;
-				processConfig.value.workFlowDef.formKey = props.customerFormKey
-				nodeConfig.value = data.data.nodeConfig;
-				flowPermission.value = data.data.flowPermission;
-				directorMaxLeveling = data.data.directorMaxLevel;
-				workFlowDef.value = data.data.workFlowDef;
-				setTableId(data.data.tableId);
-				// console.log("max--1->",data)
-				// console.log("max--6->",data.data.tableId)
-				// console.log("max--2->",data.data.flowPermission)
-				// console.log("max--3->",nodeConfig)
-				// console.log("max--4->",data.data.directorMaxLevel)
-				// console.log("max--5->",processConfig.value)
-			}else{
-				clearCanvas(1);
-			}
-			// initWorkFlowData();
-		})
-}
+const gainFlowCont = () => {
+  gainFlowInfo({ id: enableVersion.value.toString() }).then((data: any) => {
+    console.log("获取工作流版本列表-1->", data, enableFlow.value);
+    if (data.code == 0) {
+      processConfig.value = data.data;
+      processConfig.value.workFlowDef.formKey = props.customerFormKey;
+      nodeConfig.value = data.data.nodeConfig;
+      flowPermission.value = data.data.flowPermission;
+      directorMaxLeveling = data.data.directorMaxLevel;
+      workFlowDef.value = data.data.workFlowDef;
+      setTableId(data.data.tableId);
+      // console.log("max--1->",data)
+      // console.log("max--6->",data.data.tableId)
+      // console.log("max--2->",data.data.flowPermission)
+      // console.log("max--3->",nodeConfig)
+      // console.log("max--4->",data.data.directorMaxLevel)
+      // console.log("max--5->",processConfig.value)
+    } else {
+      clearCanvas(1);
+    }
+    // initWorkFlowData();
+  });
+};
 //启用禁用
-const setupState = (val:number) =>{
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		status:val
-	}
-	switchFlowVersion(sendCont)
-		.then((data:any)=>{
-			ElMessage.success(data.msg);
-			// activeTabs.value = enableVersion.value
-			// enableFlow.value.id = enableVersion.value
-			if(versionList.length > 0){
-				versionList.forEach(item=>{
-					if(item.id == enableVersion.value){
-						enableFlow.value = item
-					}
-				})
-			}
-			
-		})
-		.finally(()=>{
-			clickOpenOrClose();
-		})
-	// console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs)
-}
-const openOfClise = ref(false)
+const setupState = (val: number) => {
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    status: val,
+  };
+  switchFlowVersion(sendCont)
+    .then((data: any) => {
+      ElMessage.success(data.msg);
+      // activeTabs.value = enableVersion.value
+      // enableFlow.value.id = enableVersion.value
+      if (versionList.length > 0) {
+        versionList.forEach((item) => {
+          if (item.id == enableVersion.value) {
+            enableFlow.value = item;
+          }
+        });
+      }
+    })
+    .finally(() => {
+      clickOpenOrClose();
+    });
+  // console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs)
+};
+const openOfClise = ref(false);
 const clickOpenOrClose = () => {
-	if(enableFlow.value.id==activeTabs.value){
-		openOfClise.value = true
-	}else{
-		openOfClise.value = false
-	}
-	// console.log("openOfClise",openOfClise.value)
-	// console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
-}
+  if (enableFlow.value.id == activeTabs.value) {
+    openOfClise.value = true;
+  } else {
+    openOfClise.value = false;
+  }
+  // console.log("openOfClise",openOfClise.value)
+  // console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
+};
 </script>
 <template>
-	<el-drawer v-model="isShow" :size="props.drawerWidht" :show-close="false">
-			<template #header="{ close, titleId, titleClass }">
-				<div style="display: flex; width:50%">
-					<div class="right_kongx"><h4 :id="titleId" :class="titleClass">《{{ shenPiTitle }}》审批流程</h4></div>
-					
-				</div>
-				<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-icon class="el-icon--left"><Promotion /></el-icon>
-					发布
-				</el-button>
-				<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-icon class="el-icon--left"><Share /></el-icon>
-					另存为新版
-				</el-button>
-				<el-button type="danger" @click="close">
-					<el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
-					关闭
-				</el-button>
-			</template>
-			
-			<div class="canvas_body">
-				<el-row v-if="isRead" :gutter="20">
-					<el-col :span="22">
-						<el-tabs v-model="activeTabs" class="flow_version" @tab-change="clickFormTable">
-							<el-tab-pane v-for="item in versionList" :key="item.id" :label="item.version" :name="item.id">
-								<template #label>
-									<span class="custom-tabs-label">
-										<span>V{{ item.version }}</span>
-									</span>
-								</template>
-							</el-tab-pane>
-						</el-tabs>
-					</el-col>
-					<el-col :span="1" style="text-align: center; display: flex; margin: auto;">
-						<el-button v-if="openOfClise" type="danger" size="small" round @click="setupState(2)">禁用</el-button>
-						<el-button v-if="!openOfClise" type="success" size="small" round @click="setupState(1)">启用</el-button>
-					</el-col>
-				</el-row>
-				<div class="fd-nav-content-new">
-					<!--画板-->
-					<section class="dingflow-design">		
-						<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>
+  <el-drawer v-model="isShow" :size="props.drawerWidht" :show-close="false">
+    <template #header="{ close, titleId, titleClass }">
+      <div style="display: flex; width: 50%">
+        <div class="right_kongx">
+          <h4 :id="titleId" :class="titleClass">《{{ shenPiTitle }}》审批流程</h4>
+        </div>
+      </div>
+      <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-icon class="el-icon--left"><Promotion /></el-icon>
+        发布
+      </el-button>
+      <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-icon class="el-icon--left"><Share /></el-icon>
+        另存为新版
+      </el-button>
+      <el-button type="danger" @click="close">
+        <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
+        关闭
+      </el-button>
+    </template>
+
+    <div class="canvas_body">
+      <el-row v-if="isRead" :gutter="20">
+        <el-col :span="22">
+          <el-tabs v-model="activeTabs" class="flow_version" @tab-change="clickFormTable">
+            <el-tab-pane
+              v-for="item in versionList"
+              :key="item.id"
+              :label="item.version"
+              :name="item.id"
+            >
+              <template #label>
+                <span class="custom-tabs-label">
+                  <span>V{{ item.version }}</span>
+                </span>
+              </template>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+        <el-col :span="1" style="text-align: center; display: flex; margin: auto">
+          <el-button
+            v-if="openOfClise"
+            type="danger"
+            size="small"
+            round
+            @click="setupState(2)"
+            >禁用</el-button
+          >
+          <el-button
+            v-if="!openOfClise"
+            type="success"
+            size="small"
+            round
+            @click="setupState(1)"
+            >启用</el-button
+          >
+        </el-col>
+      </el-row>
+      <div class="fd-nav-content-new">
+        <!--画板-->
+        <section class="dingflow-design">
+          <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>
 <style>
-.canvas_body{
-	height: 100%;
-    width: inherit;
+.canvas_body {
+  height: 100%;
+  width: inherit;
 }
-.flow_version{
-	
+.flow_version {
 }
-.flow_version > .el-tabs__content{
-    padding: 0px;
-	height:0px;
+.flow_version > .el-tabs__content {
+  padding: 0px;
+  height: 0px;
 }
-.flow_version > .el-tabs__header{
-	margin:0px;
+.flow_version > .el-tabs__header {
+  margin: 0px;
 }
 .flow_version .custom-tabs-label span {
-  padding:0 10px;
+  padding: 0 10px;
 }
 
-.right_kongx{
-	margin-right:50px
-	
+.right_kongx {
+  margin-right: 50px;
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
index 7f91ff1..a2eb922 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue
@@ -3,658 +3,692 @@
 @ 时间: 2024-05-07 15:07:51
 @ 备注: 表单流程
 -->
-<script lang='ts' setup>
-import '@/styles/workflowcss/workflow.scss'
-import { useStore } from '@/store/workflow/index' 
-import { flowversion } from '@/api/workflowapi/types'
-import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList,saveFlowCont,gainFlowInfo,editFlowCont,saveNewFlow,switchFlowVersion,judgeFormFlowIsOpen,openFormFlow } from '@/api/workflowapi/index'
-import FlowImgSrc from '@/assets/images/3.png'
+<script lang="ts" setup>
+import "@/styles/workflowcss/workflow.scss";
+import { useStore } from "@/store/workflow/index";
+import { flowversion } from "@/api/workflowapi/types";
+import {
+  initializeWorkFlow,
+  setWorkFlowData,
+  gainFlowVersionList,
+  saveFlowCont,
+  gainFlowInfo,
+  editFlowCont,
+  saveNewFlow,
+  switchFlowVersion,
+  judgeFormFlowIsOpen,
+  openFormFlow,
+} from "@/api/workflowapi/index";
+import FlowImgSrc from "@/assets/images/3.png";
 const props = defineProps({
-	appCont:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	formKey:{
-		type:String,
-		default:""
-	},
-	groupKey:{
-		type:String,
-		default:""
-	},
-	menuId:{
-		type:String,
-		default:""
-	},
-	appPageKey:{
-		type:String,
-		default:""
-	},
-	formVersion:{
-		type:String,
-		default:""
-	},
-	state:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  appCont: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  formKey: {
+    type: String,
+    default: "",
+  },
+  groupKey: {
+    type: String,
+    default: "",
+  },
+  menuId: {
+    type: String,
+    default: "",
+  },
+  appPageKey: {
+    type: String,
+    default: "",
+  },
+  formVersion: {
+    type: String,
+    default: "",
+  },
+  state: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
 const emits = defineEmits<{
-    (e: 'update:state', val: formStruct): void
-	(e: 'update:formKey', val: string): void
-	(e: 'update:appPageKey', val: string): void
-	// (e: 'judgeFlowIsEdit', val: boolean): void
-	// (e: 'runNextWindows', val: number): void
-	// (e: 'closeFormPage'): void
-}>()
-const state =  computed({
-	get() {
-		return props.state
-	},
-	set(val: formStruct) {
-		emits('update:state', val)
-	}
+  (e: "update:state", val: formStruct): void;
+  (e: "update:formKey", val: string): void;
+  (e: "update:appPageKey", val: string): void;
+  // (e: 'judgeFlowIsEdit', val: boolean): void
+  // (e: 'runNextWindows', val: number): void
+  // (e: 'closeFormPage'): void
+}>();
+const state = computed({
+  get() {
+    return props.state;
+  },
+  set(val: formStruct) {
+    emits("update:state", val);
+  },
 });
-const appPageKey =  computed({
-	get() {
-		return props.appPageKey
-	},
-	set(val: formStruct) {
-		emits('update:appPageKey', val)
-	}
+const appPageKey = computed({
+  get() {
+    return props.appPageKey;
+  },
+  set(val: formStruct) {
+    emits("update:appPageKey", val);
+  },
 });
-let { setTableId, setIsTried } = useStore()
-const openOfClise = ref(false)  //当前版本状态
-const flowIsTrue = ref(false) 			//判断流程是否使用
-const isRead = ref(false)      //判断操作功能按钮
-const activeTabs = ref<string>("");			//当前工作流版本
+let { setTableId, setIsTried } = useStore();
+const openOfClise = ref(false); //当前版本状态
+const flowIsTrue = ref(false); //判断流程是否使用
+const isRead = ref(false); //判断操作功能按钮
+const activeTabs = ref<string>(""); //当前工作流版本
 const versionList = reactive<flowversion[]>([]); //工作流版本列表
-const nowVal = ref(100);	//缩放比例
-let nodeConfig = ref<any>({}); 	//节点配置
+const nowVal = ref(100); //缩放比例
+let nodeConfig = ref<any>({}); //节点配置
 let flowPermission = ref([]); //工作流权限
-const enableVersion = ref<string>("1");    //流程版本
+const enableVersion = ref<string>("1"); //流程版本
 const enableFlow = ref<any>();
-let tipList = ref<any>([]);		//信息提示
-let processConfig = ref<any>({});	//工作流信息
-let directorMaxLeveling = ref<number>(0);	//主管深度（层级）
-let workFlowDef = ref({});			//流程名称
+let tipList = ref<any>([]); //信息提示
+let processConfig = ref<any>({}); //工作流信息
+let directorMaxLeveling = ref<number>(0); //主管深度（层级）
+let workFlowDef = ref({}); //流程名称
 let tipVisible = ref(false);
-const closeOrOpenVersion = ref(false);  //判断是否显示版本启用与关闭
+const closeOrOpenVersion = ref(false); //判断是否显示版本启用与关闭
 let oneIsTrue = true;
 //缩放画布
-const zoomSize = (type:number) => {
-	if (type == 1) {
-		if (nowVal.value == 50) {
-		return;
-		}
-		nowVal.value -= 10;
-	} else {
-		if (nowVal.value == 300) {
-		return;
-		}
-		nowVal.value += 10;
-	}
+const zoomSize = (type: number) => {
+  if (type == 1) {
+    if (nowVal.value == 50) {
+      return;
+    }
+    nowVal.value -= 10;
+  } else {
+    if (nowVal.value == 300) {
+      return;
+    }
+    nowVal.value += 10;
+  }
 };
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-11 16:33:49
 @ 功能: 开启流程
 */
-const createFormFlow = () =>{
-	if(appPageKey.value == ""){
-		flowIsTrue.value = false;
-		ElMessageBox.alert('您还未设置表单！请先设置完表单后，在创建流程！','温馨提示！',{
-			confirmButtonText: '确定',
-			callback: (action: Action) => {
-				// emits("runNextWindows",1);
-			},
-		})
-	}else{
-		openOrCloseFormFlow(1)
-		flowIsTrue.value = true
-		getFlowVerList()
-	}
+const createFormFlow = () => {
+  if (appPageKey.value == "") {
+    flowIsTrue.value = false;
+    ElMessageBox.alert("您还未设置表单！请先设置完表单后，在创建流程！", "温馨提示！", {
+      confirmButtonText: "确定",
+      callback: (action: Action) => {
+        // emits("runNextWindows",1);
+      },
+    });
+  } else {
+    openOrCloseFormFlow(1);
+    flowIsTrue.value = true;
+    getFlowVerList();
+  }
 
-	// flowIsTrue.value = true
-}
+  // flowIsTrue.value = true
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 11:29:46
 @ 功能: 获取工作流版本列表
 */
-const getFlowVerList = ()=>{
-	gainFlowVersionList({id:appPageKey.value.toString()})
-		.then(({data})=>{
-			// console.log("获取工作流版本列表-->",data)
-			// versionList = data;
-			versionList.splice(0,versionList.length)
-			if(data){
-				if(data.length>0){
-
-					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(versionList.length > 1){
-						closeOrOpenVersion.value = true
-					}else{
-						closeOrOpenVersion.value = false
-					}
-					
-					// console.log("获取工作流版本列表--1-1-->",enableFlow.value);
-					if(enableFlow.value == "" || enableFlow.value == undefined){
-						enableFlow.value = versionList[0]
-						// activeTabs.value = versionList[0].id
-						enableVersion.value = versionList[0].id
-					}
-					isRead.value = true
-				}else{
-					isRead.value = false
+const getFlowVerList = () => {
+  gainFlowVersionList({ id: appPageKey.value.toString() })
+    .then(({ data }) => {
+      // console.log("获取工作流版本列表-->",data)
+      // versionList = data;
+      versionList.splice(0, versionList.length);
+      if (data) {
+        if (data.length > 0) {
+          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 (versionList.length > 1) {
+            closeOrOpenVersion.value = true;
+          } else {
+            closeOrOpenVersion.value = false;
+          }
 
-				}
-			}
-			// console.log("获取工作流版本列表---4-->",isRead.value);
-			// console.log("获取工作流版本列表---1-->",activeTabs.value);
-			// console.log("获取工作流版本列表---2-->",enableFlow.value);
-			// console.log("获取工作流版本列表---3-->",enableVersion.value);
-			// console.log("获取工作流版本列表---3-1->",versionList[0],versionList);
-		})
-		.finally(()=>{
-			
-			if(isRead.value == true){
-				gainFlowCont();
-			}else{
-				clearCanvas(1);
-			}
-			clickOpenOrClose();
-			
-		})
-}
+          // console.log("获取工作流版本列表--1-1-->",enableFlow.value);
+          if (enableFlow.value == "" || enableFlow.value == undefined) {
+            enableFlow.value = versionList[0];
+            // activeTabs.value = versionList[0].id
+            enableVersion.value = versionList[0].id;
+          }
+          isRead.value = true;
+        } else {
+          isRead.value = false;
+        }
+      }
+      // console.log("获取工作流版本列表---4-->",isRead.value);
+      // console.log("获取工作流版本列表---1-->",activeTabs.value);
+      // console.log("获取工作流版本列表---2-->",enableFlow.value);
+      // console.log("获取工作流版本列表---3-->",enableVersion.value);
+      // console.log("获取工作流版本列表---3-1->",versionList[0],versionList);
+    })
+    .finally(() => {
+      if (isRead.value == true) {
+        gainFlowCont();
+      } else {
+        clearCanvas(1);
+      }
+      clickOpenOrClose();
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 11:40:34
 @ 功能: 判断当前工作流版本是否启用
 */
 const clickOpenOrClose = () => {
-	// console.log("判断当前工作流版本是否启用",enableFlow,activeTabs.value)
-	if(enableFlow.value.id==activeTabs.value){
-		openOfClise.value = true
-	}else{
-		openOfClise.value = false
-	}
-	// console.log("openOfClise",openOfClise.value)
-	// console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
-}
+  // console.log("判断当前工作流版本是否启用",enableFlow,activeTabs.value)
+  if (enableFlow.value.id == activeTabs.value) {
+    openOfClise.value = true;
+  } else {
+    openOfClise.value = false;
+  }
+  // console.log("openOfClise",openOfClise.value)
+  // console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 11:37:19
 @ 功能: 清空画布
 */
-const clearCanvas = (isOk?:any) =>{
-	if(isOk==1){
-		initWorkFlowData()
-		setIsTried(false);
-		tipList.value = []
-	}else{
-		ElMessageBox.confirm('确定要清空画布?')
-		.then(() => {
-			initWorkFlowData()
-			setIsTried(false);
-			tipList.value = []
-		})
-	}
-	
-	enableFlow.value = ""
-}
+const clearCanvas = (isOk?: any) => {
+  if (isOk == 1) {
+    initWorkFlowData();
+    setIsTried(false);
+    tipList.value = [];
+  } else {
+    ElMessageBox.confirm("确定要清空画布?").then(() => {
+      initWorkFlowData();
+      setIsTried(false);
+      tipList.value = [];
+    });
+  }
+
+  enableFlow.value = "";
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 11:37:46
 @ 功能: 初始化工作流数据
 */
-const initWorkFlowData = async() => {
-	let { data } = await initializeWorkFlow({name:state.value.formData.form.formName})
-	console.log("data-=------>",data)
-	processConfig.value = data;
-	let {
-		nodeConfig:nodes,
-		flowPermission:flowPermissiones,
-		directorMaxLevel:levels,
-		workFlowDef:workName,
-		tableId,
-	} = data;
-	processConfig.value.workFlowDef.formKey = appPageKey.value
-	nodeConfig.value = nodes;
-	flowPermission.value = flowPermissiones;
-	directorMaxLeveling = levels;
-	workFlowDef.value = workName;
+const initWorkFlowData = async () => {
+  let { data } = await initializeWorkFlow({ name: state.value.formData.form.formName });
+  console.log("data-=------>", data);
+  processConfig.value = data;
+  let {
+    nodeConfig: nodes,
+    flowPermission: flowPermissiones,
+    directorMaxLevel: levels,
+    workFlowDef: workName,
+    tableId,
+  } = data;
+  processConfig.value.workFlowDef.formKey = appPageKey.value;
+  nodeConfig.value = nodes;
+  flowPermission.value = flowPermissiones;
+  directorMaxLeveling = levels;
+  workFlowDef.value = workName;
 
-	setTableId(tableId);
-	// console.log("max--1->",data)
-	// console.log("max--6->",tableId)
-	// console.log("max--2->",flowPermission)
-	// console.log("max--3->",nodeConfig)
-	// console.log("max--4->",directorMaxLevel)
-	// console.log("max--5->",processConfig)
-}
+  setTableId(tableId);
+  // console.log("max--1->",data)
+  // console.log("max--6->",tableId)
+  // console.log("max--2->",flowPermission)
+  // console.log("max--3->",nodeConfig)
+  // console.log("max--4->",directorMaxLevel)
+  // console.log("max--5->",processConfig)
+};
 //缩放画布
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 11:26:41
 @ 功能: 编辑表单流程状态
 */
-const openOrCloseFormFlow = (val:number) => {
-	openFormFlow({id:appPageKey.value.toString(),status:val})
-}
+const openOrCloseFormFlow = (val: number) => {
+  openFormFlow({ id: appPageKey.value.toString(), status: val });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 10:10:46
 @ 功能: 组件加载完毕执行数据初始化
 */
-onMounted(()=>{
-	// console.log("判断是否已经存在工作流以及是否开启",appPageKey.value)
-	if(appPageKey.value == ""){
-		flowIsTrue.value = false;
-	}else{
-		judgeFormFlowIsOpen({id:appPageKey.value.toString()})
-			.then((data)=>{
-				// console.log("判断是否已经存在工作流以及是否开启",data)
-				if(data.data.isOpen == 1){
-					flowIsTrue.value = true;
-					// emits('judgeFlowIsEdit', false)
-					getFlowVerList()
-				}else{
-					flowIsTrue.value = false;
-					// emits('judgeFlowIsEdit', false)
-				}
-			})
-	}
-})
+onMounted(() => {
+  // console.log("判断是否已经存在工作流以及是否开启",appPageKey.value)
+  if (appPageKey.value == "") {
+    flowIsTrue.value = false;
+  } else {
+    judgeFormFlowIsOpen({ id: appPageKey.value.toString() }).then((data) => {
+      // console.log("判断是否已经存在工作流以及是否开启",data)
+      if (data.data.isOpen == 1) {
+        flowIsTrue.value = true;
+        // emits('judgeFlowIsEdit', false)
+        getFlowVerList();
+      } else {
+        flowIsTrue.value = false;
+        // emits('judgeFlowIsEdit', false)
+      }
+    });
+  }
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 13:57:13
 @ 功能: 流程版本启用禁用
 */
-const setupState = (val:number) =>{
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		status:val
-	}
-	if(val == 1){
-		activeTabs.value = enableVersion.value
-	}
-	// console.log("流程版本启用禁用",sendCont)
-	switchFlowVersion(sendCont)
-		.then((data:any)=>{
-			ElMessage.success(data.msg);
-			// activeTabs.value = enableVersion.value
-			// enableFlow.value.id = enableVersion.value
-			if(versionList.length > 0){
-				versionList.forEach(item=>{
-					if(item.id == enableVersion.value){
-						enableFlow.value = item
-					}
-				})
-			}
-			
-		})
-		.finally(()=>{
-			clickOpenOrClose();
-		})
-}
+const setupState = (val: number) => {
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    status: val,
+  };
+  if (val == 1) {
+    activeTabs.value = enableVersion.value;
+  }
+  // console.log("流程版本启用禁用",sendCont)
+  switchFlowVersion(sendCont)
+    .then((data: any) => {
+      ElMessage.success(data.msg);
+      // activeTabs.value = enableVersion.value
+      // enableFlow.value.id = enableVersion.value
+      if (versionList.length > 0) {
+        versionList.forEach((item) => {
+          if (item.id == enableVersion.value) {
+            enableFlow.value = item;
+          }
+        });
+      }
+    })
+    .finally(() => {
+      clickOpenOrClose();
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 13:59:44
 @ 功能: 发布新流程
 */
 const saveSet = async () => {
-	setIsTried(true);
-	tipList.value = [];
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",processConfig.value);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("nodeConfig",nodeConfig.value);
-	saveFlowCont(processConfig.value)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				// emits('judgeFlowIsEdit', false)
-				// emits("runNextWindows",3);
-				// clearCanvas(1);
-			}
-		})
-		.finally(()=>{
-			// emits("chanerequest");
-			getFlowVerList()
-		})
-}
+  setIsTried(true);
+  tipList.value = [];
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  // console.log("processConfig",processConfig.value);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("nodeConfig",nodeConfig.value);
+  saveFlowCont(processConfig.value)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        // emits('judgeFlowIsEdit', false)
+        // emits("runNextWindows",3);
+        // clearCanvas(1);
+      }
+    })
+    .finally(() => {
+      // emits("chanerequest");
+      getFlowVerList();
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:01:22
 @ 功能: 错误提示
 */
-const reErr = ({ childNode }:any) => {
-	if (childNode) {
-		let { type, error, nodeName, conditionNodes } = childNode;
-		if (type == 1 || type == 2 || type == 3) {
-			if (error) {
-				tipList.value.push({
-					name: nodeName,
-					type: ["", "审核人", "抄送人", "执行人"][type],
-				});
-			}
-			reErr(childNode);
-		} else if (type == 4) {
-			reErr(childNode);
-		} else if (type == 5) {
-			reErr(childNode);
-			for (var i = 0; i < conditionNodes.length; i++) {
-				if (conditionNodes[i].error) {
-					tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
-				}
-				reErr(conditionNodes[i]);
-			}
-		}
-	} else {
-		childNode = null;
-	}
+const reErr = ({ childNode }: any) => {
+  if (childNode) {
+    let { type, error, nodeName, conditionNodes } = childNode;
+    if (type == 1 || type == 2 || type == 3) {
+      if (error) {
+        tipList.value.push({
+          name: nodeName,
+          type: ["", "审核人", "抄送人", "执行人"][type],
+        });
+      }
+      reErr(childNode);
+    } else if (type == 4) {
+      reErr(childNode);
+    } else if (type == 5) {
+      reErr(childNode);
+      for (var i = 0; i < conditionNodes.length; i++) {
+        if (conditionNodes[i].error) {
+          tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
+        }
+        reErr(conditionNodes[i]);
+      }
+    }
+  } else {
+    childNode = null;
+  }
 };
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:11:28
 @ 功能: 获取流程内容
 */
-const gainFlowCont = () =>{
-	gainFlowInfo({id:enableVersion.value.toString()})
-		.then((data:any)=>{
-						// console.log("获取工作流版本列表-1->",data,enableFlow.value)
-			if(data.code == 0){
-				processConfig.value = data.data;
-				processConfig.value.workFlowDef.formKey = appPageKey.value
-				nodeConfig.value = data.data.nodeConfig;
-				flowPermission.value = data.data.flowPermission;
-				directorMaxLeveling = data.data.directorMaxLevel;
-				workFlowDef.value = data.data.workFlowDef;
-				setTableId(data.data.tableId);
-				flowIsTrue.value = true;
-				// console.log("max--1->",data)
-				// console.log("max--6->",data.data.tableId)
-				// console.log("max--2->",data.data.flowPermission)
-				// console.log("max--3->",nodeConfig)
-				// console.log("max--4->",data.data.directorMaxLevel)
-				// console.log("max--5->",processConfig.value)
-			}else{
-				clearCanvas(1);
-			}
-			// initWorkFlowData();
-		})
-}
+const gainFlowCont = () => {
+  gainFlowInfo({ id: enableVersion.value.toString() }).then((data: any) => {
+    // console.log("获取工作流版本列表-1->",data,enableFlow.value)
+    if (data.code == 0) {
+      processConfig.value = data.data;
+      processConfig.value.workFlowDef.formKey = appPageKey.value;
+      nodeConfig.value = data.data.nodeConfig;
+      flowPermission.value = data.data.flowPermission;
+      directorMaxLeveling = data.data.directorMaxLevel;
+      workFlowDef.value = data.data.workFlowDef;
+      setTableId(data.data.tableId);
+      flowIsTrue.value = true;
+      // console.log("max--1->",data)
+      // console.log("max--6->",data.data.tableId)
+      // console.log("max--2->",data.data.flowPermission)
+      // console.log("max--3->",nodeConfig)
+      // console.log("max--4->",data.data.directorMaxLevel)
+      // console.log("max--5->",processConfig.value)
+    } else {
+      clearCanvas(1);
+    }
+    // initWorkFlowData();
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:12:43
 @ 功能: 选择工作流版本
 */
-const clickFormTable = (val:any) =>{
-	// console.log("切换表单",val,activeTabs.value)
-	enableVersion.value = val
-	gainFlowCont();
-	clickOpenOrClose();
-	// getTableFieldList(versionIndex.value,val)
-}
+const clickFormTable = (val: any) => {
+  // console.log("切换表单",val,activeTabs.value)
+  enableVersion.value = val;
+  gainFlowCont();
+  clickOpenOrClose();
+  // getTableFieldList(versionIndex.value,val)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:21:06
 @ 功能: 编辑当前版本流程
 */
-const saveEdit =()=>{
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",flowPermission);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("activeTabs",enableFlow.value);
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		flowinfo:processConfig.value
-	}
-	editFlowCont(sendCont)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				// emits("update:openDrawer", false);
-				// clearCanvas(1);
-				// emits('judgeFlowIsEdit', false)
-				// emits("runNextWindows",3);
-			}
-		})
-		.finally(()=>{
-			// emits("chanerequest");
-			getFlowVerList()
-		})
-}
+const saveEdit = () => {
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  console.log("processConfig----------123--------->", processConfig.value);
+  // console.log("processConfig",flowPermission);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("activeTabs",enableFlow.value);
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    flowinfo: processConfig.value,
+  };
+  editFlowCont(sendCont)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        // emits("update:openDrawer", false);
+        // clearCanvas(1);
+        // emits('judgeFlowIsEdit', false)
+        // emits("runNextWindows",3);
+      }
+    })
+    .finally(() => {
+      // emits("chanerequest");
+      getFlowVerList();
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:34:45
 @ 功能: 另存为新版
 */
 const saveNew = () => {
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",flowPermission);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("activeTabs",enableFlow.value);
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		flowinfo:processConfig.value
-	}
-	saveNewFlow(sendCont)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				// emits('judgeFlowIsEdit', false)
-				// emits("runNextWindows",3);
-			}
-		})
-		.finally(()=>{
-			getFlowVerList()
-		})
-}
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  // console.log("processConfig",flowPermission);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("activeTabs",enableFlow.value);
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    flowinfo: processConfig.value,
+  };
+  saveNewFlow(sendCont)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        // emits('judgeFlowIsEdit', false)
+        // emits("runNextWindows",3);
+      }
+    })
+    .finally(() => {
+      getFlowVerList();
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:35:06
 @ 功能: 监听流程节点变动
 */
-watch(()=>nodeConfig,()=>{
-	// console.log("变动流程")
-	if(oneIsTrue){
-		oneIsTrue = false;
-		// emits('judgeFlowIsEdit', false)
-	}else{
-		// emits('judgeFlowIsEdit', true)
-	}
-	
-},
-{
-    deep: true
-})
+watch(
+  () => nodeConfig,
+  () => {
+    // console.log("变动流程")
+    if (oneIsTrue) {
+      oneIsTrue = false;
+      // emits('judgeFlowIsEdit', false)
+    } else {
+      // emits('judgeFlowIsEdit', true)
+    }
+  },
+  {
+    deep: true,
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-05-21 14:37:22
 @ 功能: 关闭表单流程
 */
 const closwFormFlow = () => {
-	flowIsTrue.value = false;
-	// emits('judgeFlowIsEdit', false)
-	openOrCloseFormFlow(2)
-}
+  flowIsTrue.value = false;
+  // emits('judgeFlowIsEdit', false)
+  openOrCloseFormFlow(2);
+};
 </script>
 <template>
-	<el-main class="mainBox">
-		<div v-if="flowIsTrue" style="height: 100%;">
-		
-			<div  class="flowVersionBox">
-				<div class="tabs_box">
-					<el-tabs v-if="isRead" v-model="activeTabs"  @tab-change="clickFormTable">
-						<el-tab-pane  v-for="item in versionList" :key="item.id" :name="item.id">
-							<template #label>
-								<el-icon><Share /></el-icon>
-								<span class="my-label">V{{item.version}}</span>
-							</template>
-						</el-tab-pane>
-					</el-tabs>
-				</div>
-				<div class="flowButBox">
-					<el-button v-if="isRead && !openOfClise && closeOrOpenVersion" type="success"  size="small" plain  @click="setupState(1)">
-						<el-icon class="el-icon--left"><Delete /></el-icon>
-						启用
-					</el-button>
-					<el-button v-if="isRead && openOfClise && closeOrOpenVersion"  type="warning"  size="small" plain @click="setupState(2)">
-						<el-icon class="el-icon--left"><Delete /></el-icon>
-						禁用
-					</el-button>
-					<el-button   size="small" plain  @click="clearCanvas">
-						<el-icon class="el-icon--left"><Delete /></el-icon>
-						清空
-					</el-button>
-					<el-button v-if="!isRead"   size="small" plain  @click="saveSet">
-						<el-icon class="el-icon--left"><Promotion /></el-icon>
-						发布
-					</el-button>
-					<el-button v-if="isRead"  size="small" plain @click="saveEdit">
-						<el-icon class="fa fa-save" style="margin-right:5px"></el-icon>
-						保存
-					</el-button>
-					<el-button v-if="isRead" type="warning"  size="small"  @click="saveNew">
-						<el-icon class="el-icon--left"><Share /></el-icon>
-						另存为新版
-					</el-button>
-					<el-button type="danger"  size="small" @click="closwFormFlow">
-						<el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
-						关闭流程
-					</el-button>
-				</div>
-			</div>
-			<div >
-				
-				<section class="dingflow-design" style="top:80px">		
-					<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">流程结束5</div>
-						</div>
-					</div>
-				</section>
+  <el-main class="mainBox">
+    <div v-if="flowIsTrue" style="height: 100%">
+      <div class="flowVersionBox">
+        <div class="tabs_box">
+          <el-tabs v-if="isRead" v-model="activeTabs" @tab-change="clickFormTable">
+            <el-tab-pane v-for="item in versionList" :key="item.id" :name="item.id">
+              <template #label>
+                <el-icon><Share /></el-icon>
+                <span class="my-label">V{{ item.version }}</span>
+              </template>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+        <div class="flowButBox">
+          <el-button
+            v-if="isRead && !openOfClise && closeOrOpenVersion"
+            type="success"
+            size="small"
+            plain
+            @click="setupState(1)"
+          >
+            <el-icon class="el-icon--left"><Delete /></el-icon>
+            启用
+          </el-button>
+          <el-button
+            v-if="isRead && openOfClise && closeOrOpenVersion"
+            type="warning"
+            size="small"
+            plain
+            @click="setupState(2)"
+          >
+            <el-icon class="el-icon--left"><Delete /></el-icon>
+            禁用
+          </el-button>
+          <el-button size="small" plain @click="clearCanvas">
+            <el-icon class="el-icon--left"><Delete /></el-icon>
+            清空
+          </el-button>
+          <el-button v-if="!isRead" size="small" plain @click="saveSet">
+            <el-icon class="el-icon--left"><Promotion /></el-icon>
+            发布
+          </el-button>
+          <el-button v-if="isRead" size="small" plain @click="saveEdit">
+            <el-icon class="fa fa-save" style="margin-right: 5px"></el-icon>
+            保存
+          </el-button>
+          <el-button v-if="isRead" type="warning" size="small" @click="saveNew">
+            <el-icon class="el-icon--left"><Share /></el-icon>
+            另存为新版
+          </el-button>
+          <el-button type="danger" size="small" @click="closwFormFlow">
+            <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
+            关闭流程
+          </el-button>
+        </div>
+      </div>
+      <div>
+        <section class="dingflow-design" style="top: 80px">
+          <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">流程结束5</div>
+            </div>
+          </div>
+        </section>
 
-				<errorDialog v-model:visible="tipVisible" :list="tipList" />
-				<promoterDrawer v-model:form-data="state.formData" :form-key="appPageKey" :form-version="formVersion" :node-config="nodeConfig" />
-				<approverDrawer :directormaxlevel="directorMaxLeveling" :node-config="nodeConfig"  :is-form-flow="isFormFlow"  :customer-form-key="appPageKey"  v-model:form-data="state.formData"  :form-version="formVersion" />
-				<copyerDrawer />
-				<conditionDrawer  :is-form-flow="isFormFlow"  :customer-form-key="appPageKey" />
-			</div>
-		</div>
-		<div v-else class="flow_work_begin">
-			<el-result title="" sub-title="">
-				<template #icon>
-					流程可实现需要多人流转的业务场景。<br>绘制流程图，设定数据流转方式，即可搭建线上工作流。<br><br>
-					<el-image
-						class="imgBox"
-						:src="FlowImgSrc"
-					/>
-				</template>
-				<template #extra>
-					<el-button type="primary" @click="createFormFlow">开启流程</el-button>
-				</template>
-			</el-result>
-		</div>
-	
-	</el-main>
+        <errorDialog v-model:visible="tipVisible" :list="tipList" />
+        <promoterDrawer
+          v-model:form-data="state.formData"
+          :form-key="appPageKey"
+          :form-version="formVersion"
+          :node-config="nodeConfig"
+        />
+        <approverDrawer
+          :directormaxlevel="directorMaxLeveling"
+          :node-config="nodeConfig"
+          :is-form-flow="isFormFlow"
+          :customer-form-key="appPageKey"
+          v-model:form-data="state.formData"
+          :form-version="formVersion"
+        />
+        <copyerDrawer />
+        <conditionDrawer :is-form-flow="isFormFlow" :customer-form-key="appPageKey" />
+      </div>
+    </div>
+    <div v-else class="flow_work_begin">
+      <el-result title="" sub-title="">
+        <template #icon>
+          流程可实现需要多人流转的业务场景。<br />绘制流程图，设定数据流转方式，即可搭建线上工作流。<br /><br />
+          <el-image class="imgBox" :src="FlowImgSrc" />
+        </template>
+        <template #extra>
+          <el-button type="primary" @click="createFormFlow">开启流程</el-button>
+        </template>
+      </el-result>
+    </div>
+  </el-main>
 </template>
-<style  lang='scss' scoped>
-.mainBox{
-	padding: 0;
-	overflow-y : auto;
-	height: calc(100vh - 40px);
-	background-color: #f5f5f7;
+<style lang="scss" scoped>
+.mainBox {
+  padding: 0;
+  overflow-y: auto;
+  height: calc(100vh - 40px);
+  background-color: #f5f5f7;
 }
-.flow_work_begin{
-	height: calc(100vh - 40px);
-	display: flex;
-	align-items: center;
-  	justify-content: center;
-	background-color: #FFFFFF;
-	.imgBox{
-		height: calc(100vh - 400px);
-		// height: 10%;
-	}
+.flow_work_begin {
+  height: calc(100vh - 40px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #ffffff;
+  .imgBox {
+    height: calc(100vh - 400px);
+    // height: 10%;
+  }
 }
-.flowVersionBox{
-	width: 100%;
-	display: flex;
-	align-items: center;
-  	justify-content: space-between;
-	background-color: #FFFFFF;
-	.flowVerLeft{
-		max-width: 50%;
-		padding-left: 10px;
-		display: flex;
-		align-items: center;
-	}
+.flowVersionBox {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #ffffff;
+  .flowVerLeft {
+    max-width: 50%;
+    padding-left: 10px;
+    display: flex;
+    align-items: center;
+  }
 }
-.tabs_box{
-	max-width: 50%;
-	min-width:30%;
-	::v-deep .el-tabs__nav-wrap::after {
-		position: static !important;
-		/* background-color: #fff; */
-	}
-	::v-deep .el-tabs__item{
-		padding:0 10px;
-	}
-	::v-deep .el-tabs__header{
-		margin:0;
-	}
+.tabs_box {
+  max-width: 50%;
+  min-width: 30%;
+  ::v-deep .el-tabs__nav-wrap::after {
+    position: static !important;
+    /* background-color: #fff; */
+  }
+  ::v-deep .el-tabs__item {
+    padding: 0 10px;
+  }
+  ::v-deep .el-tabs__header {
+    margin: 0;
+  }
 }
-.flowButBox{
-	padding: 7px 0;
+.flowButBox {
+  padding: 7px 0;
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/workFlow.vue b/src/views/sysworkflow/lowcodepage/workFlow.vue
index 2c6bf98..6643a53 100644
--- a/src/views/sysworkflow/lowcodepage/workFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/workFlow.vue
@@ -3,75 +3,86 @@
 @ 时间: 2024-03-11 14:46:00
 @ 备注: 工作流
 -->
-<script lang='ts' setup>
-import '@/styles/workflowcss/workflow.scss'
+<script lang="ts" setup>
+import "@/styles/workflowcss/workflow.scss";
 
-import { useStore } from '@/store/workflow/index' 
-import { flowversion } from '@/api/workflowapi/types'
-import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList,saveFlowCont,gainFlowInfo,editFlowCont,saveNewFlow,switchFlowVersion,judgeFormFlowIsOpen,openFormFlow } from '@/api/workflowapi/index'
+import { useStore } from "@/store/workflow/index";
+import { flowversion } from "@/api/workflowapi/types";
+import {
+  initializeWorkFlow,
+  setWorkFlowData,
+  gainFlowVersionList,
+  saveFlowCont,
+  gainFlowInfo,
+  editFlowCont,
+  saveNewFlow,
+  switchFlowVersion,
+  judgeFormFlowIsOpen,
+  openFormFlow,
+} from "@/api/workflowapi/index";
 
-import FlowImgSrc from '@/assets/images/3.png'
+import FlowImgSrc from "@/assets/images/3.png";
 
 const props = defineProps({
-	formKey:{
-		type:String,
-		default:""
-	},
-	formVersion:{
-		type:String,
-		default:""
-	},
-	state:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  formKey: {
+    type: String,
+    default: "",
+  },
+  formVersion: {
+    type: String,
+    default: "",
+  },
+  state: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
 
 const emits = defineEmits<{
-    (e: 'update:state', val: formStruct): void
-	(e: 'update:formKey', val: string): void
-	(e: 'update:formVersion', val: string): void
-	(e: 'judgeFlowIsEdit', val: boolean): void
-	(e: 'runNextWindows', val: number): void
-	(e: 'closeFormPage'): void
-}>()
+  (e: "update:state", val: formStruct): void;
+  (e: "update:formKey", val: string): void;
+  (e: "update:formVersion", val: string): void;
+  (e: "judgeFlowIsEdit", val: boolean): void;
+  (e: "runNextWindows", val: number): void;
+  (e: "closeFormPage"): void;
+}>();
 
-const state =  computed({
-	get() {
-		return props.state
-	},
-	set(val: formStruct) {
-		emits('update:state', val)
-	}
+const state = computed({
+  get() {
+    return props.state;
+  },
+  set(val: formStruct) {
+    emits("update:state", val);
+  },
 });
-const formKeyVal =  computed({
-	get() {
-		return props.formKey
-	},
-	set(val: formStruct) {
-		emits('update:formKey', val)
-	}
+const formKeyVal = computed({
+  get() {
+    return props.formKey;
+  },
+  set(val: formStruct) {
+    emits("update:formKey", val);
+  },
 });
-let { setTableId, setIsTried } = useStore()
-const flowIsTrue = ref(false)
-const isRead = ref(false)      //判断操作功能按钮
-const openOfClise = ref(false)  //当前版本状态
+let { setTableId, setIsTried } = useStore();
+const flowIsTrue = ref(false);
+const isRead = ref(false); //判断操作功能按钮
+const openOfClise = ref(false); //当前版本状态
 const versionList = reactive<flowversion[]>([]); //工作流版本列表
-const enableVersion = ref<string>("1");    //流程版本
+const enableVersion = ref<string>("1"); //流程版本
 const enableFlow = ref<any>();
-const activeTabs = ref<string>("");			//当前工作流版本
-const isFormFlow = ref(true);		//兼容
-const closeOrOpenVersion = ref(false);  //判断是否显示版本启用与关闭
+const activeTabs = ref<string>(""); //当前工作流版本
+const isFormFlow = ref(true); //兼容
+const closeOrOpenVersion = ref(false); //判断是否显示版本启用与关闭
 
-let nowVal = ref(100);	//缩放比例
-let nodeConfig = ref<any>({}); 	//节点配置
+let nowVal = ref(100); //缩放比例
+let nodeConfig = ref<any>({}); //节点配置
 let flowPermission = ref([]); //工作流权限
-let processConfig = ref<any>({});	//工作流信息
-let directorMaxLeveling = ref<number>(0);	//主管深度（层级）
-let workFlowDef = ref({});			//流程名称
-let tipList = ref<any>([]);		//信息提示
+let processConfig = ref<any>({}); //工作流信息
+let directorMaxLeveling = ref<number>(0); //主管深度（层级）
+let workFlowDef = ref({}); //流程名称
+let tipList = ref<any>([]); //信息提示
 let tipVisible = ref(false);
 let oneIsTrue = true;
 /**
@@ -79,562 +90,580 @@ let oneIsTrue = true;
 @ 时间: 2024-03-11 16:33:49
 @ 功能: 开启流程
 */
-const createFormFlow = () =>{
-	if(formKeyVal.value == ""){
-		flowIsTrue.value = false;
-		ElMessageBox.alert('您还未设置表单！请先设置完表单后，在创建流程！','温馨提示！',{
-			confirmButtonText: '确定',
-			callback: (action: Action) => {
-				emits("runNextWindows",1);
-			},
-		})
-	}else{
-		openOrCloseFormFlow(1)
-		getFlowVerList()
-		flowIsTrue.value = true
-		emits('judgeFlowIsEdit', true)
-	}
-	emits('judgeFlowIsEdit', true)
-	// flowIsTrue.value = true
-}
-const openOrCloseFormFlow = (val:number) => {
-	openFormFlow({id:formKeyVal.value.toString(),status:val})
-}
+const createFormFlow = () => {
+  if (formKeyVal.value == "") {
+    flowIsTrue.value = false;
+    ElMessageBox.alert("您还未设置表单！请先设置完表单后，在创建流程！", "温馨提示！", {
+      confirmButtonText: "确定",
+      callback: (action: Action) => {
+        emits("runNextWindows", 1);
+      },
+    });
+  } else {
+    openOrCloseFormFlow(1);
+    getFlowVerList();
+    flowIsTrue.value = true;
+    emits("judgeFlowIsEdit", true);
+  }
+  emits("judgeFlowIsEdit", true);
+  // flowIsTrue.value = true
+};
+const openOrCloseFormFlow = (val: number) => {
+  openFormFlow({ id: formKeyVal.value.toString(), status: val });
+};
 //初始化工作流数据
-const initWorkFlowData = async() => {
-	let { data } = await initializeWorkFlow({name:state.value.formData.form.formName})
-	// console.log("data-=------>",data)
-	processConfig.value = data;
-	let {
-		nodeConfig:nodes,
-		flowPermission:flowPermissiones,
-		directorMaxLevel:levels,
-		workFlowDef:workName,
-		tableId,
-	} = data;
-	processConfig.value.workFlowDef.formKey = formKeyVal.value
-	nodeConfig.value = nodes;
-	flowPermission.value = flowPermissiones;
-	directorMaxLeveling = levels;
-	workFlowDef.value = workName;
+const initWorkFlowData = async () => {
+  let { data } = await initializeWorkFlow({ name: state.value.formData.form.formName });
+  // console.log("data-=------>",data)
+  processConfig.value = data;
+  let {
+    nodeConfig: nodes,
+    flowPermission: flowPermissiones,
+    directorMaxLevel: levels,
+    workFlowDef: workName,
+    tableId,
+  } = data;
+  processConfig.value.workFlowDef.formKey = formKeyVal.value;
+  nodeConfig.value = nodes;
+  flowPermission.value = flowPermissiones;
+  directorMaxLeveling = levels;
+  workFlowDef.value = workName;
 
-	setTableId(tableId);
-	// console.log("max--1->",data)
-	// console.log("max--6->",tableId)
-	// console.log("max--2->",flowPermission)
-	// console.log("max--3->",nodeConfig)
-	// console.log("max--4->",directorMaxLevel)
-	// console.log("max--5->",processConfig)
-}
+  setTableId(tableId);
+  // console.log("max--1->",data)
+  // console.log("max--6->",tableId)
+  // console.log("max--2->",flowPermission)
+  // console.log("max--3->",nodeConfig)
+  // console.log("max--4->",directorMaxLevel)
+  // console.log("max--5->",processConfig)
+};
 //缩放画布
-const zoomSize = (type:number) => {
-	if (type == 1) {
-		if (nowVal.value == 50) {
-		return;
-		}
-		nowVal.value -= 10;
-	} else {
-		if (nowVal.value == 300) {
-		return;
-		}
-		nowVal.value += 10;
-	}
+const zoomSize = (type: number) => {
+  if (type == 1) {
+    if (nowVal.value == 50) {
+      return;
+    }
+    nowVal.value -= 10;
+  } else {
+    if (nowVal.value == 300) {
+      return;
+    }
+    nowVal.value += 10;
+  }
 };
 
 //获取工作流版本列表
-const getFlowVerList = ()=>{
-	gainFlowVersionList({id:formKeyVal.value.toString()})
-		.then(({data})=>{
-			// console.log("获取工作流版本列表-->",data)
-			// versionList = data;
-			versionList.splice(0,versionList.length)
-			if(data){
-				if(data.length>0){
-
-					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(versionList.length > 1){
-						closeOrOpenVersion.value = true
-					}else{
-						closeOrOpenVersion.value = false
-					}
-					
-					// console.log("获取工作流版本列表--1-1-->",enableFlow.value);
-					if(enableFlow.value == "" || enableFlow.value == undefined){
-						enableFlow.value = versionList[0]
-						// activeTabs.value = versionList[0].id
-						enableVersion.value = versionList[0].id
-					}
-					isRead.value = true
-				}else{
-					isRead.value = false
+const getFlowVerList = () => {
+  gainFlowVersionList({ id: formKeyVal.value.toString() })
+    .then(({ data }) => {
+      // console.log("获取工作流版本列表-->",data)
+      // versionList = data;
+      versionList.splice(0, versionList.length);
+      if (data) {
+        if (data.length > 0) {
+          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 (versionList.length > 1) {
+            closeOrOpenVersion.value = true;
+          } else {
+            closeOrOpenVersion.value = false;
+          }
 
-				}
-			}
-			// console.log("获取工作流版本列表---1-->",activeTabs.value);
-			// console.log("获取工作流版本列表---2-->",enableFlow.value);
-			// console.log("获取工作流版本列表---3-->",enableVersion.value);
-			// console.log("获取工作流版本列表---3-1->",versionList[0],versionList);
-		})
-		.finally(()=>{
-			if(isRead.value == true){
-				gainFlowCont();
-			}else{
-				clearCanvas(1);
-			}
-			clickOpenOrClose();
-			
-		})
-}
+          // console.log("获取工作流版本列表--1-1-->",enableFlow.value);
+          if (enableFlow.value == "" || enableFlow.value == undefined) {
+            enableFlow.value = versionList[0];
+            // activeTabs.value = versionList[0].id
+            enableVersion.value = versionList[0].id;
+          }
+          isRead.value = true;
+        } else {
+          isRead.value = false;
+        }
+      }
+      // console.log("获取工作流版本列表---1-->",activeTabs.value);
+      // console.log("获取工作流版本列表---2-->",enableFlow.value);
+      // console.log("获取工作流版本列表---3-->",enableVersion.value);
+      // console.log("获取工作流版本列表---3-1->",versionList[0],versionList);
+    })
+    .finally(() => {
+      if (isRead.value == true) {
+        gainFlowCont();
+      } else {
+        clearCanvas(1);
+      }
+      clickOpenOrClose();
+    });
+};
 //判断当前工作流版本是否启用
 const clickOpenOrClose = () => {
-	// console.log("判断当前工作流版本是否启用",enableFlow,activeTabs.value)
-	if(enableFlow.value.id==activeTabs.value){
-		openOfClise.value = true
-	}else{
-		openOfClise.value = false
-	}
-	// console.log("openOfClise",openOfClise.value)
-	// console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
-}
+  // console.log("判断当前工作流版本是否启用",enableFlow,activeTabs.value)
+  if (enableFlow.value.id == activeTabs.value) {
+    openOfClise.value = true;
+  } else {
+    openOfClise.value = false;
+  }
+  // console.log("openOfClise",openOfClise.value)
+  // console.log("enableFlow.version=1=activeTabs",enableFlow.value,activeTabs.value)
+};
 //获取流程内容
-const gainFlowCont = () =>{
-	gainFlowInfo({id:enableVersion.value.toString()})
-		.then((data:any)=>{
-						// console.log("获取工作流版本列表-1->",data,enableFlow.value)
-			if(data.code == 0){
-				processConfig.value = data.data;
-				processConfig.value.workFlowDef.formKey = formKeyVal.value
-				nodeConfig.value = data.data.nodeConfig;
-				flowPermission.value = data.data.flowPermission;
-				directorMaxLeveling = data.data.directorMaxLevel;
-				workFlowDef.value = data.data.workFlowDef;
-				setTableId(data.data.tableId);
-				flowIsTrue.value = true;
-				// console.log("max--1->",data)
-				// console.log("max--6->",data.data.tableId)
-				// console.log("max--2->",data.data.flowPermission)
-				// console.log("max--3->",nodeConfig)
-				// console.log("max--4->",data.data.directorMaxLevel)
-				// console.log("max--5->",processConfig.value)
-			}else{
-				clearCanvas(1);
-			}
-			// initWorkFlowData();
-		})
-}
+const gainFlowCont = () => {
+  gainFlowInfo({ id: enableVersion.value.toString() }).then((data: any) => {
+    // console.log("获取工作流版本列表-1->",data,enableFlow.value)
+    if (data.code == 0) {
+      processConfig.value = data.data;
+      processConfig.value.workFlowDef.formKey = formKeyVal.value;
+      nodeConfig.value = data.data.nodeConfig;
+      flowPermission.value = data.data.flowPermission;
+      directorMaxLeveling = data.data.directorMaxLevel;
+      workFlowDef.value = data.data.workFlowDef;
+      setTableId(data.data.tableId);
+      flowIsTrue.value = true;
+      // console.log("max--1->",data)
+      // console.log("max--6->",data.data.tableId)
+      // console.log("max--2->",data.data.flowPermission)
+      // console.log("max--3->",nodeConfig)
+      // console.log("max--4->",data.data.directorMaxLevel)
+      // console.log("max--5->",processConfig.value)
+    } else {
+      clearCanvas(1);
+    }
+    // initWorkFlowData();
+  });
+};
 //清空画布
-const clearCanvas = (isOk?:any) =>{
-	if(isOk==1){
-		initWorkFlowData()
-		setIsTried(false);
-		tipList.value = []
-	}else{
-		ElMessageBox.confirm('确定要清空画布?')
-		.then(() => {
-			initWorkFlowData()
-			setIsTried(false);
-			tipList.value = []
-		})
-	}
-	
-	enableFlow.value = ""
-}
+const clearCanvas = (isOk?: any) => {
+  if (isOk == 1) {
+    initWorkFlowData();
+    setIsTried(false);
+    tipList.value = [];
+  } else {
+    ElMessageBox.confirm("确定要清空画布?").then(() => {
+      initWorkFlowData();
+      setIsTried(false);
+      tipList.value = [];
+    });
+  }
+
+  enableFlow.value = "";
+};
 //错误提示
-const reErr = ({ childNode }:any) => {
-	if (childNode) {
-		let { type, error, nodeName, conditionNodes } = childNode;
-		if (type == 1 || type == 2 || type == 3) {
-			if (error) {
-				tipList.value.push({
-					name: nodeName,
-					type: ["", "审核人", "抄送人", "执行人"][type],
-				});
-			}
-			reErr(childNode);
-		} else if (type == 4) {
-			reErr(childNode);
-		} else if (type == 5) {
-			reErr(childNode);
-			for (var i = 0; i < conditionNodes.length; i++) {
-				if (conditionNodes[i].error) {
-					tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
-				}
-				reErr(conditionNodes[i]);
-			}
-		}
-	} else {
-		childNode = null;
-	}
+const reErr = ({ childNode }: any) => {
+  if (childNode) {
+    let { type, error, nodeName, conditionNodes } = childNode;
+    if (type == 1 || type == 2 || type == 3) {
+      if (error) {
+        tipList.value.push({
+          name: nodeName,
+          type: ["", "审核人", "抄送人", "执行人"][type],
+        });
+      }
+      reErr(childNode);
+    } else if (type == 4) {
+      reErr(childNode);
+    } else if (type == 5) {
+      reErr(childNode);
+      for (var i = 0; i < conditionNodes.length; i++) {
+        if (conditionNodes[i].error) {
+          tipList.value.push({ name: conditionNodes[i].nodeName, type: "条件" });
+        }
+        reErr(conditionNodes[i]);
+      }
+    }
+  } else {
+    childNode = null;
+  }
 };
 //选择工作流版本
-const clickFormTable = (val:any) =>{
-	// console.log("切换表单",val,activeTabs.value)
-	enableVersion.value = val
-	gainFlowCont();
-	clickOpenOrClose();
-	// getTableFieldList(versionIndex.value,val)
-}
+const clickFormTable = (val: any) => {
+  // console.log("切换表单",val,activeTabs.value)
+  enableVersion.value = val;
+  gainFlowCont();
+  clickOpenOrClose();
+  // getTableFieldList(versionIndex.value,val)
+};
 //流程版本启用禁用
-const setupState = (val:number) =>{
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		status:val
-	}
-	if(val == 1){
-		activeTabs.value = enableVersion.value
-	}
-	switchFlowVersion(sendCont)
-		.then((data:any)=>{
-			ElMessage.success(data.msg);
-			// activeTabs.value = enableVersion.value
-			// enableFlow.value.id = enableVersion.value
-			if(versionList.length > 0){
-				versionList.forEach(item=>{
-					if(item.id == enableVersion.value){
-						enableFlow.value = item
-					}
-				})
-			}
-			
-		})
-		.finally(()=>{
-			clickOpenOrClose();
-		})
-	// console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs)
-}
+const setupState = (val: number) => {
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    status: val,
+  };
+  if (val == 1) {
+    activeTabs.value = enableVersion.value;
+  }
+  switchFlowVersion(sendCont)
+    .then((data: any) => {
+      ElMessage.success(data.msg);
+      // activeTabs.value = enableVersion.value
+      // enableFlow.value.id = enableVersion.value
+      if (versionList.length > 0) {
+        versionList.forEach((item) => {
+          if (item.id == enableVersion.value) {
+            enableFlow.value = item;
+          }
+        });
+      }
+    })
+    .finally(() => {
+      clickOpenOrClose();
+    });
+  // console.log("enableFlow.version==activeTabs",enableFlow.version,activeTabs)
+};
 //发布新流程
 const saveSet = async () => {
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",processConfig.value);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("nodeConfig",nodeConfig.value);
-	saveFlowCont(processConfig.value)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				emits('judgeFlowIsEdit', false)
-				emits("runNextWindows",3);
-				// clearCanvas(1);
-			}
-		})
-		.finally(()=>{
-			// emits("chanerequest");
-			getFlowVerList()
-		})
-	// let res = await setWorkFlowData(processConfig.value);
-	// if (res.code == 200) {
-	// 	ElMessage.success("设置成功")
-	// 	setTimeout(function () {
-	// 		window.location.href = "";
-	// 	}, 200);
-	// }
-	
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  // console.log("processConfig",processConfig.value);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("nodeConfig",nodeConfig.value);
+  saveFlowCont(processConfig.value)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        emits("judgeFlowIsEdit", false);
+        emits("runNextWindows", 3);
+        // clearCanvas(1);
+      }
+    })
+    .finally(() => {
+      // emits("chanerequest");
+      getFlowVerList();
+    });
+  // let res = await setWorkFlowData(processConfig.value);
+  // if (res.code == 200) {
+  // 	ElMessage.success("设置成功")
+  // 	setTimeout(function () {
+  // 		window.location.href = "";
+  // 	}, 200);
+  // }
 };
 //编辑当前版本流程
-const saveEdit =()=>{
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",flowPermission);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("activeTabs",enableFlow.value);
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		flowinfo:processConfig.value
-	}
-	editFlowCont(sendCont)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				// emits("update:openDrawer", false);
-				// clearCanvas(1);
-				emits('judgeFlowIsEdit', false)
-				emits("runNextWindows",3);
-			}
-		})
-		.finally(()=>{
-			// emits("chanerequest");
-			getFlowVerList()
-		})
-}
+const saveEdit = () => {
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  console.log("processConfig------------------->", processConfig.value);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("activeTabs",enableFlow.value);
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    flowinfo: processConfig.value,
+  };
+  editFlowCont(sendCont)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        // emits("update:openDrawer", false);
+        // clearCanvas(1);
+        emits("judgeFlowIsEdit", false);
+        emits("runNextWindows", 3);
+      }
+    })
+    .finally(() => {
+      // emits("chanerequest");
+      getFlowVerList();
+    });
+};
 //另存为新版
 const saveNew = () => {
-	setIsTried(true);
-	tipList.value = [];
-	
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",flowPermission);
-	// console.log("flowPermission",flowPermission.value);
-	// console.log("activeTabs",enableFlow.value);
-	let sendCont = {
-		id:enableVersion.value.toString(),
-		flowinfo:processConfig.value
-	}
-	saveNewFlow(sendCont)
-		.then((data:any) => {
-			if(data.code == 0){
-				ElMessage.success("设置成功");
-				emits('judgeFlowIsEdit', false)
-				emits("runNextWindows",3);
-			}
-		})
-		.finally(()=>{
-			getFlowVerList()
-		})
-}
-watch(()=>nodeConfig,()=>{
-	// console.log("变动流程")
-	if(oneIsTrue){
-		oneIsTrue = false;
-		emits('judgeFlowIsEdit', false)
-	}else{
-		emits('judgeFlowIsEdit', true)
-	}
-	
-},
-{
-    deep: true
-})
+  setIsTried(true);
+  tipList.value = [];
+
+  reErr(nodeConfig.value);
+  if (tipList.value.length != 0) {
+    tipVisible.value = true;
+    return;
+  }
+  processConfig.value.flowPermission = flowPermission.value;
+  // eslint-disable-next-line no-console
+  // console.log("processConfig",flowPermission);
+  // console.log("flowPermission",flowPermission.value);
+  // console.log("activeTabs",enableFlow.value);
+  let sendCont = {
+    id: enableVersion.value.toString(),
+    flowinfo: processConfig.value,
+  };
+  saveNewFlow(sendCont)
+    .then((data: any) => {
+      if (data.code == 0) {
+        ElMessage.success("设置成功");
+        emits("judgeFlowIsEdit", false);
+        emits("runNextWindows", 3);
+      }
+    })
+    .finally(() => {
+      getFlowVerList();
+    });
+};
+watch(
+  () => nodeConfig,
+  () => {
+    // console.log("变动流程")
+    if (oneIsTrue) {
+      oneIsTrue = false;
+      emits("judgeFlowIsEdit", false);
+    } else {
+      emits("judgeFlowIsEdit", true);
+    }
+  },
+  {
+    deep: true,
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-12 15:49:35
 @ 功能: 关闭表单流程
 */
 const closwFormFlow = () => {
-	flowIsTrue.value = false;
-	emits('judgeFlowIsEdit', false)
-	openOrCloseFormFlow(2)
-}
-onMounted(()=>{
-	// console.log("判断是否已经存在工作流以及是否开启",formKeyVal.value)
-	if(formKeyVal.value == ""){
-		flowIsTrue.value = false;
-	}else{
-		judgeFormFlowIsOpen({id:formKeyVal.value.toString()})
-			.then((data)=>{
-				// console.log("判断是否已经存在工作流以及是否开启",data)
-				if(data.data.isOpen == 1){
-					flowIsTrue.value = true;
-					emits('judgeFlowIsEdit', false)
-					getFlowVerList()
-				}else{
-					flowIsTrue.value = false;
-					emits('judgeFlowIsEdit', false)
-				}
-			})
-	}
-})
+  flowIsTrue.value = false;
+  emits("judgeFlowIsEdit", false);
+  openOrCloseFormFlow(2);
+};
+onMounted(() => {
+  // console.log("判断是否已经存在工作流以及是否开启",formKeyVal.value)
+  if (formKeyVal.value == "") {
+    flowIsTrue.value = false;
+  } else {
+    judgeFormFlowIsOpen({ id: formKeyVal.value.toString() }).then((data) => {
+      // console.log("判断是否已经存在工作流以及是否开启",data)
+      if (data.data.isOpen == 1) {
+        flowIsTrue.value = true;
+        emits("judgeFlowIsEdit", false);
+        getFlowVerList();
+      } else {
+        flowIsTrue.value = false;
+        emits("judgeFlowIsEdit", false);
+      }
+    });
+  }
+});
 </script>
 <template>
-	<div class="design_flow_work">
-		<el-row v-if="flowIsTrue" style="height: 100%;">
-			<el-col :span="24">
-				<table class="table_box">
-					<tr>
-						<td class="table_td_title"><el-text v-if="isRead">版本：</el-text></td>
-						<td class="table_td_info">
-							<div class="tabs_box">
-								<el-tabs v-if="isRead" v-model="activeTabs"  @tab-change="clickFormTable">
-									<el-tab-pane  v-for="item in versionList" :key="item.id" :name="item.id">
-										<template #label>
-											<el-icon><Share /></el-icon>
-											<span class="my-label">V{{item.version}}</span>
-										</template>
-									</el-tab-pane>
-								</el-tabs>
-							</div>
-							
-							
-							<div class="but_box">
-								<el-button v-if="isRead && !openOfClise && closeOrOpenVersion" type="success"  size="small" plain  @click="setupState(1)">
-									<el-icon class="el-icon--left"><Delete /></el-icon>
-									启用
-								</el-button>
-								<el-button v-if="isRead && openOfClise && closeOrOpenVersion"  type="warning"  size="small" plain @click="setupState(2)">
-									<el-icon class="el-icon--left"><Delete /></el-icon>
-									禁用
-								</el-button>
-								<el-button   size="small" plain  @click="clearCanvas">
-									<el-icon class="el-icon--left"><Delete /></el-icon>
-									清空
-								</el-button>
-								<el-button v-if="!isRead"   size="small" plain  @click="saveSet">
-									<el-icon class="el-icon--left"><Promotion /></el-icon>
-									发布
-								</el-button>
-								<el-button v-if="isRead"  size="small" plain @click="saveEdit">
-									<el-icon class="fa fa-save" style="margin-right:5px"></el-icon>
-									保存
-								</el-button>
-								<el-button v-if="isRead" type="warning"  size="small"  @click="saveNew">
-									<el-icon class="el-icon--left"><Share /></el-icon>
-									另存为新版
-								</el-button>
-								<el-button type="danger"  size="small" @click="closwFormFlow">
-									<el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
-									关闭流程
-								</el-button>
-							</div>
-						</td>
-					</tr>
-				</table>
-			</el-col>
-			<el-col :span="24">
-			
-				
-				<section class="dingflow-design" style="top:40px">		
-					<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">流程结束2</div>
-						</div>
-					</div>
-				</section>
-				<errorDialog v-model:visible="tipVisible" :list="tipList" />
-				<promoterDrawer v-model:form-data="state.formData" :form-key="formKeyVal" :form-version="formVersion" />
-				<approverDrawer :directormaxlevel="directorMaxLeveling" :node-config="nodeConfig"  :is-form-flow="isFormFlow"  :customer-form-key="formKeyVal"  v-model:form-data="state.formData"  :form-version="formVersion" />
-				<copyerDrawer />
-				<conditionDrawer  :is-form-flow="isFormFlow"  :customer-form-key="formKeyVal" />
-			</el-col>
-		</el-row>
-		<div v-else class="flow_work_begin">
-			<el-result title="" sub-title="">
-				<template #icon>
-					流程可实现需要多人流转的业务场景。<br>绘制流程图，设定数据流转方式，即可搭建线上工作流。<br><br>
-					<el-image
-						class="imgBox"
-						:src="FlowImgSrc"
-					/>
-				</template>
-				<template #extra>
-					<el-button type="primary" @click="createFormFlow">开启流程</el-button>
-				</template>
-			</el-result>
-		</div>
-		
-	</div>
+  <div class="design_flow_work">
+    <el-row v-if="flowIsTrue" style="height: 100%">
+      <el-col :span="24">
+        <table class="table_box">
+          <tr>
+            <td class="table_td_title"><el-text v-if="isRead">版本：</el-text></td>
+            <td class="table_td_info">
+              <div class="tabs_box">
+                <el-tabs v-if="isRead" v-model="activeTabs" @tab-change="clickFormTable">
+                  <el-tab-pane v-for="item in versionList" :key="item.id" :name="item.id">
+                    <template #label>
+                      <el-icon><Share /></el-icon>
+                      <span class="my-label">V{{ item.version }}</span>
+                    </template>
+                  </el-tab-pane>
+                </el-tabs>
+              </div>
+
+              <div class="but_box">
+                <el-button
+                  v-if="isRead && !openOfClise && closeOrOpenVersion"
+                  type="success"
+                  size="small"
+                  plain
+                  @click="setupState(1)"
+                >
+                  <el-icon class="el-icon--left"><Delete /></el-icon>
+                  启用
+                </el-button>
+                <el-button
+                  v-if="isRead && openOfClise && closeOrOpenVersion"
+                  type="warning"
+                  size="small"
+                  plain
+                  @click="setupState(2)"
+                >
+                  <el-icon class="el-icon--left"><Delete /></el-icon>
+                  禁用
+                </el-button>
+                <el-button size="small" plain @click="clearCanvas">
+                  <el-icon class="el-icon--left"><Delete /></el-icon>
+                  清空
+                </el-button>
+                <el-button v-if="!isRead" size="small" plain @click="saveSet">
+                  <el-icon class="el-icon--left"><Promotion /></el-icon>
+                  发布
+                </el-button>
+                <el-button v-if="isRead" size="small" plain @click="saveEdit">
+                  <el-icon class="fa fa-save" style="margin-right: 5px"></el-icon>
+                  保存
+                </el-button>
+                <el-button v-if="isRead" type="warning" size="small" @click="saveNew">
+                  <el-icon class="el-icon--left"><Share /></el-icon>
+                  另存为新版
+                </el-button>
+                <el-button type="danger" size="small" @click="closwFormFlow">
+                  <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
+                  关闭流程
+                </el-button>
+              </div>
+            </td>
+          </tr>
+        </table>
+      </el-col>
+      <el-col :span="24">
+        <section class="dingflow-design" style="top: 40px">
+          <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">流程结束2</div>
+            </div>
+          </div>
+        </section>
+        <errorDialog v-model:visible="tipVisible" :list="tipList" />
+        <promoterDrawer
+          v-model:form-data="state.formData"
+          :form-key="formKeyVal"
+          :form-version="formVersion"
+        />
+        <approverDrawer
+          :directormaxlevel="directorMaxLeveling"
+          :node-config="nodeConfig"
+          :is-form-flow="isFormFlow"
+          :customer-form-key="formKeyVal"
+          v-model:form-data="state.formData"
+          :form-version="formVersion"
+        />
+        <copyerDrawer />
+        <conditionDrawer :is-form-flow="isFormFlow" :customer-form-key="formKeyVal" />
+      </el-col>
+    </el-row>
+    <div v-else class="flow_work_begin">
+      <el-result title="" sub-title="">
+        <template #icon>
+          流程可实现需要多人流转的业务场景。<br />绘制流程图，设定数据流转方式，即可搭建线上工作流。<br /><br />
+          <el-image class="imgBox" :src="FlowImgSrc" />
+        </template>
+        <template #extra>
+          <el-button type="primary" @click="createFormFlow">开启流程</el-button>
+        </template>
+      </el-result>
+    </div>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.design_flow_work{
-	height: calc(100vh - 40px);
-    width: inherit;
-	overflow: hidden;
-	overflow-y: auto;
+<style lang="scss" scoped>
+.design_flow_work {
+  height: calc(100vh - 40px);
+  width: inherit;
+  overflow: hidden;
+  overflow-y: auto;
 }
-.flow_work_begin{
-	height: calc(100vh - 40px);
-	display: flex;
-	align-items: center;
-  	justify-content: center;
-	.imgBox{
-		height: calc(100vh - 400px);
-		// height: 10%;
-	}
+.flow_work_begin {
+  height: calc(100vh - 40px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .imgBox {
+    height: calc(100vh - 400px);
+    // height: 10%;
+  }
 }
 /* 去掉tabs标签栏下的下划线 */
 ::v-deep .el-tabs__nav-wrap::after {
   position: static !important;
   /* background-color: #fff; */
 }
-::v-deep .el-tabs__item{
-	padding:0 10px;
+::v-deep .el-tabs__item {
+  padding: 0 10px;
 }
-.version_but{
-	display: flex;
-	align-items: center;
-  	justify-content: space-between;
+.version_but {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
-.tabs_box{
-	max-width: 60%;
-	min-width:30%
+.tabs_box {
+  max-width: 60%;
+  min-width: 30%;
 }
-.but_box{
-	max-width: 50%;
-	min-width: 40%;
-	overflow: hidden;
-	overflow-x: auto;
-	padding:5px 10px 5px 0;
-	text-align: right;
+.but_box {
+  max-width: 50%;
+  min-width: 40%;
+  overflow: hidden;
+  overflow-x: auto;
+  padding: 5px 10px 5px 0;
+  text-align: right;
 }
 
-.table_box{
-	width: 100%;
+.table_box {
+  width: 100%;
 }
-.table_td_title{
-	width: 60px;
-	text-align: right;
-	align-items: center;
-	vertical-align: middle;
+.table_td_title {
+  width: 60px;
+  text-align: right;
+  align-items: center;
+  vertical-align: middle;
 }
-.table_td_info{
-	display: flex;
-	// width: calc(100% - 100px);
-	align-items: center;
-  	justify-content: space-between;
+.table_td_info {
+  display: flex;
+  // width: calc(100% - 100px);
+  align-items: center;
+  justify-content: space-between;
 }
 </style>
 <style>
-.canvas_body{
-	height: 100%;
-    width: inherit;
+.canvas_body {
+  height: 100%;
+  width: inherit;
 }
-.flow_version{
-	
+.flow_version {
 }
-.flow_version > .el-tabs__content{
-    padding: 0px;
-	height:0px;
+.flow_version > .el-tabs__content {
+  padding: 0px;
+  height: 0px;
 }
-.flow_version > .el-tabs__header{
-	margin:0px;
+.flow_version > .el-tabs__header {
+  margin: 0px;
 }
 .flow_version .custom-tabs-label span {
-  padding:0 10px;
+  padding: 0 10px;
 }
 
-.right_kongx{
-	margin-right:50px
-	
+.right_kongx {
+  margin-right: 50px;
 }
 </style>

From 7cf049c4c5a256acc81f34886fd23cd718444a2b Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Wed, 23 Apr 2025 13:55:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workflow/dialog/matrix.vue     | 90 +++++++------------
 .../workflow/drwer/approverDrawer.vue         |  1 +
 src/utils/workflow/index.ts                   | 31 ++++++-
 3 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/src/components/workflow/dialog/matrix.vue b/src/components/workflow/dialog/matrix.vue
index e939f94..414bf0d 100644
--- a/src/components/workflow/dialog/matrix.vue
+++ b/src/components/workflow/dialog/matrix.vue
@@ -9,7 +9,6 @@ import {
   matrixCont,
   martixFieldStruct,
   matrixInfo,
-  martOpter,
 } from "@/api/matrixapi/type";
 import { getMatrixList, getMatrixField } from "@/api/matrixapi/index";
 
@@ -28,7 +27,6 @@ const props = defineProps({
         factorName: "",
         outcomeid: 0,
         outcomeName: "",
-        list: [],
       };
     },
   },
@@ -53,36 +51,20 @@ const matrixIsClick = reactive<matrixInfo>({
   list: [],
 });
 //执行监听
-watch(
-  () => props.isshow,
-  (val: any) => {
-    if (val) {
-      // console.log("执行监听")
-      searchMatrixList();
-      matrixIsClick.matrixid = props.data.matrixid;
-      matrixIsClick.matrixName = props.data.matrixName;
-      matrixIsClick.factorid = props.data.factorid;
-      matrixIsClick.factorName = props.data.factorName;
-      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);
+    // console.log("执行监听")
     searchMatrixList();
-  },
-  (deep) => true
+
+    matrixIsClick.matrixid = props.data.matrixid;
+    matrixIsClick.matrixName = props.data.matrixName;
+    matrixIsClick.factorid = props.data.factorid;
+    matrixIsClick.factorName = props.data.factorName;
+    matrixIsClick.outcomeid = props.data.outcomeid;
+    matrixIsClick.outcomeName = props.data.outcomeName;
+    matrixIsClick.list = props.data.list ? props.data.list : [];
+  }
 );
 //行政组织树对照值
 const searchArchiveQuery = reactive<searchMatrix>({
@@ -120,7 +102,7 @@ const gainMatrixNeed = (val: any) => {
   loadingVal.value = true;
   getMatrixField({ id: val * 1 })
     .then(({ data }) => {
-      console.log("监听数据---->", data);
+      // console.log("监听数据---->",data)
       factorList.value = data.factor;
       outcomeList.value = data.outcome;
       if (data.factor.length > 0) {
@@ -146,24 +128,19 @@ const pickmatirval = (val: matrixCont) => {
 const pickval = (val: martixFieldStruct) => {
   matrixIsClick.outcomeid = val.id * 1;
   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;
-      }
-    });
-  }
+  let isAdd = true;
+  matrixIsClick.list.forEach((item: any, index: number) => {
+    if (item.outcomeid == val.id * 1) {
+      isAdd = false;
+      matrixIsClick.list.splice(index, 1);
+    }
+  });
   if (isAdd) {
     matrixIsClick.list.push({
       outcomeid: val.id * 1,
       outcomeName: val.name,
     });
   }
-  console.log("监听数据---->", matrixIsClick);
 };
 //选择条件
 const pickSelect = (val: any) => {
@@ -174,10 +151,10 @@ const pickSelect = (val: any) => {
     }
   });
 };
-watch(matrixIsClick, (val: any) => {
-  // console.log("值改变---->",val)
-  emits("change", val);
-});
+// watch(matrixIsClick, (val: any) => {
+//   console.log("值改变---->", val);
+//   emits("change", val);
+// });
 onMounted(() => {
   matrixIsClick.matrixid = props.data.matrixid;
   matrixIsClick.matrixName = props.data.matrixName;
@@ -190,26 +167,25 @@ onMounted(() => {
 });
 /**
 @ 作者: 秦东
-@ 时间: 2025-04-23 09:46:10
-@ 功能: 判断是否已经选中
+@ 时间: 2025-04-23 13:22:57
+@ 功能: 判断当前选择的内容
 */
-const jugdeIsTrue = (id: number) => {
-  var isAdd = false;
+const judgeIsTrue = (val: number) => {
+  let isTrue = 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;
+    matrixIsClick.list.forEach((item: any) => {
+      if (item.outcomeid == val) {
+        isTrue = true;
       }
     });
   }
-  console.log("判断--111111111-->", id);
-  return isAdd;
+  return isTrue;
 };
 </script>
 <template>
   <div>
     <el-divider content-position="left">矩阵选项</el-divider>
+
     <el-descriptions
       v-if="isShow"
       title=""
@@ -271,11 +247,11 @@ const jugdeIsTrue = (id: number) => {
               <li
                 v-for="item in outcomeList"
                 :key="item.id"
-                :class="jugdeIsTrue(item.id) ? 'active' : ''"
+                :class="judgeIsTrue(item.id) ? 'active' : ''"
                 @click="pickval(item)"
               >
                 <el-text class="mx-1">{{ item.name }}</el-text>
-                <el-text class="mx-1">{{ item.pinyin }}</el-text>
+                <el-text class="mx-1">{{}}{{item.pinyin}}</el-text>
               </li>
             </ul>
           </el-col>
diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue
index ea444cb..280434f 100644
--- a/src/components/workflow/drwer/approverDrawer.vue
+++ b/src/components/workflow/drwer/approverDrawer.vue
@@ -320,6 +320,7 @@ const sureFormTableApprover = (data: any) => {
 //更新审批人设置
 const updateMatrix = (val: any) => {
   approverConfig.value.matrix = val;
+  console.log("值改变-222--->", approverConfig.value.matrix);
 };
 
 const formTableFielding = reactive<formTableField>({});
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts
index a61dfef..548bd1f 100644
--- a/src/utils/workflow/index.ts
+++ b/src/utils/workflow/index.ts
@@ -59,7 +59,7 @@ All.prototype = {
         arr.splice(includesIndex, 1);
     },
     setApproverStr(nodeConfig:any) {
-		// console.log("setApproverStr",nodeConfig);
+		console.log("setApproverStr---签字解析--->",nodeConfig);
         if (nodeConfig.settype == 1) {
             if (nodeConfig.nodeUserList.length == 1) {
                 return nodeConfig.nodeUserList[0].name
@@ -126,8 +126,19 @@ All.prototype = {
 			}
 			
 		}else if (nodeConfig.settype == 9){
-			if(nodeConfig.matrix && nodeConfig.matrix.outcomeName){
-				let strVal = nodeConfig.matrix.outcomeName
+            console.log("setApproverStr---签字解析--9->",nodeConfig.matrix.list);
+            if(nodeConfig.matrix && nodeConfig.matrix.list){
+				let strVal = ""
+
+                if(nodeConfig.matrix.list.length > 0){
+                    nodeConfig.matrix.list.forEach((item:any,inx:number)=>{
+                        if (inx > 0) {
+                            strVal += '/';
+                        }
+                        strVal += item.outcomeName;
+                    })
+                }
+
 				if (nodeConfig.examineMode == 1) {
 					return strVal + "依次审批"
 				} else if (nodeConfig.examineMode == 2) {
@@ -135,7 +146,19 @@ All.prototype = {
 				}else if (nodeConfig.examineMode == 3) {
 					return strVal + "或签"
 				}
-			}
+			}else{
+                if(nodeConfig.matrix && nodeConfig.matrix.outcomeName){
+                    let strVal = nodeConfig.matrix.outcomeName
+                    if (nodeConfig.examineMode == 1) {
+                        return strVal + "依次审批"
+                    } else if (nodeConfig.examineMode == 2) {
+                        return strVal + "会签"
+                    }else if (nodeConfig.examineMode == 3) {
+                        return strVal + "或签"
+                    }
+                }
+            }
+			
 			
 		}else if (nodeConfig.settype == 10){
 			return "指定部门负责人"