From 15631e7ca8ec985be0c10cb0b996b5658f59c9ff Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 18 Oct 2023 14:15:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sysworkflow/flow/flowcanvas.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sysworkflow/flow/flowcanvas.vue b/src/views/sysworkflow/flow/flowcanvas.vue
index 3f15b50bd..d45cd7b97 100644
--- a/src/views/sysworkflow/flow/flowcanvas.vue
+++ b/src/views/sysworkflow/flow/flowcanvas.vue
@@ -4,7 +4,7 @@
 @ 备注: 
 -->
 <script lang='ts' setup>
-import '@/styles/workflowcss/workflow.css'
+import '@/styles/workflowcss/workflow.scss'
 
 import { useStore } from '@/store/workflow/index' 
 import { tipListStrucr } from '@/api/workflowapi/types'

From 34a2602f98354efb7af41a1dce65e8aff9a6ae2d Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 19 Oct 2023 13:11:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/displayboardapi/indexapi.ts           |  17 ++
 src/components/workflow/addNode.vue           |   6 +-
 src/components/workflow/dialog/common.ts      |  20 +-
 .../workflow/dialog/positionDialog.vue        | 104 ++++++++
 .../workflow/drwer/approverDrawer.vue         | 128 +++++++--
 src/components/workflow/selectBoxs.vue        |  12 +
 src/components/workflow/selectResult.vue      |   9 +-
 src/styles/workflowcss/workflow.scss          |   3 +-
 src/utils/workflow/index.ts                   |  13 +-
 src/views/sysworkflow/codepage/index.vue      | 231 +++++++++-------
 .../sysworkflow/flow/flowDrawingBoard.vue     | 249 +++++++++++++++++-
 src/views/sysworkflow/flow/index.vue          | 168 +-----------
 ....timestamp-1697610303012-42c6e5d26ab95.mjs | 160 +++++++++++
 13 files changed, 832 insertions(+), 288 deletions(-)
 create mode 100644 src/components/workflow/dialog/positionDialog.vue
 create mode 100644 vite.config.ts.timestamp-1697610303012-42c6e5d26ab95.mjs

diff --git a/src/api/displayboardapi/indexapi.ts b/src/api/displayboardapi/indexapi.ts
index 8f1e10268..4379803de 100644
--- a/src/api/displayboardapi/indexapi.ts
+++ b/src/api/displayboardapi/indexapi.ts
@@ -86,3 +86,20 @@ export const getRoles = (data?: any) => {
         data: data
     })
 }
+
+//搜索角色(新版)
+export const SearchPositionUnify = (data?: any) => {
+    return request({
+        url: '/kpiapi/powerpc/search_position_unify',
+        method: 'post',
+        data: data
+    })
+}
+//获取统一岗位
+export const GetPositionUnify = (data?: any) => {
+    return request({
+        url: '/kpiapi/powerpc/get_position_unify',
+        method: 'post',
+        data: data
+    })
+}
diff --git a/src/components/workflow/addNode.vue b/src/components/workflow/addNode.vue
index b51875303..84d4e026e 100644
--- a/src/components/workflow/addNode.vue
+++ b/src/components/workflow/addNode.vue
@@ -66,7 +66,8 @@ const addType = (type:any)=> {
                 "nodeUserList": [],
 				"fromNode": fromNodeNumber,
                 "gotoNode":[gotoNodeNumber],
-				"sendBackNode":"beginnode"
+				"sendBackNode":"beginnode",
+				"attribute":1
             }
 			// console.log("p4",data)
         } else if (type == 2) {
@@ -98,7 +99,8 @@ const addType = (type:any)=> {
                 "nodeUserList": [],
 				"fromNode": fromNodeNumber,
                 "gotoNode":[gotoNodeNumber],
-				"sendBackNode":"beginnode"
+				"sendBackNode":"beginnode",
+				"attribute":1
             }
 			// console.log("p6",data)
         }
diff --git a/src/components/workflow/dialog/common.ts b/src/components/workflow/dialog/common.ts
index e0dea4391..9f87d68dc 100644
--- a/src/components/workflow/dialog/common.ts
+++ b/src/components/workflow/dialog/common.ts
@@ -1,12 +1,13 @@
 import $func from '@/utils/workflow/index'
 
 import { outputOrgAndUser } from '@/api/displayboardapi/types'
-import { getBasisOrgChiled,getEmployees,getRoles } from '@/api/displayboardapi/indexapi'
+import { getBasisOrgChiled,getEmployees,getRoles,SearchPositionUnify,GetPositionUnify } from '@/api/displayboardapi/indexapi'
 
 
 export let searchVal = ref<any>('')
 export let departments = ref<any>()
 export let roles = ref({})
+export let positionList = ref<any>()
 
 //获取行政组织及人员
 export let getDepartmentList = async (parentId:any = 0) => {
@@ -39,8 +40,25 @@ export let getDebounceData = (event:any, type = 1) => {
 		}
 	})()
 }
+export let searchPostName  =async (event:any, type = 1) => {
+	
+	
+		let sendData ={
+			name:event.target.value
+		}
+		console.log("searchPostName",sendData)
+		let { data } = await SearchPositionUnify(sendData);
+		positionList.value = data;
+	
+}
 //角色列表
 export let getRoleList = async () => {
 	let { data: { list } } = await getRoles()
     roles.value = list;
 }
+
+export let getPostList = async () => {
+	let { data } = await GetPositionUnify()
+	console.log("getPostList",data);
+    positionList.value = data;
+}
diff --git a/src/components/workflow/dialog/positionDialog.vue b/src/components/workflow/dialog/positionDialog.vue
new file mode 100644
index 000000000..24d91a375
--- /dev/null
+++ b/src/components/workflow/dialog/positionDialog.vue
@@ -0,0 +1,104 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-10-19 08:13:15
+@ 备注: 行政岗位
+-->
+<script lang='ts' setup>
+import { positionList, searchPostName, getPostList, searchVal } from '@/components/workflow/dialog/common'
+import $func from '@/utils/workflow/index'
+//引入样式
+import '@/styles/workflowcss/dialog.scss'
+//引入页面
+import selectBox from '@/components/workflow/selectBoxs.vue'
+import selectResult from '@/components/workflow/selectResult.vue'
+
+let props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  },
+  data: {
+    type: Array,
+    default: () => []
+  }
+});
+let checkedRoleList = ref([])
+let emits = defineEmits(['update:visible', 'change'])
+let list = computed(() => {
+  return [{
+    type: 'position',
+    data: positionList.value,
+    isActive: (item) => $func.toggleClass(checkedRoleList.value, item, 'id'),
+    // change: (item) => {
+    //   checkedRoleList.value = [item]
+    // }
+	change: (item)=> $func.toChecked(checkedRoleList.value, item),
+  }]
+})
+let resList = computed(() => {
+  return [{
+    type: 'position',
+    data: checkedRoleList.value,
+    // cancel: (item) => $func.removeEle(checkedRoleList.value, item, 'id')
+	cancel: (item)=> $func.removeEle(checkedRoleList.value, item)
+  }]
+})
+let visibleDialog = computed({
+  get() {
+    return props.visible
+  },
+  set(val) {
+    closeDialog()
+  }
+})
+watch(() => props.visible, (val) => {
+  if (val) {
+    getPostList();
+    searchVal.value = "";
+    checkedRoleList.value = props.data.map(({ name, targetId }) => ({
+	  name: name,
+      id: targetId
+    }));
+  }
+})
+let total = computed(() => checkedRoleList.value.length)
+const saveDialog = () => {
+  let checkedList = checkedRoleList.value.map(item => ({
+    type: "position",
+    targetId: item.id,
+    name: item.name
+  }))
+  emits('change', checkedList)
+}
+const delList = () => {
+  checkedRoleList.value = [];
+}
+
+const closeDialog = () => {
+  emits('update:visible', false)
+}
+</script>
+<template>
+	<el-dialog v-model="visibleDialog" title="选择岗位" :width="600" append-to-body class="promoter_person">
+      <div class="person_body clear">
+		  	<el-row>
+				<el-col :span="12">
+					<div class="person_tree l">
+						<input v-model="searchVal"  type="text" placeholder="搜索岗位" @input="searchPostName($event,2)">
+						<selectBox :list="list"/>
+					</div>
+				</el-col>
+				<el-col :span="12">
+					<selectResult :list="resList" :total="total" @del="delList"/>
+				</el-col>
+			</el-row>
+      </div>
+      <template #footer>
+          <el-button @click="closeDialog">取 消</el-button>
+          <el-button type="primary" @click="saveDialog">确 定</el-button>
+      </template>
+  </el-dialog>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue
index 646bb47a7..16da6fab2 100644
--- a/src/components/workflow/drwer/approverDrawer.vue
+++ b/src/components/workflow/drwer/approverDrawer.vue
@@ -9,6 +9,8 @@ import { setTypes, selectModes, selectRanges } from '@/utils/workflow/const'
 import { useStore } from '@/store/workflow/index' 
 import { getAllParentNode,judgeOptionalNode } from '@/api/workflowapi/index'
 
+import PositionDialog from '@/components/workflow/dialog/positionDialog.vue'
+
 let props = defineProps({
 	nodeConfig:{
 		type: Object,
@@ -17,15 +19,26 @@ let props = defineProps({
     directormaxlevel: {
         type: Number,
         default: 4
-    }
+    },
+	isFormFlow:{
+		type:Boolean,
+		default:true
+	},
+	customerFormKey:{
+		type:String,
+		default:""
+	},
 });
+const isExecutor = ref(false)
 const nodeTitle = ref<string>("审批人设置")
 const nodeOptional = ref<any[]>() //审批线已经存在得节点
 const nodeAllVerify = ref<any[]>()
 let approverConfig = ref<any>({})
 let approverVisible = ref(false)
 let approverRoleVisible = ref(false)
+let appPosistonVisible = ref(false)
 let checkedRoleList = ref<any[]>([])
+let checkedPostList = ref<any[]>([])
 let checkedList = ref<any[]>([])
 let store = useStore()
 let { setApproverConfig, setApprover } = store
@@ -40,30 +53,46 @@ let visible = computed({
     }
 }) 
 
+watch(visible,(val:any)=>{
+	// if(val)
+})
+
 watch(approverConfig1, (val:any)=>{
-	// console.log("directormaxlevel",props.directormaxlevel)
+	console.log("directormaxlevel",visible.value)
     approverConfig.value = val.value
 	if(val.type == 3){
 		nodeTitle.value = "执行人设置"
 	}else{
 		nodeTitle.value = "审批人设置"
 	}
-
-	judgeOptionalNode(props.nodeConfig)
-		.then((data)=>{
+	isExecutor.value = false
+	
+	if(visible.value){
+		judgeOptionalNode(props.nodeConfig)
+		.then((data:any)=>{
 			if(data.code == 0){
 				let sendData = {
 					id:val.value.fromNode,
 					allcont:data.data.allcont
 				}
 				getAllParentNode(sendData)
-					.then((data)=>{
+					.then((data:any)=>{
 						if(data.code == 0){
 							nodeOptional.value = data.data.allcont
+							if(data.data.allcont && data.data.allcont.length > 0){
+								data.data.allcont.forEach(item => {
+									if(item.type  == 3){
+										isExecutor.value = true
+										return
+									}
+								});
+							}
 						}
 					})
 			}
 		})
+	}
+	
 
 	
 })
@@ -91,6 +120,14 @@ const addRoleApprover = ()=> {
     approverRoleVisible.value = true;
     checkedRoleList.value = approverConfig.value.nodeUserList
 }
+const addApproverPost = ()=> {
+	appPosistonVisible.value = true;
+    checkedPostList.value = approverConfig.value.nodeUserList
+}
+const surePostApprover = (data:any)=> {
+	appPosistonVisible.value = false;
+    approverConfig.value.nodeUserList = data;
+}
 const sureApprover = (data:any)=> {
     approverConfig.value.nodeUserList = data;
     approverVisible.value = false;
@@ -110,16 +147,28 @@ const saveApprover = ()=> {
 }
 const closeDrawer = ()=> {
     setApprover(false)
+	isExecutor.value = false
+}
+//判断审批设置是否显示
+const isShowRatify = (id:number)=>{
+	if(id == 8){
+		return props.isFormFlow
+	}else{
+		return true
+	}
 }
 </script>
 <template>
 	<el-drawer v-model="visible" :append-to-body="true" :title="nodeTitle"  class="set_promoter" :show-close="false" :size="550" :before-close="saveApprover"> 
+
 		<div class="demo-drawer__content">
 			<!--审批人设置主体-->
 			<div class="drawer_content">
 				<div class="approver_content">
                     <el-radio-group v-model="approverConfig.settype" class="clear" @change="changeType">
-                        <el-radio v-for="({value, label}) in setTypes" :key="value" :label="value" style="width:auto">{{label}}=>{{value}}</el-radio>
+						<template v-for="({value, label}) in setTypes"  :key="value">
+                        	<el-radio v-if="isShowRatify(value)" :label="value" style="width:auto">{{label}}=>{{value}}</el-radio>
+						</template>
                     </el-radio-group>
                 </div>
 				<!--指定成员-->
@@ -133,14 +182,42 @@ const closeDrawer = ()=> {
 				<!--主管-->
 				<div v-if="approverConfig.settype==2" class="approver_manager">
                     <p>
-                        <span>发起人的：</span>
-                        <select v-model="approverConfig.directorLevel">
-                            <option v-for="item in props.directormaxlevel" :key="item" :value="item">{{item==1?'直接':'第'+item+'级'}}主管</option>
-                        </select>
+						<el-row  :gutter="10">
+							<el-col :span="6">
+								<select v-model="approverConfig.attribute" style="width:100%">
+									<option value="1">发起人</option>
+									<option v-if="isExecutor" value="2">执行人</option>
+								</select>
+							</el-col>
+							<el-col :span="18">
+								<select v-model="approverConfig.directorLevel">
+									<option v-for="item in props.directormaxlevel" :key="item" :value="item">{{item==1?'直接':'第'+item+'级'}}主管</option>
+								</select>
+							</el-col>
+						</el-row>
+                        
                     </p>
                     <p class="tip">找不到主管时，由上级主管代审批</p>
                 </div>
-				
+				<!--行政岗位-->
+                <div v-if="approverConfig.settype==3" class="approver_manager">
+                    <p>指定行政岗位</p>
+                    <el-row>
+						<el-col :span="18">
+							<el-button  type="primary" @click="addApproverPost">添加/修改行政岗位</el-button>
+						</el-col>
+						<el-col :span="6">
+							<select v-model="approverConfig.attribute" style="width:100%">
+								<option value="1">发起人</option>
+								<option v-if="isExecutor" value="2">执行人</option>
+							</select>
+						</el-col>
+					</el-row>
+					<p  class="selected_list">
+						<el-tag  v-for="(item,index) in approverConfig.nodeUserList" :key="index" closable type="info" effect="plain" class="tag_us" @close="$func.removeEle(approverConfig.nodeUserList,item,'targetId')">{{item.name}}</el-tag>
+						<el-tag v-if="approverConfig.nodeUserList.length!=0" type="danger" effect="dark" @click="approverConfig.nodeUserList=[]">清除</el-tag>
+                    </p>
+                </div>
 				<!--发起人自选-->
                 <div v-show="approverConfig.settype==4" class="approver_self_select">
                     <el-radio-group v-model="approverConfig.selectMode" style="width: 100%;">
@@ -167,10 +244,20 @@ const closeDrawer = ()=> {
                 <div v-if="approverConfig.settype==6" class="approver_manager">
                     <p>审批终点</p>
                     <p style="padding-bottom:20px">
-                        <span>发起人的：</span>
-                        <select v-model="approverConfig.examineEndDirectorLevel">
-                            <option v-for="item in props.directormaxlevel" :key="item" :value="item">{{item==1?'直接':'第'+item}}层级主管</option>
-                        </select>
+						<el-row  :gutter="10">
+							<el-col :span="6">
+								<select v-model="approverConfig.attribute" style="width:100%">
+									<option value="1">发起人</option>
+									<option v-if="isExecutor" value="2">执行人</option>
+								</select>
+							</el-col>
+							<el-col :span="10">
+								<select v-model="approverConfig.directorLevel">
+									<option v-for="item in props.directormaxlevel" :key="item" :value="item">{{item==1?'直接':'第'+item+'级'}}主管</option>
+								</select>
+							</el-col>
+						</el-row>
+
                     </p>
                 </div>
 				<!--指定审批节点为本节点设置审批人-->
@@ -184,7 +271,7 @@ const closeDrawer = ()=> {
                 </div>
 				
 				<!--补充审批信息-->
-                <div v-if="(approverConfig.settype==1&&approverConfig.nodeUserList.length>1)||approverConfig.settype==2||(approverConfig.settype==4&&approverConfig.selectMode==2)" class="approver_some">
+                <div v-if="(approverConfig.settype==1&&approverConfig.nodeUserList.length>1)||approverConfig.settype==2||approverConfig.settype==6||(approverConfig.settype==4&&approverConfig.selectMode==2)" class="approver_some">
                     <p>多人审批时采用的审批方式</p>
                     <el-radio-group v-model="approverConfig.examineMode" class="clear">
                         <el-radio :label="1">依次审批</el-radio>
@@ -229,7 +316,12 @@ const closeDrawer = ()=> {
                 :data="checkedRoleList"
                 @change="sureRoleApprover"
             />
-
+			<!--选择岗位-->
+			<PositionDialog 
+                v-model:visible="appPosistonVisible"
+                :data="checkedPostList"
+                @change="surePostApprover"
+            />
 
 
 		</div>
diff --git a/src/components/workflow/selectBoxs.vue b/src/components/workflow/selectBoxs.vue
index 684fe7c8f..b1d81ed60 100644
--- a/src/components/workflow/selectBoxs.vue
+++ b/src/components/workflow/selectBoxs.vue
@@ -50,6 +50,18 @@ defineProps({
 					</div>
 				</li>
 			</template>
+			<!--岗位信息遍历-->
+			<template v-if="elem.type === 'position'">
+				<li v-for="item in elem.data" :key="item.id" class="check_box not" :class="{not: !elem.not}">
+					<div :class="elem.isActive(item) && 'active'">
+						<a  :title="item.departmentNames"   @click="elem.change(item)">
+							<span></span>
+							<img src="@/assets/images/icon_role.png">
+							{{item.name}}
+						</a>
+					</div>
+				</li>
+			</template>
 		</template>
 	</ul>
 </template>
diff --git a/src/components/workflow/selectResult.vue b/src/components/workflow/selectResult.vue
index 2ab29afac..f709536f9 100644
--- a/src/components/workflow/selectResult.vue
+++ b/src/components/workflow/selectResult.vue
@@ -11,7 +11,7 @@ let props = defineProps({
   },
   list: {
     type: Array,
-    default: () => [{ type: 'role', data, cancel }]
+    default: () => [{ type: 'role', data:[], cancel:()=>{} }]
   }
 })
 let emits = defineEmits(['del'])
@@ -49,6 +49,13 @@ let emits = defineEmits(['del'])
 			
 					</li>
 				</template>
+				<template v-if="type === 'position'">
+					<li v-for="item in data" :key="item.roleId">
+						<img src="@/assets/images/icon_role.png">
+						<span>{{item.name}}</span>
+						<img src="@/assets/images/cancel.png" @click="cancel(item)">
+					</li>
+				</template>
 			</template>
 		</ul>
 	</div>
diff --git a/src/styles/workflowcss/workflow.scss b/src/styles/workflowcss/workflow.scss
index f78c92e71..e4858ea6d 100644
--- a/src/styles/workflowcss/workflow.scss
+++ b/src/styles/workflowcss/workflow.scss
@@ -1063,7 +1063,8 @@ html {
 .fd-nav-content-new {
     position: relative;
     width: initial;
-    height: 100%;
+    // height: 100%;
+	height: calc(100% - 60px);
     overflow-x: hidden;
     overflow-y: auto;
     padding-bottom: 30px
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts
index 8547d03b1..f1302ef7c 100644
--- a/src/utils/workflow/index.ts
+++ b/src/utils/workflow/index.ts
@@ -71,7 +71,9 @@ All.prototype = {
                 }else if (nodeConfig.examineMode == 3) {
                     return nodeConfig.nodeUserList.length + "人非会签"
                 }
-            }
+            }else{
+				return "指定成员"	
+			}
         } else if (nodeConfig.settype == 2) {
             let level = nodeConfig.directorLevel == 1 ? '直接主管' : '第' + nodeConfig.directorLevel + '级主管'
             if (nodeConfig.examineMode == 1) {
@@ -79,7 +81,14 @@ All.prototype = {
             } else if (nodeConfig.examineMode == 2) {
                 return level + "会签"
             }
-        } else if (nodeConfig.settype == 4) {
+        } else if (nodeConfig.settype == 3) {
+			console.log("nodeConfig==会签==>",nodeConfig)
+			if (nodeConfig.nodeUserList.length == 1) {
+				return nodeConfig.nodeUserList[0].name
+			}else{
+				return "指定行政岗位"	
+			}
+		} else if (nodeConfig.settype == 4) {
 			console.log("nodeConfig.selectRange",nodeConfig.selectRange,nodeConfig.nodeUserList);
             if (nodeConfig.selectRange == 1) {
                 return "发起人自选"
diff --git a/src/views/sysworkflow/codepage/index.vue b/src/views/sysworkflow/codepage/index.vue
index 19c5ff14d..070016bce 100644
--- a/src/views/sysworkflow/codepage/index.vue
+++ b/src/views/sysworkflow/codepage/index.vue
@@ -11,6 +11,8 @@ import CreateForm from '@/views/sysworkflow/codepage/createform.vue'
 import SetupConfig from '@/views/sysworkflow/codepage/setupconfig.vue'
 import DataTableStructure from '@/views/sysworkflow/codepage/datatablestructure.vue'
 
+import FlowDrawingBoard from '@/views/sysworkflow/flow/flowDrawingBoard.vue'
+
 const contbody = ref()
 const queryParams = reactive<SearchForm>({
 	page: 1,
@@ -143,121 +145,148 @@ const openDataTableStructure = (cont:customerFormCont) =>{
 	dataTableIsShow.value = true;
 	// console.log("打开数据表结构图",cont)
 }
+//设置工作流
+const drawer = ref(false)
+const drawerWidht = ref()
+const isFormFlow = ref(false)
+const customerFormKey = ref<string>()
+const customerFormName = ref<string>()
+const setupWorkFlow = (cont:customerFormCont) => {
+	drawerWidht.value = contbody.value?.clientWidth
+	// console.log("clientHeight--->",drawerWidht.value)
+	drawer.value = true
+	isFormFlow.value = true;
+	customerFormName.value = cont.name
+	customerFormKey.value = cont.id.toString()
+}
+
 </script>
 <template>
-	<div ref="contbody" class="app-container">
-		<div class="search">
-			<el-form ref="queryFormRef" :model="queryParams" :inline="true">
-				<el-form-item label="关键字" prop="keywords">
-				<el-input
-					v-model="queryParams.keywords"
-					placeholder="表单名称"
-					clearable
-					@keyup.enter="handleQuery"
-				/>
-				</el-form-item>
-				<el-form-item>
-				<el-button type="primary" @click="handleQuery">
-					<template #icon><i-ep-search /></template>搜索
-				</el-button>
-				<el-button @click="resetQuery">
-					<template #icon>
-						<i-ep-refresh /></template>重置
+	<div  ref="contbody">
+	
+		<div class="app-container">
+			<div class="search">
+				<el-form ref="queryFormRef" :model="queryParams" :inline="true">
+					<el-form-item label="关键字" prop="keywords">
+					<el-input
+						v-model="queryParams.keywords"
+						placeholder="表单名称"
+						clearable
+						@keyup.enter="handleQuery"
+					/>
+					</el-form-item>
+					<el-form-item>
+					<el-button type="primary" @click="handleQuery">
+						<template #icon><i-ep-search /></template>搜索
 					</el-button>
-				</el-form-item>
-			</el-form>
-    	</div>
-		<el-card shadow="never">
-			<template #header>
-        		<el-button type="success" @click="openDialog()"><i-ep-plus />新增表单</el-button>
-				<el-button
-				type="danger"
-				:disabled="ids.length === 0"
-				@click="handleDelete()"
+					<el-button @click="resetQuery">
+						<template #icon>
+							<i-ep-refresh /></template>重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<template #header>
+					<el-button type="success" @click="openDialog()"><i-ep-plus />新增表单</el-button>
+					<el-button
+					type="danger"
+					:disabled="ids.length === 0"
+					@click="handleDelete()"
+					>
+						<i-ep-delete />删除表单
+					</el-button>
+				</template>
+				<el-table
+					v-loading="loading"
+					highlight-current-row
+							:data="contList"
+					border
+							@selection-change="handleSelectionChange"
 				>
-					<i-ep-delete />删除表单
-				</el-button>
-      		</template>
-			<el-table
-				v-loading="loading"
-				highlight-current-row
-						:data="contList"
-				border
-						@selection-change="handleSelectionChange"
-			>
-				<el-table-column fixed type="selection" width="55" align="center" />
-				<el-table-column fixed label="表单名称" prop="name" width="350"  />
-				<el-table-column label="分类" align="center" width="150">
-					<template #default="scope">
-						<el-tag  v-if="scope.row.classify === 1" effect="plain">表单</el-tag>
-						<el-tag v-else effect="plain">流程表单</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="状态" align="center" width="100">
-					<template #default="scope">
-						<el-tag v-if="scope.row.states === 1" type="success">启用</el-tag>
-						<el-tag v-else type="info">禁用</el-tag>
-					</template>
-        		</el-table-column>
-				<el-table-column label="创建人" prop="creatername" width="140" />
-				<el-table-column label="创建时间" prop="creatertime"  /> 
-				<el-table-column fixed="right" label="操作" align="center" width="350">
-					<template #default="scope">
-						<!-- <el-button
-						type="success"
-						link
-						size="small"
-						@click.stop="setupCustomerForm(scope.row)"
-						><i-ep-Share />版本</el-button> -->
-						<el-button
+					<el-table-column fixed type="selection" width="55" align="center" />
+					<el-table-column fixed label="表单名称" prop="name" width="350"  />
+					<el-table-column label="分类" align="center" width="150">
+						<template #default="scope">
+							<el-tag  v-if="scope.row.classify === 1" effect="plain">表单</el-tag>
+							<el-tag v-else effect="plain">流程表单</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="状态" align="center" width="100">
+						<template #default="scope">
+							<el-tag v-if="scope.row.states === 1" type="success">启用</el-tag>
+							<el-tag v-else type="info">禁用</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="创建人" prop="creatername" width="140" />
+					<el-table-column label="创建时间" prop="creatertime"  /> 
+					<el-table-column fixed="right" label="操作" align="center" width="350">
+						<template #default="scope">
+							<!-- <el-button
 							type="success"
 							link
 							size="small"
 							@click.stop="setupCustomerForm(scope.row)"
-						>
-							<i-ep-Setting />设置
-						</el-button>
-						<el-button
-							type="warning"
-							link
-							size="small"
-							@click.stop="openDataTableStructure(scope.row)"
-						>
-							<i-ep-MessageBox />数据结构
-						</el-button>
-						<el-button			
-							type="primary"
-							link
-							size="small"
-							@click.stop="editCustomerForm(scope.row)"
-						>
-							<i-ep-edit />编辑
-						</el-button>
-						<el-button			
-							type="danger"
-							link
-							size="small"
-							@click.stop="editCustomerFormState(scope.row)"
-						>
-							<i-ep-delete />删除
-						</el-button>
-					</template>
-        		</el-table-column>
-			</el-table>
-			<pagination
-				v-if="total > 0"
-				v-model:total="total"
-				v-model:page="queryParams.page"
-				v-model:limit="queryParams.pagesize"
-				@pagination="handleQuery"
-			/>
-		</el-card>
+							><i-ep-Share />版本</el-button> -->
+							<el-button
+								type="success"
+								link
+								size="small"
+								@click.stop="setupCustomerForm(scope.row)"
+							>
+								<i-ep-Setting />设置
+							</el-button>
+							<el-button
+								type="warning"
+								link
+								size="small"
+								@click.stop="openDataTableStructure(scope.row)"
+							>
+								<i-ep-MessageBox />数据结构
+							</el-button>
+							<el-button			
+								type="primary"
+								link
+								size="small"
+								@click.stop="editCustomerForm(scope.row)"
+							>
+								<i-ep-edit />编辑
+							</el-button>
+							<el-button			
+								type="danger"
+								link
+								size="small"
+								@click.stop="editCustomerFormState(scope.row)"
+							>
+								<i-ep-delete />删除
+							</el-button>
+							<el-button			
+								type="info"
+								link
+								size="small"
+								@click.stop="setupWorkFlow(scope.row)"
+							>
+								<i-ep-operation />流程
+							</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-if="total > 0"
+					v-model:total="total"
+					v-model:page="queryParams.page"
+					v-model:limit="queryParams.pagesize"
+					@pagination="handleQuery"
+				/>
+			</el-card>
+		</div>
 	</div>
 	<el-drawer  v-model="drawerOpenOrClose" title="设置/编辑自定义表单" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawerWith" class="drawerClass">
     	<CreateForm v-model:draweropenclose="drawerOpenOrClose" :formid="formId" :formconfigcont="formConfigCont" @handlequery="handleQuery" />
   	</el-drawer>
 	<SetupConfig v-model:show="show" :editid="editid" @handle_query="handleQuery" />
 	<DataTableStructure  v-model:isshow="dataTableIsShow" :formcont="formCont" />
+	<FlowDrawingBoard v-model:open-drawer="drawer" :drawer-widht="drawerWidht" :is-form-flow="isFormFlow"  :customer-form-name="customerFormName" :customer-form-key="customerFormKey" />
 </template>
 <style  lang='scss' scoped>
 .drawerClass{
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index 9881e341c..b3cf92e55 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -4,11 +4,256 @@
 @ 备注: 工作流画板
 -->
 <script lang='ts' setup>
+import '@/styles/workflowcss/workflow.scss'
 
+import { useStore } from '@/store/workflow/index' 
+import { tipListStrucr } from '@/api/workflowapi/types'
+import { initializeWorkFlow,setWorkFlowData } from '@/api/workflowapi/index'
+
+//引入页面
+import errorDialog from "@/components/workflow/dialog/errorDialog.vue";
+import promoterDrawer from "@/components/workflow/drwer/promoterDrawer.vue";
+import approverDrawer from "@/components/workflow/drwer/approverDrawer.vue";
+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:""
+	}
+})
+const emits = defineEmits(["update:openDrawer"]);
+const isShow =   computed({
+	get: () => props.openDrawer,
+	set: (val) => {
+		emits("update:openDrawer", val);
+	},
+});
+
+let { setTableId, setIsTried } = useStore()
+
+let tipList = ref<any>([]);
+let tipVisible = ref(false);
+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>("")
+
+//首次加载页面
+onMounted(async ()=>{
+	
+})
+//初始化工作流数据
+const initWorkFlowData = async() => {
+	let { data } = await initializeWorkFlow({name:""})
+	// console.log("data-=------>",data)
+	let {
+		nodeConfig: nodes,
+		flowPermission: flows,
+		directorMaxLevel: directorMaxLevel,
+		workFlowDef: works,
+		tableId,
+	} = data;
+	nodeConfig.value = nodes;
+	flowPermission.value = flows;
+	directorMaxLeveling = directorMaxLevel;
+	workFlowDef.value = works;
+	setTableId(tableId);
+	// console.log("max--->",flowPermission.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 saveSet = async () => {
+	setIsTried(true);
+	tipList.value = [];
+	processConfig.value.flowPermission = flowPermission.value;
+	// eslint-disable-next-line no-console
+	// console.log("processConfig",JSON.stringify(nodeConfig.value));
+	// console.log("processConfig",nodeConfig.value);
+	reErr(nodeConfig.value);
+	if (tipList.value.length != 0) {
+		tipVisible.value = true;
+		return;
+	}
+	
+	let res = await setWorkFlowData(processConfig.value);
+	if (res.code == 200) {
+		ElMessage.success("设置成功")
+		setTimeout(function () {
+			window.location.href = "";
+		}, 200);
+	}
+};
+//缩放画布
+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 clearCanvas = () =>{
+	ElMessageBox.confirm('确定要清空画布?')
+    .then(() => {
+		initWorkFlowData()
+		setIsTried(false);
+		tipList.value = []
+    })
+}
+watch(()=>props.openDrawer,(val)=>{
+	if(val){
+		initWorkFlowData()
+		shenPiTitle.value = props.customerFormName
+	}else{
+		setIsTried(false);
+		tipList.value = []
+	}
+})
 </script>
 <template>
-	<div></div>
+	<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 type="primary" @click="saveSet">
+					<el-icon class="el-icon--left"><Promotion /></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 :gutter="20">
+					<el-col :span="20">
+						<el-tabs  class="flow_version" >
+							<el-tab-pane>
+								<template #label>
+									<span class="custom-tabs-label">
+										<span>1</span>
+									</span>
+								</template>
+							</el-tab-pane>
+							<el-tab-pane>
+								<template #label>
+									<span class="custom-tabs-label">
+									<span>2</span>
+									</span>
+								</template>
+							</el-tab-pane>
+						</el-tabs>
+					</el-col>
+					<el-col :span="3" style="text-align: center;">
+						<el-button type="primary" round>启用</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">流程结束</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 />
+			</div>
+		</el-drawer>
 </template>
-<style  lang='scss' scoped>
+<style>
+.canvas_body{
+	height: 100%;
+    width: inherit;
+}
+.flow_version{
+	
+}
+.flow_version > .el-tabs__content{
+    padding: 0px;
+	height:0px;
+}
+.flow_version > .el-tabs__header{
+	margin:0px;
+}
+.flow_version .custom-tabs-label span {
+  padding:0 10px;
+}
 
+.right_kongx{
+	margin-right:50px
+	
+}
 </style>
diff --git a/src/views/sysworkflow/flow/index.vue b/src/views/sysworkflow/flow/index.vue
index d76a8daf8..c3e84216b 100644
--- a/src/views/sysworkflow/flow/index.vue
+++ b/src/views/sysworkflow/flow/index.vue
@@ -4,19 +4,8 @@
 @ 备注: 
 -->
 <script lang='ts' setup>
-import '@/styles/workflowcss/workflow.scss'
-
-import { useStore } from '@/store/workflow/index' 
-import { tipListStrucr } from '@/api/workflowapi/types'
-import { initializeWorkFlow,setWorkFlowData } from '@/api/workflowapi/index'
-
-//引入页面
-import errorDialog from "@/components/workflow/dialog/errorDialog.vue";
-import promoterDrawer from "@/components/workflow/drwer/promoterDrawer.vue";
-import approverDrawer from "@/components/workflow/drwer/approverDrawer.vue";
-import copyerDrawer from "@/components/workflow/drwer/copyerDrawer.vue";
-import conditionDrawer from "@/components/workflow/drwer/conditionDrawer.vue";
-
+import FlowDrawingBoard from '@/views/sysworkflow/flow/flowDrawingBoard.vue'
+//获取元素宽度
 const flowcont = ref()
 const drawer = ref(false)
 const drawerWidht = ref()
@@ -25,157 +14,16 @@ const openfloaw = ()=>{
 	// console.log("clientHeight--->",drawerWidht.value)
 	drawer.value = true
 }
-
-let { setTableId, setIsTried } = useStore()
-
-let tipList = ref<any>([]);
-let tipVisible = ref(false);
-let nowVal = ref(100);	//缩放比例
-let processConfig = ref<any>({});
-let nodeConfig = ref({});
-let workFlowDef = ref({});
-let flowPermission = ref([]);
-let directorMaxLeveling = ref<number>(0);
-
-//首次加载页面
-onMounted(async ()=>{
-	initWorkFlowData()
-})
-//初始化工作流数据
-const initWorkFlowData = async() => {
-	let { data } = await initializeWorkFlow({name:""})
-	// console.log("data-=------>",data)
-	let {
-		nodeConfig: nodes,
-		flowPermission: flows,
-		directorMaxLevel: directorMaxLevel,
-		workFlowDef: works,
-		tableId,
-	} = data;
-	nodeConfig.value = nodes;
-	flowPermission.value = flows;
-	directorMaxLeveling = directorMaxLevel;
-	workFlowDef.value = works;
-	setTableId(tableId);
-	// console.log("max--->",flowPermission.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 saveSet = async () => {
-	setIsTried(true);
-	tipList.value = [];
-	processConfig.value.flowPermission = flowPermission.value;
-	// eslint-disable-next-line no-console
-	// console.log("processConfig",JSON.stringify(nodeConfig.value));
-	// console.log("processConfig",nodeConfig.value);
-	reErr(nodeConfig.value);
-	if (tipList.value.length != 0) {
-		tipVisible.value = true;
-		return;
-	}
-	
-	let res = await setWorkFlowData(processConfig.value);
-	if (res.code == 200) {
-		ElMessage.success("设置成功")
-		setTimeout(function () {
-			window.location.href = "";
-		}, 200);
-	}
-};
-//缩放画布
-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 clearCanvas = () =>{
-	ElMessageBox.confirm('确定要清空画布?')
-    .then(() => {
-		initWorkFlowData()
-		setIsTried(false);
-		tipList.value = []
-    })
-}
+const isFormFlow = ref(false)
+const customerFormKey = ref<string>()
 </script>
 <template>
 	<div ref="flowcont">
 		<el-button type="primary" @click="openfloaw">添加</el-button>
-		<el-drawer v-model="drawer" :size="drawerWidht" :show-close="false">
-			<template #header="{ close, titleId, titleClass }">
-				<h4 :id="titleId" :class="titleClass">创建流程</h4>
-				<el-button type="warning" @click="clearCanvas">
-					<el-icon class="el-icon--left"><Delete /></el-icon>
-					清空
-				</el-button>
-				<el-button type="primary" @click="saveSet">
-					<el-icon class="el-icon--left"><Promotion /></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">
-				<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">流程结束</div>
-							</div>
-						</div>
-					</section>
-				</div>
-				<errorDialog v-model:visible="tipVisible" :list="tipList" />
-				<promoterDrawer />
-				<approverDrawer :directormaxlevel="directorMaxLeveling" :node-config="nodeConfig" />
-				<copyerDrawer />
-				<conditionDrawer />
-			</div>
-		</el-drawer>
+
+		<FlowDrawingBoard v-model:open-drawer="drawer" :drawer-widht = "drawerWidht" :is-form-flow="isFormFlow"  :customer-form-key="customerFormKey" />
+
+		
 	</div>
 </template>
 <style  lang='scss' scoped>
diff --git a/vite.config.ts.timestamp-1697610303012-42c6e5d26ab95.mjs b/vite.config.ts.timestamp-1697610303012-42c6e5d26ab95.mjs
new file mode 100644
index 000000000..1a43c1987
--- /dev/null
+++ b/vite.config.ts.timestamp-1697610303012-42c6e5d26ab95.mjs
@@ -0,0 +1,160 @@
+// vite.config.ts
+import vue from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { loadEnv, defineConfig } from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/vite/dist/node/index.js";
+import AutoImport from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-auto-import/dist/vite.js";
+import Components from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-vue-components/dist/vite.mjs";
+import { ElementPlusResolver } from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-vue-components/dist/resolvers.mjs";
+import Icons from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-icons/dist/vite.mjs";
+import IconsResolver from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-icons/dist/resolver.mjs";
+import { createSvgIconsPlugin } from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import UnoCSS from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unocss/dist/vite.mjs";
+import path from "path";
+var __vite_injected_original_dirname = "E:\\f_pang\\object\\my_object_html\\gyhlwpt\\hxgksystemapp";
+var pathSrc = path.resolve(__vite_injected_original_dirname, "src");
+var vite_config_default = defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    resolve: {
+      alias: {
+        "@": pathSrc
+      }
+    },
+    css: {
+      // CSS 预处理器
+      preprocessorOptions: {
+        //define global scss variable
+        scss: {
+          javascriptEnabled: true,
+          additionalData: `
+            @use "@/styles/variables.scss" as *;
+          `
+        }
+      }
+    },
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      // 运行是否自动打开浏览器
+      proxy: {
+        // 反向代理解决跨域
+        [env.VITE_APP_BASE_API]: {
+          target: env.VITE_APP_BASE_URL,
+          // 线上接口地址
+          // target: "http://vapi.youlai.tech", // 线上接口地址
+          // target: 'http://localhost:8989',  // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot
+          changeOrigin: true,
+          rewrite: (path2) => path2.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+          // 替换 /dev-api 为 target 接口地址
+        }
+      }
+    },
+    plugins: [
+      vue(),
+      UnoCSS({
+        /* options */
+      }),
+      AutoImport({
+        // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等
+        imports: ["vue", "@vueuse/core"],
+        //ignore: ['h'], // 自动添加 import { h } from '/node_modules/.vite/deps/vue.js 代码问题处理
+        eslintrc: {
+          enabled: false,
+          //  Default `false`
+          filepath: "./.eslintrc-auto-import.json",
+          // Default `./.eslintrc-auto-import.json`
+          globalsPropValue: true
+          // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')
+        },
+        resolvers: [
+          // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式)
+          ElementPlusResolver(),
+          // 自动导入图标组件
+          IconsResolver({})
+        ],
+        vueTemplate: true,
+        // 是否在 vue 模板中自动导入
+        dts: path.resolve(pathSrc, "types", "auto-imports.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Components({
+        resolvers: [
+          // 自动注册图标组件
+          IconsResolver({
+            enabledCollections: ["ep"]
+            //@iconify-json/ep 是 Element Plus 的图标库
+          }),
+          // 自动导入 Element Plus 组件
+          ElementPlusResolver()
+        ],
+        dts: path.resolve(pathSrc, "types", "components.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Icons({
+        // 自动安装图标库
+        autoInstall: true
+      }),
+      createSvgIconsPlugin({
+        // 指定需要缓存的图标文件夹
+        iconDirs: [path.resolve(pathSrc, "assets/icons")],
+        // 指定symbolId格式
+        symbolId: "icon-[dir]-[name]"
+      })
+    ],
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "element-plus/es/components/form/style/css",
+        "element-plus/es/components/form-item/style/css",
+        "element-plus/es/components/button/style/css",
+        "element-plus/es/components/input/style/css",
+        "element-plus/es/components/input-number/style/css",
+        "element-plus/es/components/switch/style/css",
+        "element-plus/es/components/upload/style/css",
+        "element-plus/es/components/menu/style/css",
+        "element-plus/es/components/col/style/css",
+        "element-plus/es/components/icon/style/css",
+        "element-plus/es/components/row/style/css",
+        "element-plus/es/components/tag/style/css",
+        "element-plus/es/components/dialog/style/css",
+        "element-plus/es/components/loading/style/css",
+        "element-plus/es/components/radio/style/css",
+        "element-plus/es/components/radio-group/style/css",
+        "element-plus/es/components/popover/style/css",
+        "element-plus/es/components/scrollbar/style/css",
+        "element-plus/es/components/tooltip/style/css",
+        "element-plus/es/components/dropdown/style/css",
+        "element-plus/es/components/dropdown-menu/style/css",
+        "element-plus/es/components/dropdown-item/style/css",
+        "element-plus/es/components/sub-menu/style/css",
+        "element-plus/es/components/menu-item/style/css",
+        "element-plus/es/components/divider/style/css",
+        "element-plus/es/components/card/style/css",
+        "element-plus/es/components/link/style/css",
+        "element-plus/es/components/breadcrumb/style/css",
+        "element-plus/es/components/breadcrumb-item/style/css",
+        "element-plus/es/components/table/style/css",
+        "element-plus/es/components/tree-select/style/css",
+        "element-plus/es/components/table-column/style/css",
+        "element-plus/es/components/select/style/css",
+        "element-plus/es/components/option/style/css",
+        "element-plus/es/components/pagination/style/css",
+        "element-plus/es/components/tree/style/css",
+        "element-plus/es/components/alert/style/css",
+        "@vueuse/core",
+        "path-to-regexp",
+        "echarts",
+        "@wangeditor/editor",
+        "@wangeditor/editor-for-vue",
+        "vue-i18n"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\gyhlwpt\\\\hxgksystemapp\";const __vite_injected_original_filename = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\gyhlwpt\\\\hxgksystemapp\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/vite.config.ts\";import vue from \"@vitejs/plugin-vue\";\r\n\r\nimport { UserConfig, ConfigEnv, loadEnv, defineConfig } from \"vite\";\r\n\r\nimport AutoImport from \"unplugin-auto-import/vite\";\r\nimport Components from \"unplugin-vue-components/vite\";\r\nimport { ElementPlusResolver } from \"unplugin-vue-components/resolvers\";\r\n\r\nimport Icons from \"unplugin-icons/vite\";\r\nimport IconsResolver from \"unplugin-icons/resolver\";\r\n\r\nimport { createSvgIconsPlugin } from \"vite-plugin-svg-icons\";\r\n\r\nimport UnoCSS from \"unocss/vite\";\r\n\r\nimport path from \"path\";\r\nconst pathSrc = path.resolve(__dirname, \"src\");\r\n\r\nexport default defineConfig(({ mode }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    resolve: {\r\n      alias: {\r\n        \"@\": pathSrc,\r\n      },\r\n    },\r\n    css: {\r\n      // CSS \u9884\u5904\u7406\u5668\r\n      preprocessorOptions: {\r\n        //define global scss variable\r\n        scss: {\r\n          javascriptEnabled: true,\r\n          additionalData: `\r\n            @use \"@/styles/variables.scss\" as *;\r\n          `,\r\n        },\r\n      },\r\n    },\r\n    server: {\r\n      host: \"0.0.0.0\",\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true, // \u8FD0\u884C\u662F\u5426\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\r\n      proxy: {\r\n        // \u53CD\u5411\u4EE3\u7406\u89E3\u51B3\u8DE8\u57DF\r\n        [env.VITE_APP_BASE_API]: {\r\n\t\t\t\t\ttarget: env.VITE_APP_BASE_URL, // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: \"http://vapi.youlai.tech\", // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: 'http://localhost:8989',  // \u672C\u5730\u63A5\u53E3\u5730\u5740 , \u540E\u7AEF\u5DE5\u7A0B\u4ED3\u5E93\u5730\u5740\uFF1Ahttps://gitee.com/youlaiorg/youlai-boot\r\n          changeOrigin: true,\r\n          rewrite: (path) =>\r\n            path.replace(new RegExp(\"^\" + env.VITE_APP_BASE_API), \"\"), // \u66FF\u6362 /dev-api \u4E3A target \u63A5\u53E3\u5730\u5740\r\n        },\r\n      },\r\n    },\r\n\t\t\r\n    plugins: [\r\n\t\t\t\r\n      vue(),\r\n      UnoCSS({\r\n        /* options */\r\n      }),\r\n      AutoImport({\r\n        // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1Aref, reactive, toRef \u7B49\r\n        imports: [\"vue\", \"@vueuse/core\"],\r\n\t\t\t\t//ignore: ['h'], // \u81EA\u52A8\u6DFB\u52A0 import { h } from '/node_modules/.vite/deps/vue.js \u4EE3\u7801\u95EE\u9898\u5904\u7406\r\n        eslintrc: {\r\n          enabled: false, //  Default `false`\r\n          filepath: \"./.eslintrc-auto-import.json\", // Default `./.eslintrc-auto-import.json`\r\n          globalsPropValue: true, // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')\r\n        },\r\n        resolvers: [\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1AElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n          ElementPlusResolver(),\r\n          // \u81EA\u52A8\u5BFC\u5165\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({}),\r\n        ],\r\n        vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n        dts: path.resolve(pathSrc, \"types\", \"auto-imports.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Components({\r\n        resolvers: [\r\n          // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({\r\n            enabledCollections: [\"ep\"], //@iconify-json/ep \u662F Element Plus \u7684\u56FE\u6807\u5E93\r\n          }),\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n          ElementPlusResolver(),\r\n        ],\r\n        dts: path.resolve(pathSrc, \"types\", \"components.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Icons({\r\n        // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n        autoInstall: true,\r\n      }),\r\n\r\n      createSvgIconsPlugin({\r\n        // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n        iconDirs: [path.resolve(pathSrc, \"assets/icons\")],\r\n        // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n        symbolId: \"icon-[dir]-[name]\",\r\n      }),\r\n    ],\r\n\r\n    optimizeDeps: {\r\n      include: [\r\n        \"vue\",\r\n        \"vue-router\",\r\n        \"pinia\",\r\n        \"axios\",\r\n        \"element-plus/es/components/form/style/css\",\r\n        \"element-plus/es/components/form-item/style/css\",\r\n        \"element-plus/es/components/button/style/css\",\r\n        \"element-plus/es/components/input/style/css\",\r\n        \"element-plus/es/components/input-number/style/css\",\r\n        \"element-plus/es/components/switch/style/css\",\r\n        \"element-plus/es/components/upload/style/css\",\r\n        \"element-plus/es/components/menu/style/css\",\r\n        \"element-plus/es/components/col/style/css\",\r\n        \"element-plus/es/components/icon/style/css\",\r\n        \"element-plus/es/components/row/style/css\",\r\n        \"element-plus/es/components/tag/style/css\",\r\n        \"element-plus/es/components/dialog/style/css\",\r\n        \"element-plus/es/components/loading/style/css\",\r\n        \"element-plus/es/components/radio/style/css\",\r\n        \"element-plus/es/components/radio-group/style/css\",\r\n        \"element-plus/es/components/popover/style/css\",\r\n        \"element-plus/es/components/scrollbar/style/css\",\r\n        \"element-plus/es/components/tooltip/style/css\",\r\n        \"element-plus/es/components/dropdown/style/css\",\r\n        \"element-plus/es/components/dropdown-menu/style/css\",\r\n        \"element-plus/es/components/dropdown-item/style/css\",\r\n        \"element-plus/es/components/sub-menu/style/css\",\r\n        \"element-plus/es/components/menu-item/style/css\",\r\n        \"element-plus/es/components/divider/style/css\",\r\n        \"element-plus/es/components/card/style/css\",\r\n        \"element-plus/es/components/link/style/css\",\r\n        \"element-plus/es/components/breadcrumb/style/css\",\r\n        \"element-plus/es/components/breadcrumb-item/style/css\",\r\n        \"element-plus/es/components/table/style/css\",\r\n        \"element-plus/es/components/tree-select/style/css\",\r\n        \"element-plus/es/components/table-column/style/css\",\r\n        \"element-plus/es/components/select/style/css\",\r\n        \"element-plus/es/components/option/style/css\",\r\n        \"element-plus/es/components/pagination/style/css\",\r\n        \"element-plus/es/components/tree/style/css\",\r\n        \"element-plus/es/components/alert/style/css\",\r\n        \"@vueuse/core\",\r\n\r\n        \"path-to-regexp\",\r\n        \"echarts\",\r\n        \"@wangeditor/editor\",\r\n        \"@wangeditor/editor-for-vue\",\r\n        \"vue-i18n\",\r\n      ],\r\n    },\r\n  };\r\n});\r\n"],
  "mappings": ";AAA6V,OAAO,SAAS;AAE7W,SAAgC,SAAS,oBAAoB;AAE7D,OAAO,gBAAgB;AACvB,OAAO,gBAAgB;AACvB,SAAS,2BAA2B;AAEpC,OAAO,WAAW;AAClB,OAAO,mBAAmB;AAE1B,SAAS,4BAA4B;AAErC,OAAO,YAAY;AAEnB,OAAO,UAAU;AAfjB,IAAM,mCAAmC;AAgBzC,IAAM,UAAU,KAAK,QAAQ,kCAAW,KAAK;AAE7C,IAAO,sBAAQ,aAAa,CAAC,EAAE,KAAK,MAA6B;AAC/D,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA,IACL,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,IACA,KAAK;AAAA;AAAA,MAEH,qBAAqB;AAAA;AAAA,QAEnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,UACnB,gBAAgB;AAAA;AAAA;AAAA,QAGlB;AAAA,MACF;AAAA,IACF;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UAC5B,QAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,UAGP,cAAc;AAAA,UACd,SAAS,CAACA,UACRA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA;AAAA,QAC5D;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MAEP,IAAI;AAAA,MACJ,OAAO;AAAA;AAAA,MAEP,CAAC;AAAA,MACD,WAAW;AAAA;AAAA,QAET,SAAS,CAAC,OAAO,cAAc;AAAA;AAAA,QAE/B,UAAU;AAAA,UACR,SAAS;AAAA;AAAA,UACT,UAAU;AAAA;AAAA,UACV,kBAAkB;AAAA;AAAA,QACpB;AAAA,QACA,WAAW;AAAA;AAAA,UAET,oBAAoB;AAAA;AAAA,UAEpB,cAAc,CAAC,CAAC;AAAA,QAClB;AAAA,QACA,aAAa;AAAA;AAAA,QACb,KAAK,KAAK,QAAQ,SAAS,SAAS,mBAAmB;AAAA;AAAA,MACzD,CAAC;AAAA,MAED,WAAW;AAAA,QACT,WAAW;AAAA;AAAA,UAET,cAAc;AAAA,YACZ,oBAAoB,CAAC,IAAI;AAAA;AAAA,UAC3B,CAAC;AAAA;AAAA,UAED,oBAAoB;AAAA,QACtB;AAAA,QACA,KAAK,KAAK,QAAQ,SAAS,SAAS,iBAAiB;AAAA;AAAA,MACvD,CAAC;AAAA,MAED,MAAM;AAAA;AAAA,QAEJ,aAAa;AAAA,MACf,CAAC;AAAA,MAED,qBAAqB;AAAA;AAAA,QAEnB,UAAU,CAAC,KAAK,QAAQ,SAAS,cAAc,CAAC;AAAA;AAAA,QAEhD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QAEA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path"]
}


From c7840bfd0acab988cd1987ac19919e2c9d770116 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 24 Oct 2023 08:33:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/displayboardapi/indexapi.ts           |   8 +
 src/api/workflowapi/index.ts                  |  12 +-
 src/api/workflowapi/types.ts                  |  21 +-
 src/components/workflow/dialog/common.ts      |  15 +-
 src/components/workflow/dialog/formWord.vue   | 135 ++++++
 .../workflow/drwer/approverDrawer.vue         |  38 +-
 .../workflow/drwer/conditionDrawer.vue        | 387 ++++++++++++------
 src/components/workflow/selectBoxs.vue        |  11 +
 src/components/workflow/selectResult.vue      |   7 +
 src/utils/workflow/const.ts                   |   5 +
 src/utils/workflow/index.ts                   |  18 +-
 src/views/sysworkflow/codepage/index.vue      |   4 +-
 .../sysworkflow/flow/flowDrawingBoard.vue     |  56 ++-
 13 files changed, 569 insertions(+), 148 deletions(-)
 create mode 100644 src/components/workflow/dialog/formWord.vue

diff --git a/src/api/displayboardapi/indexapi.ts b/src/api/displayboardapi/indexapi.ts
index 4379803de..03e567a33 100644
--- a/src/api/displayboardapi/indexapi.ts
+++ b/src/api/displayboardapi/indexapi.ts
@@ -103,3 +103,11 @@ export const GetPositionUnify = (data?: any) => {
         data: data
     })
 }
+//获取审批节点或条件节点
+export const gainNodeFactor = (data?: any) => {
+    return request({
+        url: '/systemapi/task_flow/gain_node_factor',
+        method: 'post',
+        data: data
+    })
+}
diff --git a/src/api/workflowapi/index.ts b/src/api/workflowapi/index.ts
index bd2cf580d..d74739faa 100644
--- a/src/api/workflowapi/index.ts
+++ b/src/api/workflowapi/index.ts
@@ -2,7 +2,9 @@ import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
 
 import { 
-	formTableName
+	formTableName,
+	flowversion,
+	publicid
 } from '@/api/workflowapi/types'
 
 //初始化工作流
@@ -45,3 +47,11 @@ export function judgeOptionalNode(data: any) {
 		data: data
 	});
 }
+//获取工作流版本列表
+export function gainFlowVersionList(data: publicid): AxiosPromise<flowversion> {
+	return request({
+		url: '/systemapi/task_flow/gain_flow_version_list',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/api/workflowapi/types.ts b/src/api/workflowapi/types.ts
index 859dfd0a0..8e5df9839 100644
--- a/src/api/workflowapi/types.ts
+++ b/src/api/workflowapi/types.ts
@@ -1,9 +1,26 @@
+export interface publicid{
+	id?: string;
+}
 //表单名称
 export interface formTableName{
 	name?: string;
 }
 
 //错误提示
-export interface tipListStrucr{
-	
+export interface flowversion{
+	id:string;
+	version:string;
+	state:number;
+	key:string;
+}
+
+//工作流判断条件
+export interface flowFactorCont{
+	id:number;
+	factorid:string;
+	options:optionsInfo[]
+}
+export interface optionsInfo{
+	label:string;
+	value:string;
 }
diff --git a/src/components/workflow/dialog/common.ts b/src/components/workflow/dialog/common.ts
index 9f87d68dc..0c0e620eb 100644
--- a/src/components/workflow/dialog/common.ts
+++ b/src/components/workflow/dialog/common.ts
@@ -1,13 +1,14 @@
 import $func from '@/utils/workflow/index'
 
 import { outputOrgAndUser } from '@/api/displayboardapi/types'
-import { getBasisOrgChiled,getEmployees,getRoles,SearchPositionUnify,GetPositionUnify } from '@/api/displayboardapi/indexapi'
+import { getBasisOrgChiled,getEmployees,getRoles,SearchPositionUnify,GetPositionUnify,gainNodeFactor } from '@/api/displayboardapi/indexapi'
 
 
 export let searchVal = ref<any>('')
 export let departments = ref<any>()
 export let roles = ref({})
 export let positionList = ref<any>()
+export let formWordList = ref<any>()
 
 //获取行政组织及人员
 export let getDepartmentList = async (parentId:any = 0) => {
@@ -62,3 +63,15 @@ export let getPostList = async () => {
 	console.log("getPostList",data);
     positionList.value = data;
 }
+
+//获取表单字段
+export let gainFormTableWorde = async (id:string,types:number) => {
+	let sendData ={
+		id:id,
+		types:types
+	}
+	console.log("gainFormTableWorde--->",sendData);
+	let { data } = await gainNodeFactor(sendData)
+	console.log("gainFormTableWorde",data);
+    formWordList.value = data;
+}
diff --git a/src/components/workflow/dialog/formWord.vue b/src/components/workflow/dialog/formWord.vue
new file mode 100644
index 000000000..080e9e9d3
--- /dev/null
+++ b/src/components/workflow/dialog/formWord.vue
@@ -0,0 +1,135 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-10-20 13:32:10
+@ 备注: 表单字段
+-->
+<script lang='ts' setup>
+import { formWordList, gainFormTableWorde, searchVal } from '@/components/workflow/dialog/common'
+import $func from '@/utils/workflow/index'
+//引入样式
+import '@/styles/workflowcss/dialog.scss'
+//引入页面
+import selectBox from '@/components/workflow/selectBoxs.vue'
+import selectResult from '@/components/workflow/selectResult.vue'
+
+let props = defineProps({
+	visible: {
+		type: Boolean,
+		default: false
+	},
+	data: {
+		type: Array,
+		default: () => []
+	},
+	formid:{
+		type:String,
+		default:""
+	},
+	formtype:{
+		type:Number,
+		default:1
+	}
+});
+let checkedFormList = ref([])
+let emits = defineEmits(['update:visible', 'change'])
+let list = computed(() => {
+	if(props.formtype == 1){
+		return [{
+			type: 'formword',
+			not: false,
+			data: formWordList.value,
+			isActive: (item) => $func.toggleClass(checkedFormList.value, item, 'id'),
+			
+			change: (item) => {
+				checkedFormList.value = [item]
+			}
+		}]
+	}else{
+		return [{
+			type: 'formword',
+			not: true,
+			data: formWordList.value,
+			isActive: (item) => $func.toggleClass(checkedFormList.value, item, 'id'),
+			change: (item)=> $func.toChecked(checkedFormList.value, item),
+		}]
+	}
+	
+})
+let resList = computed(() => {
+	if(props.formtype == 1){
+	return [{
+		type: 'formword',
+		data: checkedFormList.value,
+		cancel: (item) => $func.removeEle(checkedFormList.value, item, 'id')
+	}]
+}else{
+	return [{
+		type: 'formword',
+		data: checkedFormList.value,
+		cancel: (item)=> $func.removeEle(checkedFormList.value, item)
+	}]
+}
+})
+//关闭弹窗
+const closeDialog = () => {
+  	emits('update:visible', false)
+}
+let isShow = computed({
+	get() {
+		return props.visible
+	},
+	set(val) {
+		closeDialog()
+	}
+})
+watch(() => props.visible, (val) => {
+	if (val) {
+		gainFormTableWorde(props.formid,props.formtype);
+		searchVal.value = "";
+		checkedFormList.value = props.data.map(({ name, id,options,isCheckbox }) => ({
+			name: name,
+			id: id,
+			options:options,
+			isCheckbox:isCheckbox
+		}));
+	}
+})
+let total = computed(() => checkedFormList.value.length)
+const saveDialog = () => {
+	
+	let checkedList = checkedFormList.value.map(item => ({
+		type: props.formtype,
+		name: item.name,
+		id: item.id,
+		options:item.options,
+		isCheckbox:item.isCheckbox
+	}))
+	emits('change', checkedList)
+}
+const delList = () => {
+	checkedFormList.value = [];
+}
+</script>
+<template>
+	<el-dialog v-model="isShow" title="选择人力资源字段" :width="600" append-to-body class="promoter_person">
+      <div class="person_body clear">
+		  	<el-row>
+				<el-col :span="12">
+					<div class="person_tree l">
+						<selectBox :list="list"/>
+					</div>
+				</el-col>
+				<el-col :span="12">
+					<selectResult :list="resList" :total="total" @del="delList"/>
+				</el-col>
+			</el-row>
+      </div>
+      <template #footer>
+          <el-button @click="closeDialog">取 消</el-button>
+          <el-button type="primary" @click="saveDialog">确 定</el-button>
+      </template>
+  </el-dialog>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue
index 16da6fab2..05b251bc5 100644
--- a/src/components/workflow/drwer/approverDrawer.vue
+++ b/src/components/workflow/drwer/approverDrawer.vue
@@ -10,6 +10,7 @@ import { useStore } from '@/store/workflow/index'
 import { getAllParentNode,judgeOptionalNode } from '@/api/workflowapi/index'
 
 import PositionDialog from '@/components/workflow/dialog/positionDialog.vue'
+import FormWord from '@/components/workflow/dialog/formWord.vue'
 
 let props = defineProps({
 	nodeConfig:{
@@ -37,8 +38,10 @@ let approverConfig = ref<any>({})
 let approverVisible = ref(false)
 let approverRoleVisible = ref(false)
 let appPosistonVisible = ref(false)
-let checkedRoleList = ref<any[]>([])
-let checkedPostList = ref<any[]>([])
+let appFormTableVisible = ref(false)
+let checkedRoleList = ref<any[]>([])	//角色列表
+let checkedPostList = ref<any[]>([])		//岗位列表
+let checkedFormList = ref<any[]>([])		//字段列表
 let checkedList = ref<any[]>([])
 let store = useStore()
 let { setApproverConfig, setApprover } = store
@@ -157,8 +160,19 @@ const isShowRatify = (id:number)=>{
 		return true
 	}
 }
+
+//字段
+const formTableField = ()=> {
+	appFormTableVisible.value = true;
+    checkedFormList.value = approverConfig.value.nodeUserList
+}
+const sureFormTableApprover = (data:any)=> {
+    approverConfig.value.nodeUserList = data;
+    appFormTableVisible.value = false;
+}
 </script>
 <template>
+	
 	<el-drawer v-model="visible" :append-to-body="true" :title="nodeTitle"  class="set_promoter" :show-close="false" :size="550" :before-close="saveApprover"> 
 
 		<div class="demo-drawer__content">
@@ -269,9 +283,16 @@ const isShowRatify = (id:number)=>{
                         
                     </el-radio-group>
                 </div>
-				
+				<div v-if="approverConfig.settype==8" class="approver_manager">
+                    <p>指定审批字段</p>
+					<el-button  type="primary" @click="formTableField">添加/修改审批字段</el-button>
+					<p  class="selected_list">
+						<el-tag  v-for="(item,index) in approverConfig.nodeUserList" :key="index" closable type="info" effect="plain" class="tag_us" @close="$func.removeEle(approverConfig.nodeUserList,item,'targetId')">{{item.name}}</el-tag>
+						<el-tag v-if="approverConfig.nodeUserList.length!=0" type="danger" effect="dark" @click="approverConfig.nodeUserList=[]">清除</el-tag>
+                    </p>
+                </div>
 				<!--补充审批信息-->
-                <div v-if="(approverConfig.settype==1&&approverConfig.nodeUserList.length>1)||approverConfig.settype==2||approverConfig.settype==6||(approverConfig.settype==4&&approverConfig.selectMode==2)" class="approver_some">
+                <div v-if="(approverConfig.settype==1&&approverConfig.nodeUserList.length>1)||approverConfig.settype==2||approverConfig.settype==6||(approverConfig.settype==4&&approverConfig.selectMode==2)||approverConfig.settype==8" class="approver_some">
                     <p>多人审批时采用的审批方式</p>
                     <el-radio-group v-model="approverConfig.examineMode" class="clear">
                         <el-radio :label="1">依次审批</el-radio>
@@ -322,7 +343,14 @@ const isShowRatify = (id:number)=>{
                 :data="checkedPostList"
                 @change="surePostApprover"
             />
-
+			<!--表单字段-->
+			<FormWord
+				v-model:visible="appFormTableVisible"
+                :data="checkedFormList"
+				:formid="props.customerFormKey"
+				:formtype="1"
+                @change="sureFormTableApprover"
+			/>
 
 		</div>
 	</el-drawer>
diff --git a/src/components/workflow/drwer/conditionDrawer.vue b/src/components/workflow/drwer/conditionDrawer.vue
index 2465215d1..74c56cb2e 100644
--- a/src/components/workflow/drwer/conditionDrawer.vue
+++ b/src/components/workflow/drwer/conditionDrawer.vue
@@ -6,8 +6,26 @@
 <script lang='ts' setup>
 import $func from '@/utils/workflow/index'
 import { useStore } from '@/store/workflow/index' 
-import { optTypes, opt1s } from '@/utils/workflow/const'
+import { optTypes, opt1s,flowFactor } from '@/utils/workflow/const'
+import { flowFactorCont } from '@/api/workflowapi/types'
 import { getConditions } from '@/api/workflowapi/index'
+
+import { gainNodeFactor } from '@/api/displayboardapi/indexapi'
+
+let props = defineProps({
+	isFormFlow:{
+		type:Boolean,
+		default:true
+	},
+	customerFormKey:{
+		type:String,
+		default:""
+	},
+});
+
+
+const flowFactorList = ref<any[]>([]);
+
 let conditionVisible = ref(false)
 let conditionsConfig = ref({
     conditionNodes: [],
@@ -33,7 +51,6 @@ let visible = computed({
     }
 })
 watch(conditionsConfig1, (val:any) => {
-	// console.log("val.priorityLevel",val.priorityLevel)
     conditionsConfig.value = val.value;
     PriorityLevel.value = val.priorityLevel
     conditionConfig.value = val.priorityLevel
@@ -41,130 +58,175 @@ watch(conditionsConfig1, (val:any) => {
         : { nodeUserList: [], conditionList: [] }
 })
 
-const changeOptType = (item) => {
-    if (item.optType == 1) {
-        item.zdy1 = 2;
-    } else {
-        item.zdy1 = 1;
-        item.zdy2 = 2;
-    }
+watch(visible,(val:any)=>{
+	if(val){
+		if(flowFactor.length>0){
+			flowFactor.forEach(ites=>{
+				flowFactorList.value.push({
+									id:ites.id,
+									name:ites.name,
+									keyid:ites.keyid,
+									type:ites.type,
+									isok:ites.isok,
+									isCheckbox:ites.isCheckbox,
+									options:ites.options
+								})
+			})
+		}
+		if(props.isFormFlow){
+			let sendData ={
+				id:props.customerFormKey,
+				types:2
+			}
+			gainNodeFactor(sendData)
+				.then(({data}) =>{
+					console.log("......>",data)
+					if(data.length > 0){
+						data.forEach(item=>{
+							flowFactorList.value.push({
+								id:flowFactorList.value.length+1,
+								name:item.name,
+								keyid:item.id,
+								type:3,
+								isok:false,
+								isCheckbox:item.isCheckbox,
+								options:item.options
+							})
+						})
+					}
+				})
+		}
+		
+	}else{
+		flowFactorList.value = []
+	}
+})
+
+
+
+
+
+
+
+const closeDrawer = (val?:any) => {
+	initFactor()
+    setCondition(false)
+	
 }
-const toStrChecked = (item, key) => {
-    let a = item.zdy1 ? item.zdy1.split(",") : []
-    var isIncludes = $func.toggleStrClass(item, key);
-    if (!isIncludes) {
-        a.push(key)
-        item.zdy1 = a.toString()
-    } else {
-        removeStrEle(item, key);
-    }
+
+const isDelField = ref(false)
+const tableList = ref<any[]>([])
+const maxFactor = ref(false)
+
+const tiaoJianAry = ref<any>()
+//选择变化
+const pickFactor = (val:any) => {
+	let tableKeyAry = new Array
+	tableList.value.forEach(item=>{
+		tableKeyAry.push(item.factorid)
+	})
+	let types = 0
+	let options = new Array
+	let isCheckbox = false
+	flowFactorList.value.forEach(item=>{
+		if(item.keyid == val){
+			item.isok=true
+			types = item.type
+			options = item.options
+			isCheckbox = item.isCheckbox
+		}else{
+			if(tableKeyAry.length>0){
+				if(tableKeyAry.includes(item.keyid)){
+					item.isok=true
+				}else{
+					item.isok=false
+				}
+			}
+		}
+	})
+	tableList.value.forEach(item=>{
+		if(item.factorid == val){
+			item.type = types
+			item.options = options
+			item.isCheckbox = isCheckbox
+		}
+	})
+	console.log("tableList--->",tableList.value,val,types);
 }
-const removeStrEle = (item, key) => {
-    let a = item.zdy1 ? item.zdy1.split(",") : []
-    var includesIndex;
-    a.map((item, index) => {
-        if (item == key) {
-            includesIndex = index
-        }
-    });
-    a.splice(includesIndex, 1);
-    item.zdy1 = a.toString()
+//添加条件
+const addFactorCondition = () => {
+	let currLent = tableList.value.length
+	if(currLent < flowFactorList.value.length){
+		tableList.value.push({id:currLent+1,factorid:"",type:0})
+		if(currLent+1 >= flowFactorList.value.length){
+			maxFactor.value = true
+		}else{
+			maxFactor.value = false
+		}
+	}else{
+		maxFactor.value = true
+	}
+	if(tableList.value.length > 1){
+		isDelField.value = true
+	}else{
+		isDelField.value = false
+	}
+	
 }
-const addCondition = async () => {
-    conditionList.value = [];
-    conditionVisible.value = true;
-    let { data } = await getConditions({ tableId: tableId.value })
-    conditions.value = data;
-    if (conditionConfig.value.conditionList) {
-        for (var i = 0; i < conditionConfig.value.conditionList.length; i++) {
-            var { columnId } = conditionConfig.value.conditionList[i]
-            if (columnId == 0) {
-                conditionList.value.push({ columnId: 0 })
-            } else {
-                conditionList.value.push(conditions.value.filter(item => { return item.columnId == columnId; })[0])
-            }
-        }
-    }
+const initFactor = () => {
+	maxFactor.value = false
+	if(tableList.value.length>0){
+		tableList.value = []
+	}
+	if(flowFactorList.value.length>0){
+		flowFactorList.value = []
+	}
 }
-const sureCondition = () => {
-    //1.弹窗有，外面无+
-    //2.弹窗有，外面有不变
-    for (var i = 0; i < conditionList.value.length; i++) {
-        var { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i];
-        if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], "columnId")) {
-            continue;
-        }
-        if (columnId == 0) {
-            conditionConfig.value.nodeUserList = [];
-            conditionConfig.value.conditionList.push({
-                "type": 1,
-                "columnId": columnId,
-                "showName": '发起人'
-            });
-        } else {
-            if (columnType == "Double") {
-                conditionConfig.value.conditionList.push({
-                    "showType": showType,
-                    "columnId": columnId,
-                    "type": 2,
-                    "showName": showName,
-                    "optType": "1",
-                    "zdy1": "2",
-                    "opt1": "<",
-                    "zdy2": "",
-                    "opt2": "<",
-                    "columnDbname": columnName,
-                    "columnType": columnType,
-                })
-            } else if (columnType == "String" && showType == "3") {
-                conditionConfig.value.conditionList.push({
-                    "showType": showType,
-                    "columnId": columnId,
-                    "type": 2,
-                    "showName": showName,
-                    "zdy1": "",
-                    "columnDbname": columnName,
-                    "columnType": columnType,
-                    "fixedDownBoxValue": fixedDownBoxValue
-                })
-            }
-        }
-    }
-    //3.弹窗无，外面有-
-    for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
-        if (!$func.toggleClass(conditionList.value, conditionConfig.value.conditionList[i], "columnId")) {
-            conditionConfig.value.conditionList.splice(i, 1);
-        }
-    }
-    conditionConfig.value.conditionList.sort(function (a, b) { return a.columnId - b.columnId; });
-    conditionVisible.value = false;
+//删除条件
+const delTiaoJian = (val:any) => {
+	let currLent = tableList.value.length
+	if(currLent>0){
+		let guoduTable = []
+		tableList.value.forEach(item=>{
+			if(item.factorid != val.factorid){
+				guoduTable.push(item)
+			}
+		})
+		tableList.value = guoduTable
+	}
+	flowFactorList.value.forEach(item=>{
+			if(item.keyid == val.factorid){
+				item.isok=false
+			}
+		})
+	
+	if(currLent < flowFactorList.value.length){
+			maxFactor.value = false
+	}
+	if(tableList.value.length > 1){
+		isDelField.value = true
+	}else{
+		isDelField.value = false
+	}
 }
 const saveCondition = () => {
-    closeDrawer()
-    var a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)//截取旧下标
-    conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])//填充新下标
-    conditionsConfig.value.conditionNodes.map((item, index) => {
-        item.priorityLevel = index + 1
-    });
-    for (var i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
-        conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) == "请设置条件" && i != conditionsConfig.value.conditionNodes.length - 1
-    }
-    setConditionsConfig({
-        value: conditionsConfig.value,
-        flag: true,
-        id: conditionsConfig1.value.id
-    })
-}
-const addConditionRole = () => {
-    conditionRoleVisible.value = true;
-    checkedList.value = conditionConfig.value.nodeUserList
-}
-const sureConditionRole = (data) => {
-    conditionConfig.value.nodeUserList = data;
-    conditionRoleVisible.value = false;
-}
-const closeDrawer = (val?:any) => {
-    setCondition(false)
+    
+	conditionConfig.conditionList = tableList.value
+	console.log("conditionConfig.conditionList--->",conditionConfig.conditionList,tableList);
+    // var a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)//截取旧下标
+    // conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])//填充新下标
+    // conditionsConfig.value.conditionNodes.map((item, index) => {
+    //     item.priorityLevel = index + 1
+    // });
+    // for (var i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
+    //     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) == "请设置条件" && i != conditionsConfig.value.conditionNodes.length - 1
+    // }
+    // setConditionsConfig({
+    //     value: conditionsConfig.value,
+    //     flag: true,
+    //     id: conditionsConfig1.value.id
+    // })
+	closeDrawer()
 }
 </script>
 <template>
@@ -178,8 +240,69 @@ const closeDrawer = (val?:any) => {
 		<div class="demo-drawer__content">
 			<div class="condition_content drawer_content">
 				<p class="tip">当审批单同时满足以下条件时进入此流程</p>
+				
+				<el-row  v-for="itemw in tableList" :key="itemw.id" :gutter="10" class="condition_row">
+					<el-col :span="7">
+						<div class="left_right_cont">
+							<el-select v-model="itemw.factorid" placeholder="请选择" class="selectInfo" @change="pickFactor">
+								<el-option
+									v-for="item in flowFactorList"
+									:key="item.keyid"
+									:label="item.name"
+									:value="item.keyid"
+									:disabled="item.isok"
+									>
+								</el-option>
+							</el-select>
+							<span>为</span>
+						</div>
+					</el-col>
+					<el-col :span="16">
+						<template v-if="itemw.type==1">
+							<el-button type="primary" style="margin-bottom:0px" >添加/修改成员</el-button>
+							<p  class="selected_list">
+							<el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag><el-tag closable type="info" effect="plain" class="tag_us">演员1</el-tag>
+							</p>
+							
+						</template>
+						<template v-if="itemw.type==2">
+							<el-row v-for="(itemCustomFields,index) in itemw" :key="index" :gutter="5">
+								<el-col :span="6">
+                                    <el-input v-model="itemCustomFields.wordfield" placeholder="判断关键字"></el-input>
+                                </el-col>
+								<el-col :span="itemCustomFields.optType != 6?7:16">
+                                    <el-select v-model="itemCustomFields.optType"  class="selectInfo" @change="myoptChhange($event,itemCustomFields)">
+										<el-option
+											v-for="itemSel in optTypes"
+											:key="itemSel.value"
+											:label="itemSel.label"
+											:value="itemSel.value"
+											>
+										</el-option>   
+                                    </el-select>
+                                </el-col>
+								<el-col v-if="itemCustomFields.optType != 6" :span="9">
+                                    <el-input v-model="itemCustomFields.leftval" placeholder="请输入值"></el-input>
+                                </el-col>
+							</el-row>
+							<el-button type="warning" style="margin-top:10px" >添加条件</el-button>
+						</template>
+						<template v-if="itemw.type==3">
+							<el-radio-group v-if="!itemw.isCheckbox" v-model="itemw.answers">
+								<el-radio v-for="optVal in itemw.options" :key="optVal.value" :label="optVal.value">{{optVal.label}}</el-radio>
+							</el-radio-group>
+							<el-checkbox-group v-if="itemw.isCheckbox" v-model="itemw.answers">
+								<el-checkbox v-for="optVal in itemw.options" :key="optVal.value" :label="optVal.value">{{ optVal.label }}</el-checkbox>
+							</el-checkbox-group>
+						</template>
+					</el-col>
+					<el-col :span="1"><el-icon v-if="isDelField" color="#FF0000" size="20px"  class="delIcon" @click="delTiaoJian(itemw)"><CircleClose /></el-icon></el-col>
+				</el-row>
+				
+
+				<el-button :disabled="maxFactor" type="primary" @click="addFactorCondition" >添加条件</el-button>
 			</div>
-			<el-button type="primary" @click="addCondition">添加条件</el-button>
+			
 			<div class="demo-drawer__footer clear">
                 <el-button type="primary" @click="saveCondition">确 定</el-button>
                 <el-button @click="closeDrawer">取 消</el-button>
@@ -203,7 +326,17 @@ const closeDrawer = (val?:any) => {
 
     .condition_content {
         padding: 20px 20px 0;
-
+		.condition_row{
+			margin-bottom:15px;
+			.left_right_cont{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.selectInfo{
+					margin-right:5px;
+				}
+			}
+		}
         p.tip {
             margin: 20px 0;
             width: 510px;
@@ -301,4 +434,14 @@ const closeDrawer = (val?:any) => {
         }
     }
 }
+.delIcon{
+	margin-top:6px;
+}
+.selected_list{
+	margin: 0;
+
+	span{
+		margin:5px 5px 4px 0px;
+	}
+}
 </style>
diff --git a/src/components/workflow/selectBoxs.vue b/src/components/workflow/selectBoxs.vue
index b1d81ed60..8a63c3475 100644
--- a/src/components/workflow/selectBoxs.vue
+++ b/src/components/workflow/selectBoxs.vue
@@ -62,6 +62,17 @@ defineProps({
 					</div>
 				</li>
 			</template>
+			<!--岗位信息遍历-->
+			<template v-if="elem.type === 'formword'">
+				<li v-for="item in elem.data" :key="item.roleId" class="check_box" :class="{not: !elem.isDepartment}">
+					<div :class="elem.isActive(item) && 'active'">
+						<a  :title="item.departmentNames"   @click="elem.change(item)">
+							
+							<img src="@/assets/images/icon_role.png">{{item.name}}
+						</a>
+					</div>
+				</li>
+			</template>
 		</template>
 	</ul>
 </template>
diff --git a/src/components/workflow/selectResult.vue b/src/components/workflow/selectResult.vue
index f709536f9..3d5613bb1 100644
--- a/src/components/workflow/selectResult.vue
+++ b/src/components/workflow/selectResult.vue
@@ -56,6 +56,13 @@ let emits = defineEmits(['del'])
 						<img src="@/assets/images/cancel.png" @click="cancel(item)">
 					</li>
 				</template>
+				<template v-if="type === 'formword'">
+					<li v-for="item in data" :key="item.roleId">
+						<img src="@/assets/images/icon_role.png">
+						<span>{{item.name}}</span>
+						<img src="@/assets/images/cancel.png" @click="cancel(item)">
+					</li>
+				</template>
 			</template>
 		</ul>
 	</div>
diff --git a/src/utils/workflow/const.ts b/src/utils/workflow/const.ts
index b3e4b4f0e..de720b7c3 100644
--- a/src/utils/workflow/const.ts
+++ b/src/utils/workflow/const.ts
@@ -39,3 +39,8 @@ export let opt1s = [
   {value: '<', label: '<'},
   {value: '≤', label: '≤'},
 ]
+//工作流判断条件（类型：1、申请人；2、自定义字段；3、单选；4、多选；5、开关）
+export let flowFactor = [
+	{id:1,name:"申请人",keyid:"applicant",type:1,isok:false,isCheckbox:true,options:[]},
+	{id:2,name:"自定义字段",keyid:"customFields",type:2,isok:false,isCheckbox:false,options:[]}
+]
diff --git a/src/utils/workflow/index.ts b/src/utils/workflow/index.ts
index f1302ef7c..f9c0f58fa 100644
--- a/src/utils/workflow/index.ts
+++ b/src/utils/workflow/index.ts
@@ -72,7 +72,7 @@ All.prototype = {
                     return nodeConfig.nodeUserList.length + "人非会签"
                 }
             }else{
-				return "指定成员"	
+				// return "指定成员"	
 			}
         } else if (nodeConfig.settype == 2) {
             let level = nodeConfig.directorLevel == 1 ? '直接主管' : '第' + nodeConfig.directorLevel + '级主管'
@@ -80,7 +80,9 @@ All.prototype = {
                 return level
             } else if (nodeConfig.examineMode == 2) {
                 return level + "会签"
-            }
+            }else if (nodeConfig.examineMode == 3) {
+				return level + + "非会签"
+			}
         } else if (nodeConfig.settype == 3) {
 			console.log("nodeConfig==会签==>",nodeConfig)
 			if (nodeConfig.nodeUserList.length == 1) {
@@ -109,6 +111,18 @@ All.prototype = {
             return '从直接主管到通讯录中级别最高的第' + nodeConfig.examineEndDirectorLevel + '个层级主管'
         }else if (nodeConfig.settype == 7){
 			return "指定前置审批为本节点设置审批人"
+		}else if (nodeConfig.settype == 8){
+			console.log("checkedFormList--1111->",nodeConfig)
+			if(nodeConfig.nodeUserList.length > 0){
+				if (nodeConfig.examineMode == 1) {
+					return nodeConfig.nodeUserList[0].name + "依次审批"
+				} else if (nodeConfig.examineMode == 2) {
+					return nodeConfig.nodeUserList[0].name + "会签"
+				}else if (nodeConfig.examineMode == 3) {
+					return nodeConfig.nodeUserList[0].name + "非会签"
+				}
+			}
+			
 		}
     },
     dealStr(str:any, obj:any) {
diff --git a/src/views/sysworkflow/codepage/index.vue b/src/views/sysworkflow/codepage/index.vue
index 070016bce..54d448e24 100644
--- a/src/views/sysworkflow/codepage/index.vue
+++ b/src/views/sysworkflow/codepage/index.vue
@@ -151,6 +151,7 @@ const drawerWidht = ref()
 const isFormFlow = ref(false)
 const customerFormKey = ref<string>()
 const customerFormName = ref<string>()
+const flowKey = ref<string>()
 const setupWorkFlow = (cont:customerFormCont) => {
 	drawerWidht.value = contbody.value?.clientWidth
 	// console.log("clientHeight--->",drawerWidht.value)
@@ -158,6 +159,7 @@ const setupWorkFlow = (cont:customerFormCont) => {
 	isFormFlow.value = true;
 	customerFormName.value = cont.name
 	customerFormKey.value = cont.id.toString()
+	flowKey.value = cont.flowkey.toString()
 }
 
 </script>
@@ -286,7 +288,7 @@ const setupWorkFlow = (cont:customerFormCont) => {
   	</el-drawer>
 	<SetupConfig v-model:show="show" :editid="editid" @handle_query="handleQuery" />
 	<DataTableStructure  v-model:isshow="dataTableIsShow" :formcont="formCont" />
-	<FlowDrawingBoard v-model:open-drawer="drawer" :drawer-widht="drawerWidht" :is-form-flow="isFormFlow"  :customer-form-name="customerFormName" :customer-form-key="customerFormKey" />
+	<FlowDrawingBoard v-model:open-drawer="drawer" :drawer-widht="drawerWidht" :is-form-flow="isFormFlow"  :customer-form-name="customerFormName" :customer-form-key="customerFormKey" :flow-key="flowKey" />
 </template>
 <style  lang='scss' scoped>
 .drawerClass{
diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue
index b3cf92e55..50046318e 100644
--- a/src/views/sysworkflow/flow/flowDrawingBoard.vue
+++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue
@@ -7,8 +7,8 @@
 import '@/styles/workflowcss/workflow.scss'
 
 import { useStore } from '@/store/workflow/index' 
-import { tipListStrucr } from '@/api/workflowapi/types'
-import { initializeWorkFlow,setWorkFlowData } from '@/api/workflowapi/index'
+import { tipListStrucr,flowversion } from '@/api/workflowapi/types'
+import { initializeWorkFlow,setWorkFlowData,gainFlowVersionList } from '@/api/workflowapi/index'
 
 //引入页面
 import errorDialog from "@/components/workflow/dialog/errorDialog.vue";
@@ -37,6 +37,10 @@ const props = defineProps({
 	customerFormName:{
 		type:String,
 		default:""
+	},
+	flowKey:{
+		type:String,
+		default:""
 	}
 })
 const emits = defineEmits(["update:openDrawer"]);
@@ -58,6 +62,25 @@ let workFlowDef = ref({});
 let flowPermission = ref([]);
 let directorMaxLeveling = ref<number>(0);
 const shenPiTitle = ref<string>("")
+const activeTabs = ref<string>("");			//当前版本
+
+const versionList = ref<flowversion[]>(); //工作流版本列表
+//获取工作流版本列表
+const getFlowVerList = ()=>{
+	gainFlowVersionList({id:props.flowKey.toString()})
+		.then(({data})=>{
+			if(data){
+				if(data.length>0){
+					versionList.value = data;
+					data.forEach(item=>{
+						if(item.state == 1){
+							activeTabs.value = item.version
+						}
+					})
+				}
+			}
+		})
+}
 
 //首次加载页面
 onMounted(async ()=>{
@@ -155,6 +178,12 @@ const clearCanvas = () =>{
 }
 watch(()=>props.openDrawer,(val)=>{
 	if(val){
+		if(props.flowKey != ""){
+			getFlowVerList()
+		}else{
+
+		}
+		
 		initWorkFlowData()
 		shenPiTitle.value = props.customerFormName
 	}else{
@@ -162,6 +191,12 @@ watch(()=>props.openDrawer,(val)=>{
 		tipList.value = []
 	}
 })
+
+//选择工作流版本
+const clickFormTable = (val:any) =>{
+	// console.log("切换表单",val,formTableIndex.value)
+	// getTableFieldList(versionIndex.value,val)
+}
 </script>
 <template>
 	<el-drawer v-model="isShow" :size="props.drawerWidht" :show-close="false">
@@ -185,20 +220,13 @@ watch(()=>props.openDrawer,(val)=>{
 			</template>
 			
 			<div class="canvas_body">
-				<el-row :gutter="20">
+				<el-row v-if="props.flowKey!=''" :gutter="20">
 					<el-col :span="20">
-						<el-tabs  class="flow_version" >
-							<el-tab-pane>
-								<template #label>
-									<span class="custom-tabs-label">
-										<span>1</span>
-									</span>
-								</template>
-							</el-tab-pane>
-							<el-tab-pane>
+						<el-tabs v-model="activeTabs" class="flow_version" @tab-change="clickFormTable">
+							<el-tab-pane v-for="item in versionList" :key="item.id">
 								<template #label>
 									<span class="custom-tabs-label">
-									<span>2</span>
+										<span>{{ item.version }}}</span>
 									</span>
 								</template>
 							</el-tab-pane>
@@ -229,7 +257,7 @@ watch(()=>props.openDrawer,(val)=>{
 				<promoterDrawer />
 				<approverDrawer :directormaxlevel="directorMaxLeveling" :node-config="nodeConfig"  :is-form-flow="props.isFormFlow"  :customer-form-key="props.customerFormKey" />
 				<copyerDrawer />
-				<conditionDrawer />
+				<conditionDrawer  :is-form-flow="props.isFormFlow"  :customer-form-key="props.customerFormKey" />
 			</div>
 		</el-drawer>
 </template>