From dc5267f8b7a5b00363a28bc319df82214a82b8f4 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Mon, 17 Jun 2024 07:52:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/requestapi.ts              |  16 +
 src/components/DesignForm/app/formPage.vue    |  75 +++-
 src/components/DesignForm/app/index.vue       |   7 +-
 .../DesignForm/public/form/childTable.vue     |   2 +
 .../DesignForm/tableListPage/formPageCont.vue |   2 +-
 .../tableListPage/formPageContApp.vue         | 374 ++++++++++++++++++
 src/styles/workflowcss/workflow.css           |   2 -
 src/styles/workflowcss/workflow.min.css       |   2 +-
 src/styles/workflowcss/workflow.scss          |   4 +-
 src/types/components.d.ts                     |   1 +
 .../runApp/operationAction/AppEditPage.vue    |   1 +
 .../runApp/regularPage/myCreate.vue           | 223 ++++++++++-
 .../runApp/regularPage/myCreate_20240616.vue  | 229 +++++++++++
 13 files changed, 910 insertions(+), 28 deletions(-)
 create mode 100644 src/components/DesignForm/tableListPage/formPageContApp.vue
 create mode 100644 src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate_20240616.vue

diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts
index c2736450a..510901f56 100644
--- a/src/api/DesignForm/requestapi.ts
+++ b/src/api/DesignForm/requestapi.ts
@@ -528,3 +528,19 @@ export function saveDraftAgain(data: any) {
 		data: data
 	});
 }
+//编辑任务
+export function editCustomerTable(data: any) {
+	return request({
+		url: '/systemapi/task_management/editCustomerTable',
+		method: 'post',
+		data: data
+	});
+}
+//重新提交（有流程就发动流程，无流程就正常发表）
+export function afreshAppSubmit(data: any) {
+	return request({
+		url: '/systemapi/task_flow/afreshAppSubmit',
+		method: 'post',
+		data: data
+	});
+}
diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 12bb0293d..7e7710464 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -6,6 +6,7 @@
 <script lang='ts' setup>
 import '@/assets/scss/element-var.scss'
 import '@/assets/scss/index.scss'
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
 import { FormData,FormList,FormDataStyle } from '@/api/DesignForm/types'
 import { useRoute, useRouter } from 'vue-router'
 import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
@@ -19,7 +20,7 @@ import {
 } from '@/api/DesignForm/utils'
 import formatResult from '@/utils/DesignForm/formatResult'
 import formChangeValue from '@/utils/DesignForm/formChangeValue'
-import { judgeSubmitCancel,gainRunFlowStart,startRunFlow,saveDraftAgain } from '@/api/DesignForm/requestapi'
+import { judgeSubmitCancel,gainRunFlowStart,startRunFlow,saveDraftAgain,afreshAppSubmit } from '@/api/DesignForm/requestapi'
 import { notAsA_BasisForJudgment,asAnApprovalActionControl,fixedValueControl,timeControl,timeEquation,submitButton, afreshSubmitButton } from '@/utils/workflow/const'
 import { jsonParseStringify } from '@/utils/DesignForm'
 //通用提交
@@ -96,6 +97,7 @@ const emits = defineEmits<{
 	(e: 'btnClick', type: string): void
 	(e: 'change', val: any): void // 表单组件值发生变化时
 	(e: 'update:issave', type: boolean): void
+	(e: 'closePage', type: string): void
 }>()
 
 const route = useRoute()
@@ -361,7 +363,7 @@ watch(() => props.options,(val:any) => {
 */
 provide(constFormBtnEvent, (obj: any) => {
 	emits('btnClick', obj.key)
-	//                                                                 xz
+    console.log("按钮组件事件-----2-------->",obj.key)                                
 	if ([3, 4, 5].includes(props.type)) {
       	return ElMessage.error('当前模式不能提交表单')
     }
@@ -385,6 +387,7 @@ provide(constFormBtnEvent, (obj: any) => {
 			saveDraftAgainSend()
 			break
 		case 'afreshSubmit':	//重新提交流程
+			appAfreshSubmit()
 			break
 		case 'draftSubmit':	//草稿提交审批
 			
@@ -398,6 +401,57 @@ provide(constFormBtnEvent, (obj: any) => {
 })
 /**
 @ 作者: 秦东
+@ 时间: 2024-06-13 11:11:13
+@ 功能: app重新提交表单
+*/
+const appAfreshSubmit = (params = {}) => {
+	let addUrl = props.formData.config?.addUrl || props.addUrl
+	console.log("自定义App提交表单", props.addUrl)
+	if (props.isSearch || !addUrl || loading.value) {
+		if (!props.isSearch && !addUrl) {
+			console.error(
+				new Error('请在表单设计处配置接口事件url或选择数据源或设置props')
+			)
+		}
+		return
+    }
+	validate((valid: boolean, fields: any) => {
+		if (valid) {
+			const formatParams = Object.assign({}, fields, params)
+			let submitParams
+			const beforeSubmit = props.formData.events?.beforeSubmit
+			if (beforeSubmit) {
+				if (typeof beforeSubmit === 'function') {
+					submitParams = beforeSubmit(formatParams, route)
+				} else {
+					submitParams = formatResult(formatParams, beforeSubmit)
+				}
+			}
+			if (props.beforeSubmit && typeof props.beforeSubmit === 'string') {
+				submitParams = formatResult(formatParams, props.beforeSubmit)
+			} else if (typeof props.beforeSubmit === 'function') {
+				submitParams = props.beforeSubmit(formatParams, route)
+			}
+			if (submitParams === false) {
+				return
+			}
+			formatParams.versionId=props.versionId
+			formatParams.appKey=props.groupid
+			formatParams.status=1
+			formatParams.flowList=json2string(flowMap.value)
+
+			console.log("submitParams--111->",submitParams )
+			console.log("formatParams--111->",formatParams)
+			afreshAppSubmit(submitParams??formatParams)
+				.then((data:any)=>{
+					console.log("app重新提交表单--112221->",data)
+					emits("closePage")
+				})
+		}
+	})
+}
+/**
+@ 作者: 秦东
 @ 时间: 2024-06-10 10:37:30
 @ 功能: 再次保存草稿箱
 */
@@ -435,12 +489,14 @@ const saveDraftAgainSend = (params = {}) => {
 			formatParams.versionId=props.versionId
 			formatParams.appKey=props.groupid
 			formatParams.status=1
+			
 
-			console.log("submitParams--111->",submitParams )
-			console.log("formatParams--111->",formatParams)
+			console.log("submitParams--111221->",submitParams )
+			console.log("formatParams--1112222->",formatParams)
 			saveDraftAgain(submitParams??formatParams)
 				.then((data:any)=>{
-					console.log("提交草稿数据--111->",data)
+					console.log("提交草稿数据--112221->",data)
+					emits("closePage")
 				})
 		}else{
 			afterSubmit('validate', fields)
@@ -758,7 +814,14 @@ const getValue = (filter?: boolean) => {
       	return model.value
     }
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-13 16:06:26
+@ 功能: 关闭抽屉
+*/
+const closePage = () =>{
 
+}
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-06 13:18:58
@@ -950,7 +1013,7 @@ defineExpose({
     validate,
     resetFields,
 	appFormSubmit,
-
+	closePage,
     // getData,	//功能待定
 	// anewSubmit,
 	// saveDraftPage,
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 176d8172e..9344339e4 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -412,9 +412,10 @@ const submitApproval = (val:any) => {
 @ 功能: 撤回申请
 */
 const withdrawApplication  = (val:any) => {
-	// console.log("撤回申请", val);
+	console.log("撤回申请", val);
 	let sendInfo = {
-		id: val.masters_key,
+		// id: val.masters_key,
+		id: val.runFlowId
 	}
 	retractRunWorkFlow(sendInfo)
 		.then((data)=>{
@@ -779,7 +780,7 @@ const editFormSendFlow = (val:any) => {
 							>
 								<el-button type="info" size="small" class="fa fa-edit"  />
 							</el-tooltip>
-							</el-button-group>
+						</el-button-group>
 			
 			
 			</el-col>
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index f2104da39..75bb88230 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -21,6 +21,7 @@ const props = withDefaults(
 )
 const formProps = inject(constFormProps, {}) as any
 const tableDataNew = computed(() => {
+	console.log("如果编辑页禁用时-----1123---->",props.data.name)
     return formProps.value.model[props.data.name]
 })
 const type = computed(() => {
@@ -31,6 +32,7 @@ const editDisabled = computed(() => {
     return formProps.value.type === 2 && props.data.config?.editDisabled
 })
 const addColumn = () => {
+	console.log("如果编辑页禁用时--------->",tableDataNew.value)
     const temp: any = {}
     if (props.data.list) {
 		props.data.list.forEach((item: any) => {
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index e26546a65..2d2a6091d 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -288,7 +288,7 @@ const submitEdit = (type: string,val?:any) => {
 						</div>
 					</el-header>
 					<el-scrollbar class="scorllbarBox">
-						<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.pageInfo.masters_key" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
+						<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.pageInfo.runFlowId" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
 					</el-scrollbar>
 				</el-aside>
 				
diff --git a/src/components/DesignForm/tableListPage/formPageContApp.vue b/src/components/DesignForm/tableListPage/formPageContApp.vue
new file mode 100644
index 000000000..776768de1
--- /dev/null
+++ b/src/components/DesignForm/tableListPage/formPageContApp.vue
@@ -0,0 +1,374 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:39:16
+@ 备注: app专用列表内容展示
+-->
+<script lang='ts' setup>
+import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLookFormCont } from "@/utils/workflow/const";
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+import { gainTaskFormInfo,generateFlow,gainEditDataLog,draftsInitiateApproval,afreshRunWorkflow } from '@/api/taskapi/management'
+import { Close } from '@element-plus/icons-vue'
+import { judgeSubmitCancel,startRunFlow } from '@/api/DesignForm/requestapi'
+import { submitButtonEs } from '@/api/DesignForm/tableButton'
+
+import RunFlowStep from '@/views/taskplatform/taskmanagement/runFlowStep.vue'
+
+
+const props = defineProps({
+	isShow:{
+		type:Boolean,
+		default:false,
+	},
+	drawerWith:{
+		type:Number,
+		default:0
+	},
+	tablePageClass:{
+		type:Number,
+		default:1
+	},
+	operState:{
+		type:Number,
+		default:1
+	},
+	pageInfo:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+const formEl = ref<any>();
+const emits = defineEmits(["update:isShow","getPageData"]);
+const formLoading = ref(false);
+const flowAry = ref<any[]>(); //流程列表
+const currentProgress  = ref<number>(1);  //当前步进值
+const runstep = ref(null)
+//表单ID
+const openOfClose =  computed({
+	get() {
+		return props.isShow
+	},
+	set(val: boolean) {
+		emits('update:isShow', val)
+	}
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 14:09:24
+@ 功能: 监听状态变化处理数据
+*/
+watch(()=>props.isShow,(val:bool)=>{
+	console.log("监听状态变化处理数据",props.pageInfo)
+	if(val){
+		formLoading.value = true;
+		getCustomrrFormInfo();
+	}
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 14:25:15
+@ 功能: 关闭抽屉
+*/
+const closeDrawer = () => {
+	emits('update:isShow', false)
+}
+
+//表单相关内容
+const formState = reactive({
+    formData: {
+      list: [],
+      form: {},
+      config: {}
+    },
+    dict: {},
+    formId: props.pageInfo.idStr,
+    id: 1,
+    loading: true
+})
+const pageLog = ref<any[]>([])
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 14:33:15
+@ 功能: 获取自定义表单内容
+*/
+const getCustomrrFormInfo = () => {
+	gainTaskFormInfo({id:props.pageInfo.mastersKeyStr})
+		.then(({data})=>{
+			// console.log("获取自定义表单内容",data,data.structure)
+			formState.formData = stringToObj(data.structure.mastesform)
+			// console.log("获取自定义表单内容--->",formState)
+			formState.dict = string2json(data.structure.dict)
+			// formState.formData.list.push(editLookFormCont)
+			if(props.tablePageClass != 4){
+				judgeSubmitCancel({"name":data.structure.mastesformjson})
+					.then((data:any) =>{
+						if(data.code == 0){
+							if (data.data == 3 || data.data == 4){
+								// formState.formData.list.push(submitButtonEs)
+								if(props.operState == 2){
+										formState.formData.list.push(afreshSubmitButton)
+								}else if(props.operState == 3){
+										formState.formData.list.push(editFormCont)
+								}else if(props.operState == 4){
+										formState.formData.list.push(draftSubmitButton)
+								}else if(props.operState == 5){
+									formState.formData.list.push(submitButtonEs)
+								}
+							}
+						}
+					})
+			}
+			
+
+			nextTick(()=>{
+				// console.log("获取自定义表单内容-1111-->",data.tableData)
+				formEl.value.setValue(data.tableData)
+			})
+		})
+		.finally(()=>{
+			formLoading.value = false;
+			gainEditDataLog({id:props.pageInfo.mastersKeyStr})
+			.then(({data})=>{
+				console.log("获取修改记录-1111-->",data)
+				pageLog.value = data.logAry
+			});
+		})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-07 10:55:34
+@ 功能: 表单动作回调
+*/
+const afterSubmit = (type: string) => {
+	console.log("表单提交成功")
+	if (type === 'success') {
+		// router.go(-1)
+		// console.log("表单提交成功")
+		emits("getPageData");
+		closeDrawer();
+		
+	}
+}
+const closeAppSubmit = () => {
+	closeDrawer()
+}
+//流程执行
+const drawerBeforeClose = () => {
+	console.log("监听打开关闭",false)
+	// emits("getmytodolist")
+	// emits("update:isshow", false);
+}
+//提交审批
+const sendDraftSubmit = (type: string,val?:any) => {
+	console.log("提交审批",type,val)
+	// emits("getmytodolist")
+	if (type === 'success') {
+		if(props.pageInfo.types == 1){
+			let sendInfo ={
+				id:val.data.runFlowId,
+				flowList:flowAry.value,
+				state:3
+			}
+			console.log("草稿提交审批--1-<",sendInfo)
+			draftsInitiateApproval(sendInfo)
+				.then((data:any) =>{
+					console.log("草稿提交审批---<",sendInfo,data)
+					if(data.code == 0){
+						ElMessage.success(data.msg || '提交成功！')
+						if(runstep.value){
+							runstep.value.gainRunFlowTask()
+						}
+						emits("getPageData");
+						closeDrawer()
+					}
+				})
+		}
+	}
+}
+//保存草稿箱(带流程)
+const saveEditFormInfo  = (type: string,val?:any) => {
+	console.log("草稿提交审批--1-<",type,val)
+	if(type == "success"){
+		runstep.value.gainRunFlowTask()
+		emits("getPageData");
+		closeDrawer()
+	}
+}
+
+//重新提交审核
+const anewSubmit = (type: string,val?:any) => {
+	
+	if(type == "success"){
+		afreshRunWorkflow({id:val.data.flowkeys})
+			.then((data:any) => {
+				console.log("重新提交数据---<",data,runstep.value)
+				runstep.value.gainRunFlowTask()
+			})
+			.finally(() => {
+				emits("getPageData");
+				closeDrawer()
+			})
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 11:35:24
+@ 功能: 申请修改
+*/
+//修改完毕
+const submitEdit = (type: string,val?:any) => {
+	// console("修改完毕----->",type,val)
+	if(type == "success"){
+		runstep.value.gainRunFlowTask()
+		emits("getPageData");
+		closeDrawer()
+	}
+}
+</script>
+<template>
+	<el-drawer
+		v-model="openOfClose"
+		title="查看表单内容"
+		:size="drawerWith"
+		:with-header="false" 
+		:close-on-click-modal="false" 
+		:close-on-press-escape="false" 
+		:destroy-on-close="true"
+	>
+		<div v-if="props.pageInfo.types==1" class="common-layout">
+		
+			<el-container>
+				<el-main>
+					<ak-form
+							ref="formEl"
+							v-loading="formLoading" element-loading-text="Loading..."
+							:form-data="formState.formData"
+							:type="props.tablePageClass"
+							:dict="formState.dict"
+							request-url="getFormContent"
+							add-url="saveFormContent"
+							edit-url="editFormContent"
+							:before-submit="beforeSubmit"
+							:close-app-submit="closeDrawer"
+							:change-key-val="changeKeyVal"
+							:anew-submit = "anewSubmit"
+							:save-edit-form-info="saveEditFormInfo"
+							:send-draft-submit= "sendDraftSubmit"
+							:after-submit="afterSubmit"
+							:submit-edit="submitEdit"
+						/>
+						
+					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+					<el-timeline style="width: 100%">
+						<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
+							<el-card>
+								<el-descriptions  border>
+									<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" :label="mastIndex">
+										{{mastItem}}
+									</el-descriptions-item>
+								</el-descriptions>
+								<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
+									<el-tab-pane v-for="(sonItem,sonIndex) in item.sunList" :label="sonIndex" :key="sonIndex">
+										<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
+											<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" :label="sonKey">	{{sonCentor}}
+											</el-descriptions-item>
+										</el-descriptions>
+									</el-tab-pane>
+								</el-tabs>
+							</el-card>
+						</el-timeline-item>
+					</el-timeline>
+				</el-main>
+				<el-aside width="350px" class="flowBox">
+					<el-header height="30px">
+						<div class="workFlowHead">
+							<el-text>审批流程</el-text>
+							<el-icon @click="closeDrawer"><Close /></el-icon>
+						</div>
+					</el-header>
+					<el-scrollbar class="scorllbarBox">
+						<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.pageInfo.runFlowIdStr" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
+					</el-scrollbar>
+				</el-aside>
+				
+			</el-container>
+		</div>
+		<div v-else class="common-layout">
+			<el-header height="30px">
+				<el-icon @click="closeDrawer"><Close /></el-icon>
+			</el-header>
+			<ak-form
+				ref="formEl"
+				v-loading="formLoading" element-loading-text="Loading..."
+				:form-data="formState.formData"
+				:type="props.tablePageClass"
+				:dict="formState.dict"
+				request-url="getFormContent"
+				add-url="saveFormContent"
+				edit-url="editFormContent"
+				:before-submit="beforeSubmit"
+				:close-app-submit="closeDrawer"
+				:change-key-val="changeKeyVal"
+				:anew-submit = "anewSubmit"
+				:after-submit="afterSubmit"
+				:save-edit-form-info="saveEditFormInfo"
+				:send-draft-submit= "sendDraftSubmit"
+				:submit-edit="submitEdit"
+			/>
+			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+			<el-timeline style="width: 100%">
+				<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
+					<el-card>
+						<el-descriptions  border>
+							<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" :label="mastIndex">
+								{{mastItem}}
+							</el-descriptions-item>
+						</el-descriptions>
+						<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
+							<el-tab-pane v-for="(sonItem,sonIndex) in item.sunList" :label="sonIndex" :key="sonIndex">
+								<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
+									<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" :label="sonKey">	{{sonCentor}}
+									</el-descriptions-item>
+								</el-descriptions>
+							</el-tab-pane>
+						</el-tabs>
+					</el-card>
+				</el-timeline-item>
+			</el-timeline>
+		</div>
+	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+.common-layout{
+	height: 100vh;
+	padding: 0 15px;
+	.el-main{
+		height: 100vh;
+		padding:0;
+	}
+	.flowBox{
+		height: 100vh;
+		border-left: 1px solid #ccc;
+		.scorllbarBox{
+			height: calc(100vh - 35px)
+		}
+		.workFlowHead{
+			display: flex;
+			align-items: center;
+  			justify-content: space-between;
+		}
+	}
+	.el-header{
+		padding:0 10px;
+		line-height:30px;
+		text-align:right;
+		font-size:20px;
+		i{
+			cursor:pointer;
+		}
+	}
+	
+}
+
+</style>
diff --git a/src/styles/workflowcss/workflow.css b/src/styles/workflowcss/workflow.css
index 9b5a0e6cf..d7f309f26 100644
--- a/src/styles/workflowcss/workflow.css
+++ b/src/styles/workflowcss/workflow.css
@@ -922,8 +922,6 @@ html {
 
 @font-face {
   font-family: IconFont;
-  src: url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot");
-  src: url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.woff") format("woff"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.ttf") format("truetype"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.svg#IconFont") format("svg");
 }
 
 .iconfont {
diff --git a/src/styles/workflowcss/workflow.min.css b/src/styles/workflowcss/workflow.min.css
index 9634dc5c7..5841007d9 100644
--- a/src/styles/workflowcss/workflow.min.css
+++ b/src/styles/workflowcss/workflow.min.css
@@ -1 +1 @@
-body{background:#eee}@font-face{font-family:Chinese Quote;src:local("PingFang SC"),local("SimSun");unicode-range:u+2018, u+2019, u+201c, u+201d}body,html{width:100%}input::-ms-clear,input::-ms-reveal{display:none}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Chinese Quote, -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif;font-size:14px;font-variant:tabular-nums;line-height:1.5;color:rgba(0,0,0,0.65);background-color:#fff}[tabindex="-1"]:focus{outline:none !important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5em;color:rgba(0,0,0,0.85);font-weight:500}p{margin-top:0;margin-bottom:1em}abbr[data-original-title],abbr[title]{text-decoration:underline;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1em;font-style:normal;line-height:inherit}input[type=number],input[type=password],input[type=text],textarea{-webkit-appearance:none}dl,ol,ul{margin-top:0;margin-bottom:1em}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:500}dd{margin-bottom:.5em;margin-left:0}blockquote{margin:0 0 1em}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#1890ff;background-color:transparent;text-decoration:none;outline:none;cursor:pointer;transition:color .3s;-webkit-text-decoration-skip:objects}a:focus{text-decoration:underline;text-decoration-skip:auto}a:hover{color:#40a9ff}a:active{color:#096dd9}a:active,a:hover{outline:0;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular, Consolas, Liberation Mono, Menlo, Courier, monospace;font-size:1em}pre{margin-top:0;margin-bottom:1em;overflow:auto}figure{margin:0 0 1em}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input:not([type=range]),label,select,summary,textarea{touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75em;padding-bottom:.3em;color:rgba(0,0,0,0.45);text-align:left;caption-side:bottom}th{text-align:inherit}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit;color:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5em;font-size:1.5em;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none !important}mark{padding:.2em;background-color:#feffe6}::selection{background:#1890ff;color:#fff}.clearfix{zoom:1}.clearfix:after,.clearfix:before{content:"";display:table}.clearfix:after{clear:both}@font-face{font-family:anticon;font-display:fallback;src:url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.eot");src:url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.woff") format("woff"),url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.ttf") format("truetype"),url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.svg#iconfont") format("svg")}.anticon{display:inline-block;font-style:normal;vertical-align:baseline;text-align:center;text-transform:none;line-height:1;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.anticon:before{display:block;font-family:anticon !important}.anticon-close:before{content:"\E633"}.anticon-right:before{content:"\E61F"}.anticon-exclamation-circle{color:#f25643}.anticon-exclamation-circle:before{content:"\E62C"}.anticon-left:before{content:"\E620"}.anticon-close-circle:before{content:"\E62E"}.ant-btn{line-height:1.5;display:inline-block;font-weight:400;text-align:center;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:0 15px;font-size:14px;border-radius:4px;height:32px;user-select:none;transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);position:relative;color:rgba(0,0,0,0.65);background-color:#fff;border-color:#d9d9d9}.ant-btn>.anticon{line-height:1}.ant-btn,.ant-btn:active,.ant-btn:focus{outline:0}.ant-btn>a:only-child{color:currentColor}.ant-btn>a:only-child:after{content:"";position:absolute;top:0;left:0;bottom:0;right:0;background:transparent}.ant-btn:focus,.ant-btn:hover{color:#40a9ff;background-color:#fff;border-color:#40a9ff}.ant-btn:focus>a:only-child,.ant-btn:hover>a:only-child{color:currentColor}.ant-btn:focus>a:only-child:after,.ant-btn:hover>a:only-child:after{content:"";position:absolute;top:0;left:0;bottom:0;right:0;background:transparent}.ant-btn.active,.ant-btn:active{color:#096dd9;background-color:#fff;border-color:#096dd9}.ant-btn.active>a:only-child,.ant-btn:active>a:only-child{color:currentColor}.ant-btn.active>a:only-child:after,.ant-btn:active>a:only-child:after{content:"";position:absolute;top:0;left:0;bottom:0;right:0;background:transparent}.ant-btn.active,.ant-btn:active,.ant-btn:focus,.ant-btn:hover{background:#fff;text-decoration:none}.ant-btn>i,.ant-btn>span{pointer-events:none}.ant-btn:before{position:absolute;top:-1px;left:-1px;bottom:-1px;right:-1px;background:#fff;opacity:.35;content:"";border-radius:inherit;z-index:1;transition:opacity .2s;pointer-events:none;display:none}.ant-btn .anticon{transition:margin-left 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.ant-btn:active>span,.ant-btn:focus>span{position:relative}.ant-btn>.anticon+span,.ant-btn>span+.anticon{margin-left:8px}.fd-nav-container{display:inline-block;position:relative}.fd-nav-container .ghost-bar{position:absolute;width:150px;height:100%;left:0;background:#1583f2;-webkit-transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.fd-nav-container .ghost-bar:after{content:"";position:absolute;bottom:0;left:50%;margin-left:-5px;width:0;height:0;border-style:solid;border-width:0 5px 6px;border-color:transparent transparent #f6f6f6}.fd-nav-item{position:relative;cursor:pointer;display:inline-block;line-height:60px;width:150px;text-align:center;white-space:nowrap}.fd-nav-item .order-num{display:inline-block;width:20px;height:20px;line-height:20px;border:1px solid #fff;border-radius:50%;margin-right:6px;-webkit-transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.fd-nav-item.active .order-num{color:#1583f2;background:#fff}.ant-input{font-family:Chinese Quote, -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif;font-variant:tabular-nums;box-sizing:border-box;margin:0;padding:0;list-style:none;position:relative;display:inline-block;padding:4px 11px;width:100%;height:32px;font-size:14px;line-height:1.5;color:rgba(0,0,0,0.65);background-color:#fff;background-image:none;border:1px solid #d9d9d9;border-radius:4px;transition:all .3s}.ant-input::-moz-placeholder{color:#bfbfbf;opacity:1}.ant-input:-ms-input-placeholder{color:#bfbfbf}.ant-input::-webkit-input-placeholder{color:#bfbfbf}.ant-input:focus,.ant-input:hover{border-color:#40a9ff;border-right-width:1px !important}.ant-input:focus{outline:0;box-shadow:0 0 0 2px rgba(24,144,255,0.2)}textarea.ant-input{max-width:100%;height:auto;vertical-align:bottom;transition:all .3s, height 0s;min-height:32px}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;outline:0;font-size:100%;font:inherit;vertical-align:baseline}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body,html{font-size:14px}body{font-family:Microsoft Yahei, Lucida Grande, Lucida Sans Unicode, Helvetica, Arial, Verdana, sans-serif;line-height:1.6;background-color:#fff;position:static !important;-webkit-tap-highlight-color:transparent}ol,ul{list-style-type:none}b,strong{font-weight:700}img{border:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}textarea{overflow:auto;vertical-align:top;-webkit-appearance:none}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}table{width:100%;border-spacing:0;border-collapse:collapse}table,td,th{border:0}td,th{padding:0;vertical-align:top}th{font-weight:700;text-align:left}thead th{white-space:nowrap}a{text-decoration:none;cursor:pointer;color:#3296fa}a:active,a:hover{outline:0;color:#3296fa}small{font-size:80%}body,html{font-size:12px !important;color:#191f25 !important;background:#f6f6f6 !important}.wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;height:100%}@font-face{font-family:IconFont;src:url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot");src:url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot?#iefix") format("embedded-opentype"),url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.woff") format("woff"),url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.ttf") format("truetype"),url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.svg#IconFont") format("svg")}.iconfont{font-family:IconFont !important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-webkit-text-stroke-width:.2px;-moz-osx-font-smoothing:grayscale}.fd-nav{position:fixed;top:0;left:0;right:0;z-index:997;width:100%;height:60px;font-size:14px;color:#fff;background:#3296fa;display:flex;align-items:center}.fd-nav>*{flex:1;width:100%}.fd-nav .fd-nav-left{display:-webkit-box;display:flex;align-items:center}.fd-nav .fd-nav-center{flex:none;width:600px;text-align:center}.fd-nav .fd-nav-right{display:flex;align-items:center;justify-content:flex-end;text-align:right}.fd-nav .fd-nav-back{display:inline-block;width:60px;height:60px;font-size:22px;border-right:1px solid #1583f2;text-align:center;cursor:pointer}.fd-nav .fd-nav-back:hover{background:#5af}.fd-nav .fd-nav-back:active{background:#1583f2}.fd-nav .fd-nav-back .anticon{line-height:60px}.fd-nav .fd-nav-title{width:0;flex:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;padding:0 15px}.fd-nav a{color:#fff;margin-left:12px}.fd-nav .button-publish{min-width:80px;margin-left:4px;margin-right:15px;color:#3296fa;border-color:#fff}.fd-nav .button-publish.ant-btn:focus,.fd-nav .button-publish.ant-btn:hover{color:#3296fa;border-color:#fff;box-shadow:0 10px 20px 0 rgba(0,0,0,0.3)}.fd-nav .button-publish.ant-btn:active{color:#3296fa;background:#d6eaff;box-shadow:none}.fd-nav .button-preview{min-width:80px;margin-left:16px;margin-right:4px;color:#fff;border-color:#fff;background:transparent}.fd-nav .button-preview.ant-btn:focus,.fd-nav .button-preview.ant-btn:hover{color:#fff;border-color:#fff;background:#59acfc}.fd-nav .button-preview.ant-btn:active{color:#fff;border-color:#fff;background:#2186ef}.fd-nav-content{position:fixed;top:60px;left:0;right:0;bottom:0;z-index:1;overflow-x:hidden;overflow-y:auto;padding-bottom:30px}.fd-nav-content-new{position:relative;width:initial;height:calc(100% - 60px);overflow-x:hidden;overflow-y:auto;padding-bottom:30px}.error-modal-desc{font-size:13px;color:rgba(25,31,37,0.56);line-height:22px;margin-bottom:14px}.error-modal-list{height:200px;overflow-y:auto;margin-right:-25px;padding-right:25px}.error-modal-item{padding:10px 20px;line-height:21px;background:#f6f6f6;display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;border-radius:4px}.error-modal-item-label{flex:none;font-size:15px;color:rgba(25,31,37,0.56);padding-right:10px}.error-modal-item-content{text-align:right;flex:1;font-size:13px;color:#191f25}#body.blur{-webkit-filter:blur(3px);filter:blur(3px)}.zoom{display:flex;position:fixed;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;height:40px;width:125px;right:40px;margin-top:30px;z-index:10}.zoom .zoom-in,.zoom .zoom-out{width:30px;height:30px;background:#fff;color:#c1c1cd;cursor:pointer;background-size:100%;background-repeat:no-repeat}.zoom .zoom-out{background-image:url(https://gw.alicdn.com/tfs/TB1s0qhBHGYBuNjy0FoXXciBFXa-90-90.png)}.zoom .zoom-out.disabled{opacity:.5}.zoom .zoom-in{background-image:url(https://gw.alicdn.com/tfs/TB1UIgJBTtYBeNjy1XdXXXXyVXa-90-90.png)}.zoom .zoom-in.disabled{opacity:.5}.auto-judge:hover .editable-title,.node-wrap-box:hover .editable-title{border-bottom:1px dashed #fff}.auto-judge:hover .editable-title.editing,.node-wrap-box:hover .editable-title.editing{text-decoration:none;border:1px solid #d9d9d9}.auto-judge:hover .editable-title{border-color:#15bc83}.editable-title{line-height:15px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;border-bottom:1px dashed transparent}.editable-title:before{content:"";position:absolute;top:0;left:0;bottom:0;right:40px}.editable-title:hover{border-bottom:1px dashed #fff}.editable-title-input{flex:none;height:18px;padding-left:4px;text-indent:0;font-size:12px;line-height:18px;z-index:1}.editable-title-input:hover{text-decoration:none}.ant-btn{position:relative}.node-wrap-box{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;position:relative;width:220px;min-height:72px;-ms-flex-negative:0;flex-shrink:0;background:#fff;border-radius:4px;cursor:pointer}.node-wrap-box:after{pointer-events:none;content:"";position:absolute;top:0;bottom:0;left:0;right:0;z-index:2;border-radius:4px;border:1px solid transparent;transition:all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.node-wrap-box.active:after,.node-wrap-box:active:after,.node-wrap-box:hover:after{border:1px solid #3296fa;box-shadow:0 0 6px 0 rgba(50,150,250,0.3)}.node-wrap-box.active .close,.node-wrap-box:active .close,.node-wrap-box:hover .close{display:block}.node-wrap-box.error:after{border:1px solid #f25643;box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.node-wrap-box .title{position:relative;display:flex;align-items:center;padding-left:16px;padding-right:30px;width:100%;height:24px;line-height:24px;font-size:12px;color:#fff;text-align:left;background:#576a95;border-radius:4px 4px 0 0}.node-wrap-box .title .iconfont{font-size:12px;margin-right:5px}.node-wrap-box .placeholder{color:#bfbfbf}.node-wrap-box .close{display:none;position:absolute;right:10px;top:50%;transform:translateY(-50%);width:20px;height:20px;font-size:14px;color:#fff;border-radius:50%;text-align:center;line-height:20px}.node-wrap-box .content{position:relative;font-size:14px;padding:16px;padding-right:30px}.node-wrap-box .content .text{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.node-wrap-box .content .arrow{position:absolute;right:10px;top:50%;transform:translateY(-50%);width:20px;height:14px;font-size:14px;color:#979797}.start-node.node-wrap-box .content .text{display:block;white-space:nowrap}.node-wrap-box:before{content:"";position:absolute;top:-12px;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:0;height:4px;border-style:solid;border-width:8px 6px 4px;border-color:#cacaca transparent transparent;background:#f5f5f7}.node-wrap-box.start-node:before{content:none}.top-left-cover-line{left:-1px}.top-left-cover-line,.top-right-cover-line{position:absolute;height:8px;width:50%;background-color:#f5f5f7;top:-4px}.top-right-cover-line{right:-1px}.bottom-left-cover-line{left:-1px}.bottom-left-cover-line,.bottom-right-cover-line{position:absolute;height:8px;width:50%;background-color:#f5f5f7;bottom:-4px}.bottom-right-cover-line{right:-1px}.dingflow-design{width:100%;background-color:#f5f5f7;overflow:auto;position:absolute;bottom:0;left:0;right:0;top:0}.dingflow-design .box-scale{transform:scale(1);display:inline-block;position:relative;width:100%;padding:54.5px 0;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-ms-flex-wrap:wrap;flex-wrap:wrap;min-width:-webkit-min-content;min-width:-moz-min-content;min-width:min-content;background-color:#f5f5f7;transform-origin:50% 0px 0px}.dingflow-design .node-wrap{flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-flex:1;-ms-flex-positive:1;padding:0 50px;position:relative}.dingflow-design .branch-wrap,.dingflow-design .node-wrap{display:inline-flex;width:100%}.dingflow-design .branch-box-wrap{display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:270px;width:100%;-ms-flex-negative:0;flex-shrink:0}.dingflow-design .branch-box{display:flex;overflow:visible;min-height:180px;height:auto;border-bottom:2px solid #ccc;border-top:2px solid #ccc;position:relative;margin-top:15px}.dingflow-design .branch-box .col-box{background:#f5f5f7}.dingflow-design .branch-box .col-box:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;z-index:0;margin:auto;width:2px;height:100%;background-color:#cacaca}.dingflow-design .add-branch{border:none;outline:none;user-select:none;justify-content:center;font-size:12px;padding:0 10px;height:30px;line-height:30px;border-radius:15px;color:#3296fa;background:#fff;box-shadow:0 2px 4px 0 rgba(0,0,0,0.1);position:absolute;top:-16px;left:50%;transform:translateX(-50%);transform-origin:center center;cursor:pointer;z-index:1;display:inline-flex;align-items:center;-webkit-transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.dingflow-design .add-branch:hover{transform:translateX(-50%) scale(1.1);box-shadow:0 8px 16px 0 rgba(0,0,0,0.1)}.dingflow-design .add-branch:active{transform:translateX(-50%);box-shadow:none}.dingflow-design .col-box{display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;-webkit-box-align:center;align-items:center;position:relative}.dingflow-design .condition-node{min-height:220px}.dingflow-design .condition-node,.dingflow-design .condition-node-box{display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;-webkit-box-flex:1}.dingflow-design .condition-node-box{padding-top:30px;padding-right:50px;padding-left:50px;-webkit-box-pack:center;justify-content:center;-webkit-box-align:center;align-items:center;flex-grow:1;position:relative}.dingflow-design .condition-node-box:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;width:2px;height:100%;background-color:#cacaca}.dingflow-design .auto-judge{position:relative;width:220px;min-height:72px;background:#fff;border-radius:4px;padding:14px 19px;cursor:pointer}.dingflow-design .auto-judge:after{pointer-events:none;content:"";position:absolute;top:0;bottom:0;left:0;right:0;z-index:2;border-radius:4px;border:1px solid transparent;transition:all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.dingflow-design .auto-judge.active:after,.dingflow-design .auto-judge:active:after,.dingflow-design .auto-judge:hover:after{border:1px solid #3296fa;box-shadow:0 0 6px 0 rgba(50,150,250,0.3)}.dingflow-design .auto-judge.active .close,.dingflow-design .auto-judge:active .close,.dingflow-design .auto-judge:hover .close{display:block}.dingflow-design .auto-judge.error:after{border:1px solid #f25643;box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.dingflow-design .auto-judge .title-wrapper{position:relative;font-size:12px;color:#15bc83;text-align:left;line-height:16px}.dingflow-design .auto-judge .title-wrapper .editable-title{display:inline-block;max-width:120px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dingflow-design .auto-judge .title-wrapper .priority-title{display:inline-block;float:right;margin-right:10px;color:rgba(25,31,37,0.56)}.dingflow-design .auto-judge .placeholder{color:#bfbfbf}.dingflow-design .auto-judge .close{display:none;position:absolute;right:-10px;top:-10px;width:20px;height:20px;font-size:14px;color:rgba(0,0,0,0.25);border-radius:50%;text-align:center;line-height:20px;z-index:2}.dingflow-design .auto-judge .content{font-size:14px;color:#191f25;text-align:left;margin-top:6px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.dingflow-design .auto-judge .sort-left,.dingflow-design .auto-judge .sort-right{position:absolute;top:0;bottom:0;display:none;z-index:1}.dingflow-design .auto-judge .sort-left{left:0;border-right:1px solid #f6f6f6}.dingflow-design .auto-judge .sort-right{right:0;border-left:1px solid #f6f6f6}.dingflow-design .auto-judge:hover .sort-left,.dingflow-design .auto-judge:hover .sort-right{display:flex;align-items:center}.dingflow-design .auto-judge .sort-left:hover,.dingflow-design .auto-judge .sort-right:hover{background:#efefef}.dingflow-design .end-node{border-radius:50%;font-size:14px;color:rgba(25,31,37,0.4);text-align:left}.dingflow-design .end-node .end-node-circle{width:10px;height:10px;margin:auto;border-radius:50%;background:#dbdcdc}.dingflow-design .end-node .end-node-text{margin-top:5px;text-align:center}.approval-setting{border-radius:2px;margin:20px 0;position:relative;background:#fff}.ant-btn{position:relative}
+body{background:#eee}@font-face{font-family:Chinese Quote;src:local("PingFang SC"),local("SimSun");unicode-range:u+2018, u+2019, u+201c, u+201d}body,html{width:100%}input::-ms-clear,input::-ms-reveal{display:none}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Chinese Quote, -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif;font-size:14px;font-variant:tabular-nums;line-height:1.5;color:rgba(0,0,0,0.65);background-color:#fff}[tabindex="-1"]:focus{outline:none !important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5em;color:rgba(0,0,0,0.85);font-weight:500}p{margin-top:0;margin-bottom:1em}abbr[data-original-title],abbr[title]{text-decoration:underline;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1em;font-style:normal;line-height:inherit}input[type=number],input[type=password],input[type=text],textarea{-webkit-appearance:none}dl,ol,ul{margin-top:0;margin-bottom:1em}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:500}dd{margin-bottom:.5em;margin-left:0}blockquote{margin:0 0 1em}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#1890ff;background-color:transparent;text-decoration:none;outline:none;cursor:pointer;transition:color .3s;-webkit-text-decoration-skip:objects}a:focus{text-decoration:underline;text-decoration-skip:auto}a:hover{color:#40a9ff}a:active{color:#096dd9}a:active,a:hover{outline:0;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular, Consolas, Liberation Mono, Menlo, Courier, monospace;font-size:1em}pre{margin-top:0;margin-bottom:1em;overflow:auto}figure{margin:0 0 1em}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input:not([type=range]),label,select,summary,textarea{touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75em;padding-bottom:.3em;color:rgba(0,0,0,0.45);text-align:left;caption-side:bottom}th{text-align:inherit}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit;color:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5em;font-size:1.5em;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none !important}mark{padding:.2em;background-color:#feffe6}::selection{background:#1890ff;color:#fff}.clearfix{zoom:1}.clearfix:after,.clearfix:before{content:"";display:table}.clearfix:after{clear:both}@font-face{font-family:anticon;font-display:fallback;src:url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.eot");src:url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.woff") format("woff"),url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.ttf") format("truetype"),url("https://at.alicdn.com/t/font_148784_v4ggb6wrjmkotj4i.svg#iconfont") format("svg")}.anticon{display:inline-block;font-style:normal;vertical-align:baseline;text-align:center;text-transform:none;line-height:1;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.anticon:before{display:block;font-family:anticon !important}.anticon-close:before{content:"\E633"}.anticon-right:before{content:"\E61F"}.anticon-exclamation-circle{color:#f25643}.anticon-exclamation-circle:before{content:"\E62C"}.anticon-left:before{content:"\E620"}.anticon-close-circle:before{content:"\E62E"}.ant-btn{line-height:1.5;display:inline-block;font-weight:400;text-align:center;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:0 15px;font-size:14px;border-radius:4px;height:32px;user-select:none;transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);position:relative;color:rgba(0,0,0,0.65);background-color:#fff;border-color:#d9d9d9}.ant-btn>.anticon{line-height:1}.ant-btn,.ant-btn:active,.ant-btn:focus{outline:0}.ant-btn>a:only-child{color:currentColor}.ant-btn>a:only-child:after{content:"";position:absolute;top:0;left:0;bottom:0;right:0;background:transparent}.ant-btn:focus,.ant-btn:hover{color:#40a9ff;background-color:#fff;border-color:#40a9ff}.ant-btn:focus>a:only-child,.ant-btn:hover>a:only-child{color:currentColor}.ant-btn:focus>a:only-child:after,.ant-btn:hover>a:only-child:after{content:"";position:absolute;top:0;left:0;bottom:0;right:0;background:transparent}.ant-btn.active,.ant-btn:active{color:#096dd9;background-color:#fff;border-color:#096dd9}.ant-btn.active>a:only-child,.ant-btn:active>a:only-child{color:currentColor}.ant-btn.active>a:only-child:after,.ant-btn:active>a:only-child:after{content:"";position:absolute;top:0;left:0;bottom:0;right:0;background:transparent}.ant-btn.active,.ant-btn:active,.ant-btn:focus,.ant-btn:hover{background:#fff;text-decoration:none}.ant-btn>i,.ant-btn>span{pointer-events:none}.ant-btn:before{position:absolute;top:-1px;left:-1px;bottom:-1px;right:-1px;background:#fff;opacity:.35;content:"";border-radius:inherit;z-index:1;transition:opacity .2s;pointer-events:none;display:none}.ant-btn .anticon{transition:margin-left 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.ant-btn:active>span,.ant-btn:focus>span{position:relative}.ant-btn>.anticon+span,.ant-btn>span+.anticon{margin-left:8px}.fd-nav-container{display:inline-block;position:relative}.fd-nav-container .ghost-bar{position:absolute;width:150px;height:100%;left:0;background:#1583f2;-webkit-transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.fd-nav-container .ghost-bar:after{content:"";position:absolute;bottom:0;left:50%;margin-left:-5px;width:0;height:0;border-style:solid;border-width:0 5px 6px;border-color:transparent transparent #f6f6f6}.fd-nav-item{position:relative;cursor:pointer;display:inline-block;line-height:60px;width:150px;text-align:center;white-space:nowrap}.fd-nav-item .order-num{display:inline-block;width:20px;height:20px;line-height:20px;border:1px solid #fff;border-radius:50%;margin-right:6px;-webkit-transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.fd-nav-item.active .order-num{color:#1583f2;background:#fff}.ant-input{font-family:Chinese Quote, -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif;font-variant:tabular-nums;box-sizing:border-box;margin:0;padding:0;list-style:none;position:relative;display:inline-block;padding:4px 11px;width:100%;height:32px;font-size:14px;line-height:1.5;color:rgba(0,0,0,0.65);background-color:#fff;background-image:none;border:1px solid #d9d9d9;border-radius:4px;transition:all .3s}.ant-input::-moz-placeholder{color:#bfbfbf;opacity:1}.ant-input:-ms-input-placeholder{color:#bfbfbf}.ant-input::-webkit-input-placeholder{color:#bfbfbf}.ant-input:focus,.ant-input:hover{border-color:#40a9ff;border-right-width:1px !important}.ant-input:focus{outline:0;box-shadow:0 0 0 2px rgba(24,144,255,0.2)}textarea.ant-input{max-width:100%;height:auto;vertical-align:bottom;transition:all .3s, height 0s;min-height:32px}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,p,pre,q,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;outline:0;font-size:100%;font:inherit;vertical-align:baseline}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body,html{font-size:14px}body{font-family:Microsoft Yahei, Lucida Grande, Lucida Sans Unicode, Helvetica, Arial, Verdana, sans-serif;line-height:1.6;background-color:#fff;position:static !important;-webkit-tap-highlight-color:transparent}ol,ul{list-style-type:none}b,strong{font-weight:700}img{border:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}textarea{overflow:auto;vertical-align:top;-webkit-appearance:none}button,input{line-height:normal}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}table{width:100%;border-spacing:0;border-collapse:collapse}table,td,th{border:0}td,th{padding:0;vertical-align:top}th{font-weight:700;text-align:left}thead th{white-space:nowrap}a{text-decoration:none;cursor:pointer;color:#3296fa}a:active,a:hover{outline:0;color:#3296fa}small{font-size:80%}body,html{font-size:12px !important;color:#191f25 !important;background:#f6f6f6 !important}.wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;height:100%}@font-face{font-family:IconFont}.iconfont{font-family:IconFont !important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-webkit-text-stroke-width:.2px;-moz-osx-font-smoothing:grayscale}.fd-nav{position:fixed;top:0;left:0;right:0;z-index:997;width:100%;height:60px;font-size:14px;color:#fff;background:#3296fa;display:flex;align-items:center}.fd-nav>*{flex:1;width:100%}.fd-nav .fd-nav-left{display:-webkit-box;display:flex;align-items:center}.fd-nav .fd-nav-center{flex:none;width:600px;text-align:center}.fd-nav .fd-nav-right{display:flex;align-items:center;justify-content:flex-end;text-align:right}.fd-nav .fd-nav-back{display:inline-block;width:60px;height:60px;font-size:22px;border-right:1px solid #1583f2;text-align:center;cursor:pointer}.fd-nav .fd-nav-back:hover{background:#5af}.fd-nav .fd-nav-back:active{background:#1583f2}.fd-nav .fd-nav-back .anticon{line-height:60px}.fd-nav .fd-nav-title{width:0;flex:1;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;padding:0 15px}.fd-nav a{color:#fff;margin-left:12px}.fd-nav .button-publish{min-width:80px;margin-left:4px;margin-right:15px;color:#3296fa;border-color:#fff}.fd-nav .button-publish.ant-btn:focus,.fd-nav .button-publish.ant-btn:hover{color:#3296fa;border-color:#fff;box-shadow:0 10px 20px 0 rgba(0,0,0,0.3)}.fd-nav .button-publish.ant-btn:active{color:#3296fa;background:#d6eaff;box-shadow:none}.fd-nav .button-preview{min-width:80px;margin-left:16px;margin-right:4px;color:#fff;border-color:#fff;background:transparent}.fd-nav .button-preview.ant-btn:focus,.fd-nav .button-preview.ant-btn:hover{color:#fff;border-color:#fff;background:#59acfc}.fd-nav .button-preview.ant-btn:active{color:#fff;border-color:#fff;background:#2186ef}.fd-nav-content{position:fixed;top:60px;left:0;right:0;bottom:0;z-index:1;overflow-x:hidden;overflow-y:auto;padding-bottom:30px}.fd-nav-content-new{position:relative;width:initial;height:calc(100% - 60px);overflow-x:hidden;overflow-y:auto;padding-bottom:30px}.error-modal-desc{font-size:13px;color:rgba(25,31,37,0.56);line-height:22px;margin-bottom:14px}.error-modal-list{height:200px;overflow-y:auto;margin-right:-25px;padding-right:25px}.error-modal-item{padding:10px 20px;line-height:21px;background:#f6f6f6;display:flex;justify-content:space-between;align-items:center;margin-bottom:8px;border-radius:4px}.error-modal-item-label{flex:none;font-size:15px;color:rgba(25,31,37,0.56);padding-right:10px}.error-modal-item-content{text-align:right;flex:1;font-size:13px;color:#191f25}#body.blur{-webkit-filter:blur(3px);filter:blur(3px)}.zoom{display:flex;position:fixed;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;height:40px;width:125px;right:40px;margin-top:30px;z-index:10}.zoom .zoom-in,.zoom .zoom-out{width:30px;height:30px;background:#fff;color:#c1c1cd;cursor:pointer;background-size:100%;background-repeat:no-repeat}.zoom .zoom-out{background-image:url(https://gw.alicdn.com/tfs/TB1s0qhBHGYBuNjy0FoXXciBFXa-90-90.png)}.zoom .zoom-out.disabled{opacity:.5}.zoom .zoom-in{background-image:url(https://gw.alicdn.com/tfs/TB1UIgJBTtYBeNjy1XdXXXXyVXa-90-90.png)}.zoom .zoom-in.disabled{opacity:.5}.auto-judge:hover .editable-title,.node-wrap-box:hover .editable-title{border-bottom:1px dashed #fff}.auto-judge:hover .editable-title.editing,.node-wrap-box:hover .editable-title.editing{text-decoration:none;border:1px solid #d9d9d9}.auto-judge:hover .editable-title{border-color:#15bc83}.editable-title{line-height:15px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;border-bottom:1px dashed transparent}.editable-title:before{content:"";position:absolute;top:0;left:0;bottom:0;right:40px}.editable-title:hover{border-bottom:1px dashed #fff}.editable-title-input{flex:none;height:18px;padding-left:4px;text-indent:0;font-size:12px;line-height:18px;z-index:1}.editable-title-input:hover{text-decoration:none}.ant-btn{position:relative}.node-wrap-box{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;position:relative;width:220px;min-height:72px;-ms-flex-negative:0;flex-shrink:0;background:#fff;border-radius:4px;cursor:pointer}.node-wrap-box:after{pointer-events:none;content:"";position:absolute;top:0;bottom:0;left:0;right:0;z-index:2;border-radius:4px;border:1px solid transparent;transition:all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.node-wrap-box.active:after,.node-wrap-box:active:after,.node-wrap-box:hover:after{border:1px solid #3296fa;box-shadow:0 0 6px 0 rgba(50,150,250,0.3)}.node-wrap-box.active .close,.node-wrap-box:active .close,.node-wrap-box:hover .close{display:block}.node-wrap-box.error:after{border:1px solid #f25643;box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.node-wrap-box .title{position:relative;display:flex;align-items:center;padding-left:16px;padding-right:30px;width:100%;height:24px;line-height:24px;font-size:12px;color:#fff;text-align:left;background:#576a95;border-radius:4px 4px 0 0}.node-wrap-box .title .iconfont{font-size:12px;margin-right:5px}.node-wrap-box .placeholder{color:#bfbfbf}.node-wrap-box .close{display:none;position:absolute;right:10px;top:50%;transform:translateY(-50%);width:20px;height:20px;font-size:14px;color:#fff;border-radius:50%;text-align:center;line-height:20px}.node-wrap-box .content{position:relative;font-size:14px;padding:16px;padding-right:30px}.node-wrap-box .content .text{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.node-wrap-box .content .arrow{position:absolute;right:10px;top:50%;transform:translateY(-50%);width:20px;height:14px;font-size:14px;color:#979797}.start-node.node-wrap-box .content .text{display:block;white-space:nowrap}.node-wrap-box:before{content:"";position:absolute;top:-12px;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%);width:0;height:4px;border-style:solid;border-width:8px 6px 4px;border-color:#cacaca transparent transparent;background:#f5f5f7}.node-wrap-box.start-node:before{content:none}.top-left-cover-line{left:-1px}.top-left-cover-line,.top-right-cover-line{position:absolute;height:8px;width:50%;background-color:#f5f5f7;top:-4px}.top-right-cover-line{right:-1px}.bottom-left-cover-line{left:-1px}.bottom-left-cover-line,.bottom-right-cover-line{position:absolute;height:8px;width:50%;background-color:#f5f5f7;bottom:-4px}.bottom-right-cover-line{right:-1px}.dingflow-design{width:100%;background-color:#f5f5f7;overflow:auto;position:absolute;bottom:0;left:0;right:0;top:0}.dingflow-design .box-scale{transform:scale(1);display:inline-block;position:relative;width:100%;padding:54.5px 0;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-ms-flex-wrap:wrap;flex-wrap:wrap;min-width:-webkit-min-content;min-width:-moz-min-content;min-width:min-content;background-color:#f5f5f7;transform-origin:50% 0px 0px}.dingflow-design .node-wrap{flex-direction:column;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-flex:1;-ms-flex-positive:1;padding:0 50px;position:relative}.dingflow-design .branch-wrap,.dingflow-design .node-wrap{display:inline-flex;width:100%}.dingflow-design .branch-box-wrap{display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:270px;width:100%;-ms-flex-negative:0;flex-shrink:0}.dingflow-design .branch-box{display:flex;overflow:visible;min-height:180px;height:auto;border-bottom:2px solid #ccc;border-top:2px solid #ccc;position:relative;margin-top:15px}.dingflow-design .branch-box .col-box{background:#f5f5f7}.dingflow-design .branch-box .col-box:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;z-index:0;margin:auto;width:2px;height:100%;background-color:#cacaca}.dingflow-design .add-branch{border:none;outline:none;user-select:none;justify-content:center;font-size:12px;padding:0 10px;height:30px;line-height:30px;border-radius:15px;color:#3296fa;background:#fff;box-shadow:0 2px 4px 0 rgba(0,0,0,0.1);position:absolute;top:-16px;left:50%;transform:translateX(-50%);transform-origin:center center;cursor:pointer;z-index:1;display:inline-flex;align-items:center;-webkit-transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);transition:all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1)}.dingflow-design .add-branch:hover{transform:translateX(-50%) scale(1.1);box-shadow:0 8px 16px 0 rgba(0,0,0,0.1)}.dingflow-design .add-branch:active{transform:translateX(-50%);box-shadow:none}.dingflow-design .col-box{display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;-webkit-box-align:center;align-items:center;position:relative}.dingflow-design .condition-node{min-height:220px}.dingflow-design .condition-node,.dingflow-design .condition-node-box{display:inline-flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;-webkit-box-flex:1}.dingflow-design .condition-node-box{padding-top:30px;padding-right:50px;padding-left:50px;-webkit-box-pack:center;justify-content:center;-webkit-box-align:center;align-items:center;flex-grow:1;position:relative}.dingflow-design .condition-node-box:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;width:2px;height:100%;background-color:#cacaca}.dingflow-design .auto-judge{position:relative;width:220px;min-height:72px;background:#fff;border-radius:4px;padding:14px 19px;cursor:pointer}.dingflow-design .auto-judge:after{pointer-events:none;content:"";position:absolute;top:0;bottom:0;left:0;right:0;z-index:2;border-radius:4px;border:1px solid transparent;transition:all 0.1s cubic-bezier(0.645, 0.045, 0.355, 1);box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.dingflow-design .auto-judge.active:after,.dingflow-design .auto-judge:active:after,.dingflow-design .auto-judge:hover:after{border:1px solid #3296fa;box-shadow:0 0 6px 0 rgba(50,150,250,0.3)}.dingflow-design .auto-judge.active .close,.dingflow-design .auto-judge:active .close,.dingflow-design .auto-judge:hover .close{display:block}.dingflow-design .auto-judge.error:after{border:1px solid #f25643;box-shadow:0 2px 5px 0 rgba(0,0,0,0.1)}.dingflow-design .auto-judge .title-wrapper{position:relative;font-size:12px;color:#15bc83;text-align:left;line-height:16px}.dingflow-design .auto-judge .title-wrapper .editable-title{display:inline-block;max-width:120px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.dingflow-design .auto-judge .title-wrapper .priority-title{display:inline-block;float:right;margin-right:10px;color:rgba(25,31,37,0.56)}.dingflow-design .auto-judge .placeholder{color:#bfbfbf}.dingflow-design .auto-judge .close{display:none;position:absolute;right:-10px;top:-10px;width:20px;height:20px;font-size:14px;color:rgba(0,0,0,0.25);border-radius:50%;text-align:center;line-height:20px;z-index:2}.dingflow-design .auto-judge .content{font-size:14px;color:#191f25;text-align:left;margin-top:6px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.dingflow-design .auto-judge .sort-left,.dingflow-design .auto-judge .sort-right{position:absolute;top:0;bottom:0;display:none;z-index:1}.dingflow-design .auto-judge .sort-left{left:0;border-right:1px solid #f6f6f6}.dingflow-design .auto-judge .sort-right{right:0;border-left:1px solid #f6f6f6}.dingflow-design .auto-judge:hover .sort-left,.dingflow-design .auto-judge:hover .sort-right{display:flex;align-items:center}.dingflow-design .auto-judge .sort-left:hover,.dingflow-design .auto-judge .sort-right:hover{background:#efefef}.dingflow-design .end-node{border-radius:50%;font-size:14px;color:rgba(25,31,37,0.4);text-align:left}.dingflow-design .end-node .end-node-circle{width:10px;height:10px;margin:auto;border-radius:50%;background:#dbdcdc}.dingflow-design .end-node .end-node-text{margin-top:5px;text-align:center}.approval-setting{border-radius:2px;margin:20px 0;position:relative;background:#fff}.ant-btn{position:relative}
diff --git a/src/styles/workflowcss/workflow.scss b/src/styles/workflowcss/workflow.scss
index e4858ea6d..fae82ccdf 100644
--- a/src/styles/workflowcss/workflow.scss
+++ b/src/styles/workflowcss/workflow.scss
@@ -918,8 +918,8 @@ html {
 
 @font-face {
     font-family: IconFont;
-    src: url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot");
-    src: url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.woff") format("woff"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.ttf") format("truetype"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.svg#IconFont") format("svg")
+    // src: url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot");
+    // src: url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.woff") format("woff"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.ttf") format("truetype"), url("//at.alicdn.com/t/font_135284_ph2thxxbzgf.svg#IconFont") format("svg")
 }
 
 .iconfont {
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 590c89b93..cd8cead5a 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -115,6 +115,7 @@ declare module '@vue/runtime-core' {
     FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default']
     FormPage: typeof import('./../components/DesignForm/app/formPage.vue')['default']
     FormPageCont: typeof import('./../components/DesignForm/tableListPage/formPageCont.vue')['default']
+    FormPageContApp: typeof import('./../components/DesignForm/tableListPage/formPageContApp.vue')['default']
     FormVersion: typeof import('./../components/DesignForm/formVersion.vue')['default']
     FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default']
     GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default']
diff --git a/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue b/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue
index 14e99d823..1850d22c6 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/operationAction/AppEditPage.vue
@@ -122,6 +122,7 @@ watch(()=>props.isOpen,(val:Boolean)=>{
 						:sign-code="props.taskInfo.signCode"
 						:version-id="props.taskInfo.versionIdStr"
 						add-url="addData"
+						@close-page="drawerBeforeClose"
 					/>
 	</el-drawer>
 </template>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
index ead1f2a45..fe00df873 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
@@ -4,9 +4,13 @@
 @ 备注: 我创建的
 -->
 <script lang='ts' setup>
-
+import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
 import { gainAppAllTaskList } from "@/api/DesignForm/requestapi"
 
+//引入组件
+import FormPageCont from '@/components/DesignForm/tableListPage/formPageContApp.vue'
+import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue'
+
 const props = defineProps({
 	pickAppMenu:{
 		type:Object,
@@ -22,6 +26,7 @@ const selectInfo = reactive<taskflowquery>({
 	class:1,
 	id:props.pickAppMenu.appkey
 })
+const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
 const loading = ref(false)
 const searckFormRef  = ref(ElForm);
 const totals = ref<number>(0)	//总共多少条记录
@@ -55,9 +60,121 @@ const getToDoList = () =>{
 onMounted(() =>{
 	getToDoList()
 })
+
+const container = ref()	//实例化内容容器
+const drawerWith = ref();	//编辑表单时抽屉宽度
+const openTaskDrawer = ref(false)	//新增数据
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:24:06
+@ 功能: 查看详细内容
+*/
+const tablePageClass = ref(1)
+const lookPageInfoIsShow = ref(false)
+const pageInfoCont = ref<any>()
+const lookPageInfo = (val:any) => {
+	tablePageClass.value = 4;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+	
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-05 11:29:50
+@ 功能: 编辑表单内容
+*/
+
+const editInfo = (val:any) => {
+	console.log('修改数据!',val)
+	operState.value = 5;
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-10 15:32:55
+@ 功能: 提交审批
+*/
+const submitApproval = (val:any) => {
+	operState.value = 4
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 09:36:59
+@ 功能: 撤回申请
+*/
+const withdrawApplication  = (val:any) => {
+	console.log("撤回申请", val);
+	let sendInfo = {
+		id: val.runFlowIdStr,
+	}
+	retractRunWorkFlow(sendInfo)
+		.then((data)=>{
+			ElMessage({
+				message: '撤回成功！',
+				type: 'success'
+			})
+			getToDoList()
+		})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 11:17:42
+@ 功能: 重新提交申请
+*/
+const afreshSendFlow = (val:any) => {
+	operState.value = 2
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 11:19:21
+@ 功能: 申请修改数据
+*/
+const editFormSendFlow = (val:any) => {
+	operState.value = 3
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+const cancelEvent = (val:any) => {
+  console.log('cancel!',val)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:13:56
+@ 功能: 列表信息删除信息
+*/
+const confirmEvent = (val:any) => {
+	let sendData = {
+		id:[val.mastersKeyStr],
+		isTrue:2
+	}
+	softDeletion(sendData)
+		.then((data)=>{
+			console.log('cancel!',data)
+			ElNotification({
+				title: '温馨提示！',
+				message: data.mag,
+				type: 'success',
+			})
+			getToDoList()
+		})
+}
 </script>
 <template>
-	<div ref="myappbox" class="app_box">
+	<div ref="container" class="app_box">
 		<div class="app-container">
 			<div class="search">
 				<div class="titleBox">
@@ -106,7 +223,7 @@ onMounted(() =>{
 								草稿
 							</el-tag>
 							<el-tag
-								v-else-if="scope.row.status==2"
+								v-else-if="scope.row.status==2&&scope.row.types==1"
 								type="danger"
 								class="mx-1"
 								effect="plain"
@@ -114,6 +231,15 @@ onMounted(() =>{
 							>
 								驳回
 							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2&&scope.row.types!=1"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								发表
+							</el-tag>
 							<el-tag
 								v-else-if="scope.row.status==3"
 								type="success"
@@ -166,16 +292,84 @@ onMounted(() =>{
 							
 						</template>
 					</el-table-column>
-					<el-table-column fixed="right" align="center" label="操作" width="100" >
+					<el-table-column fixed="right" align="center" label="操作" width="200" >
 						<template #default="scope">
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="查看详情"
-								placement="top-end"
-							>
-								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,3)" />
-							</el-tooltip>
+								<el-button-group>
+									<el-tooltip
+										v-if="scope.row.types==1&&scope.row.status==1"
+										class="box-item"
+										effect="dark"
+										content="提交审批"
+										placement="top-end"
+									>
+										<el-button type="success" size="small" class="fa fa-send-o"   @click="submitApproval(scope.row)" />
+									</el-tooltip>
+
+									<el-tooltip
+										v-if="scope.row.types==1&&scope.row.status==2"
+										class="box-item"
+										effect="dark"
+										content="重新申请"
+										placement="top-end"
+									>
+										<el-button type="warning" size="small" class="fa fa-retweet"  @click="afreshSendFlow(scope.row)" />
+									</el-tooltip>
+									<el-tooltip
+										class="box-item"
+										effect="dark"
+										content="查看详情"
+										placement="top-end"
+									>
+										<el-button @click="lookPageInfo(scope.row)" type="primary" size="small" class="fa fa-eye"  />
+									</el-tooltip>
+									<el-popconfirm
+										v-if="scope.row.types==1&&scope.row.isRetract"
+										confirm-button-text="确定"
+										cancel-button-text="取消"
+										:icon="QuestionFilled"
+										icon-color="#F56C6C"
+										title="您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！"
+										@confirm="withdrawApplication (scope.row)"
+										@cancel="cancelEvent(scope.row)"
+									>
+										<template #reference>
+											<el-button  size="small" class="fa fa-reply-all"  />
+										</template>
+									</el-popconfirm>
+									<el-tooltip
+										v-if="scope.row.types==2"
+										class="box-item"
+										effect="dark"
+										content="编辑"
+										placement="top-end"
+									>
+										<el-button @click="editInfo(scope.row)" type="info" size="small" class="fa fa-edit"  />
+									</el-tooltip>
+									<el-popconfirm
+										v-if="scope.row.status==2||scope.row.status==1"
+										confirm-button-text="确定"
+										cancel-button-text="取消"
+										:icon="QuestionFilled"
+										icon-color="#F56C6C"
+										title="您确定要删除此条记录?一经删除！数据将不可恢复！"
+										@confirm="confirmEvent(scope.row)"
+										@cancel="cancelEvent(scope.row)"
+									>
+										<template #reference>
+											<el-button type="danger" size="small" class="fa fa-trash-o"  />
+										</template>
+									</el-popconfirm>
+
+									<el-tooltip
+										v-if="scope.row.types==1&&scope.row.status==4"
+										class="box-item"
+										effect="dark"
+										content="申请修改"
+										placement="top-end"
+									>
+										<el-button type="info" size="small" class="fa fa-edit" @click="editFormSendFlow(scope.row)" />
+									</el-tooltip>
+								</el-button-group>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -189,7 +383,10 @@ onMounted(() =>{
 
 
 			
-
+			<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getToDoList" />
+		
+		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" :pick-app-menu="pickAppMenu" @searchquery="getListData" />
+	
 
 
 		</div>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate_20240616.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate_20240616.vue
new file mode 100644
index 000000000..a5285c795
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate_20240616.vue
@@ -0,0 +1,229 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-05-31 13:59:06
+@ 备注: 我创建的
+-->
+<script lang='ts' setup>
+
+import { gainAppAllTaskList } from "@/api/DesignForm/requestapi"
+
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
+
+const selectInfo = reactive<taskflowquery>({
+	page: 1,
+	pagesize: 20,
+	class:1,
+	id:props.pickAppMenu.appkey
+})
+const loading = ref(false)
+const searckFormRef  = ref(ElForm);
+const totals = ref<number>(0)	//总共多少条记录
+const taskFlowAry = ref<any>([])  //记录数组
+//重置表单
+const resetQuery = () =>{
+	searckFormRef.value.resetFields();
+	initData();
+}
+//初始化数据
+const initData = () =>{
+	selectInfo.page = 1;
+	selectInfo.pagesize = 15;
+	selectInfo.title = ""
+	selectInfo.class = 3;
+	selectInfo.state = 0;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-07 09:28:35
+@ 功能: 加载数据
+*/
+const getToDoList = () =>{
+	gainAppAllTaskList(selectInfo)
+		.then((data) =>{
+			console.log("加载数据--->",data)
+			totals.value = data.data.total
+			taskFlowAry.value = data.data.list
+		})
+}
+onMounted(() =>{
+	getToDoList()
+})
+</script>
+<template>
+	<div ref="myappbox" class="app_box">
+		<div class="app-container">
+			<div class="search">
+				<div class="titleBox">
+					我创建的
+				</div>
+				<el-form ref="searckFormRef" :model="selectInfo" :inline="true">
+					<el-form-item label="任务标题" prop="name">
+						<el-input
+							v-model="selectInfo.title"
+							placeholder="请输入任务标题"
+							clearable
+							@keyup.enter="searchQuery"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" @click="getToDoList()"><i-ep-search />搜索</el-button>
+						<el-button @click="resetQuery()"><i-ep-refresh />重置</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-card shadow="never">
+				<el-table
+					v-loading="loading"
+					element-loading-text="Loading..."
+					highlight-current-row
+					:data="taskFlowAry"
+					border
+					class="table_box"
+				>
+					<el-table-column fixed label="标题" prop="title" width="500" />
+					<el-table-column  label="创建人" prop="creater"  width="200">
+						<template #default="scope">
+							{{ scope.row.createrInfo.name }}（<el-text  type="info">{{ scope.row.createrInfo.number }}</el-text>）	
+						</template>
+					</el-table-column>
+					<el-table-column  label="发起日期" prop="createrTimeStr" align="center"  width="300" />
+					<el-table-column  label="状态" prop="status"  align="center"  width="220" >
+						
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.status==1"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								草稿
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2&&scope.row.types==1"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								驳回
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==2&&scope.row.types!=1"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								发表
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==3"
+								type="success"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								审批中
+							</el-tag>
+							<el-tag
+								v-else-if="scope.row.status==4"
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								归档
+							</el-tag>
+							<el-tag
+								v-else
+								type="info"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								删除
+							</el-tag>
+						</template>
+						
+					</el-table-column>
+					<el-table-column label="任务性质" prop="currentStep" width="200" align="center">
+						<template #default="scope">
+							<el-tag
+								v-if="scope.row.types==1"
+								type="danger"
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								流程任务
+							</el-tag>
+							<el-tag
+								v-else
+								class="mx-1"
+								effect="plain"
+								round
+							>
+								普通任务
+							</el-tag>
+							
+						</template>
+					</el-table-column>
+					<el-table-column fixed="right" align="center" label="操作" width="100" >
+						<template #default="scope">
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="查看详情"
+								placement="top-end"
+							>
+								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,3)" />
+							</el-tooltip>
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-model:total="totals"
+					v-model:page="selectInfo.page"
+					v-model:limit="selectInfo.pagesize"
+					@pagination="getToDoList"
+				/>
+			</el-card>
+
+
+			
+
+
+
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.app_box{
+	width:100%;
+	overflow: hidden;
+	overflow-y: auto;
+	.search{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.titleBox{
+		font-size: 20px;
+   	 	margin-top: -20px;
+	}
+}
+.box-card {
+  width: 100%;
+}
+.table_box{
+	width: 100%;
+	height: calc(100vh - 260px);
+}
+</style>

From 182247ccf29a324bfb2ef4acabd5976f55574a23 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 18 Jun 2024 15:30:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8V1=E5=BC=80=E5=8F=91=E5=AE=8C=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/taskapi/management.ts                 |   9 +
 src/components/DesignForm/app/formPage.vue    |  10 +-
 src/components/DesignForm/app/index.vue       |   6 +
 .../DesignForm/public/form/childTable.vue     |   4 +
 .../DesignForm/public/form/formGroup.vue      |   1 +
 .../DesignForm/tableListPage/formPageCont.vue |  25 +-
 .../tableListPage/formPageContApp.vue         |  23 +-
 .../regularPage/completedMattersPage.vue      |  13 +
 .../runApp/regularPage/myCreate.vue           |   1 +
 .../runApp/regularPage/myDrafts.vue           |  31 ++-
 .../runApp/regularPage/myToDoPage.vue         |  30 ++-
 .../runApp/regularPage/sendCopy.vue           |  39 ++-
 .../taskmanagement/lookFlowInfoApp.vue        | 218 +++++++++++++++
 .../taskmanagement/runFlowStep.vue            |  18 +-
 .../taskmanagement/runFlowStepApp.vue         | 249 ++++++++++++++++++
 src/widget/number/index.vue                   |   4 +-
 16 files changed, 652 insertions(+), 29 deletions(-)
 create mode 100644 src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
 create mode 100644 src/views/taskplatform/taskmanagement/runFlowStepApp.vue

diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts
index 7213dc2c9..15fecf442 100644
--- a/src/api/taskapi/management.ts
+++ b/src/api/taskapi/management.ts
@@ -84,6 +84,7 @@ export function gainTaskFormInfo(data: customerFormLogo):AxiosPromise<customerFo
 		data: data
 	});
 }
+
 //获取工作流步进节点
 export function softDeletion(data: any):any{
 	return request({
@@ -149,6 +150,14 @@ export function authorizeWorkflow(data?:any){
 		data: data
 	});
 }
+
+export function runTaskFlow(data?:any){
+	return request({
+		url: '/systemapi/task_management/runTaskFlow',
+		method: 'post',
+		data: data
+	});
+}
 //获取流程可见范围
 export function gainFlowLookSee(data?:any){
 	return request({
diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 7e7710464..5fa5763ed 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -159,7 +159,7 @@ const model = ref<any>({})
 
 //监听是否为流程表单
 watch(()=>props.isWorkFlow,(val:number)=>{
-	console.log("获取流程----->",val)
+	console.log("监听是否为流程表单----->",val,formProps)
 	if(val == 1){
 		getFlowInitSwps()
 	}
@@ -734,9 +734,12 @@ const appFormSubmit = (params = {}) => {
 								.then((data:any)=>{
 									console.log("流程提交成功--------1---------->",data)
 								})
+								.finally(() =>{
+									afterSubmit('success', data)
+								})
 						})
 					}
-					afterSubmit('success', data)
+					
 				})
 				.catch(res => {
 					afterSubmit('fail', res)
@@ -986,8 +989,9 @@ const changeKeyVal = (key:any,val:any,type:any,attribute:any) => {
 			})
 		}
 	}
+	console.log("isUpdateFlowChart",isUpdateFlowChart)
 	//更新工作流图
-	if(isUpdateFlowChart){
+	if(isUpdateFlowChart && gainFlowChart.id !=0){
 		flowLoading.value = true
 		//获取工作流不进图
 		gainFlowChart.conditionList=flowFactor
diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 9344339e4..ce14444b7 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -16,6 +16,8 @@ import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
 import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
 
 
+
+
 //引入组件
 import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
 import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue'
@@ -63,6 +65,9 @@ const props = withDefaults(
 		versionid:() =>{
 			return ""
 		},
+		signCode:() =>{
+			return ""
+		},
 		versiontitle:() =>{
 			return ""
 		},
@@ -581,6 +586,7 @@ const editFormSendFlow = (val:any) => {
 						</el-table-column>
 						<el-table-column v-else-if="item.fieldClass=='__control'"  :prop="item.field" :label="item.label" config=""  width="160">
 							<template #default="scope">
+						
 								<el-button-group>
 									<el-tooltip
 										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==1"
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 75bb88230..7b945543a 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -22,6 +22,9 @@ const props = withDefaults(
 const formProps = inject(constFormProps, {}) as any
 const tableDataNew = computed(() => {
 	console.log("如果编辑页禁用时-----1123---->",props.data.name)
+	console.log("如果编辑页禁用时-----1123---->",formProps.value.model[props.data.name])
+	console.log("如果编辑页禁用时-----1123---->",formProps.value.model)
+	console.log("如果编辑页禁用时-----1123---->",formProps.value)
     return formProps.value.model[props.data.name]
 })
 const type = computed(() => {
@@ -55,6 +58,7 @@ const delColumn = (index: number) => {
 }
 </script>
 <template>
+	
 	<div class="form-table form-table-add">
 		<el-table
 			v-bind="data.control"
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 964f27e56..95a6049f4 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -385,6 +385,7 @@ const getFormItemLableStyle = (ele: any) => {
 						<!-- <form-group :data="element.list" data-type="not-nested" /> -->
 						<form-group :data="element.list" data-type="not-table" />
 					</div>
+					
 					<child-table v-else :data="element" />
 				</template>
 				<!--格栅布局-->
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index 2d2a6091d..1e6a255d4 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -10,6 +10,10 @@ import { gainTaskFormInfo,generateFlow,gainEditDataLog,draftsInitiateApproval,af
 import { Close } from '@element-plus/icons-vue'
 import { judgeSubmitCancel,startRunFlow } from '@/api/DesignForm/requestapi'
 import { submitButtonEs } from '@/api/DesignForm/tableButton'
+import {
+  constFormBtnEvent,
+  constFormProps
+} from '@/api/DesignForm/utils'
 
 import RunFlowStep from '@/views/taskplatform/taskmanagement/runFlowStep.vue'
 
@@ -53,6 +57,7 @@ const openOfClose =  computed({
 		emits('update:isShow', val)
 	}
 });
+const formProps = inject(constFormProps, {}) as any
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 14:09:24
@@ -161,12 +166,12 @@ const drawerBeforeClose = () => {
 }
 //提交审批
 const sendDraftSubmit = (type: string,val?:any) => {
-	// console.log("提交审批",type,val)
+	console.log("提交审批",type,val)
 	// emits("getmytodolist")
 	if (type === 'success') {
 		if(props.pageInfo.flowIsOpen == 1){
 			let sendInfo ={
-				id:val.data.masterKey,
+				id:val.data.runFlowId,
 				flowList:flowAry.value,
 				state:3
 			}
@@ -198,9 +203,9 @@ const saveEditFormInfo  = (type: string,val?:any) => {
 
 //重新提交审核
 const anewSubmit = (type: string,val?:any) => {
-	
+	console.log("重新提交数据-11--<",type,val)
 	if(type == "success"){
-		afreshRunWorkflow({id:val.data.flowkeys})
+		afreshRunWorkflow({id:val.data.runFlowId})
 			.then((data:any) => {
 				console.log("重新提交数据---<",data,runstep.value)
 				runstep.value.gainRunFlowTask()
@@ -276,6 +281,12 @@ const submitEdit = (type: string,val?:any) => {
 										</el-descriptions>
 									</el-tab-pane>
 								</el-tabs>
+								<table style="margin-top:20px;">
+										<tr>
+											<td class="biankuang" width="100">修改说明：</td>
+											<td class="biankuang">{{item.explicate}}</td>
+										</tr>
+									</table>
 							</el-card>
 						</el-timeline-item>
 					</el-timeline>
@@ -288,6 +299,7 @@ const submitEdit = (type: string,val?:any) => {
 						</div>
 					</el-header>
 					<el-scrollbar class="scorllbarBox">
+			
 						<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.pageInfo.runFlowId" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
 					</el-scrollbar>
 				</el-aside>
@@ -370,5 +382,8 @@ const submitEdit = (type: string,val?:any) => {
 	}
 	
 }
-
+.biankuang{
+	border: 1px solid #D4D7DE;
+	padding:10px 10px;
+}
 </style>
diff --git a/src/components/DesignForm/tableListPage/formPageContApp.vue b/src/components/DesignForm/tableListPage/formPageContApp.vue
index 776768de1..d4a44895d 100644
--- a/src/components/DesignForm/tableListPage/formPageContApp.vue
+++ b/src/components/DesignForm/tableListPage/formPageContApp.vue
@@ -198,9 +198,9 @@ const saveEditFormInfo  = (type: string,val?:any) => {
 
 //重新提交审核
 const anewSubmit = (type: string,val?:any) => {
-	
+	console.log("重新提交数据-22--<",type,val)
 	if(type == "success"){
-		afreshRunWorkflow({id:val.data.flowkeys})
+		afreshRunWorkflow({id:val.data.runFlowId})
 			.then((data:any) => {
 				console.log("重新提交数据---<",data,runstep.value)
 				runstep.value.gainRunFlowTask()
@@ -220,7 +220,7 @@ const anewSubmit = (type: string,val?:any) => {
 const submitEdit = (type: string,val?:any) => {
 	// console("修改完毕----->",type,val)
 	if(type == "success"){
-		runstep.value.gainRunFlowTask()
+		runstep.value.anewSubmit()
 		emits("getPageData");
 		closeDrawer()
 	}
@@ -276,6 +276,12 @@ const submitEdit = (type: string,val?:any) => {
 										</el-descriptions>
 									</el-tab-pane>
 								</el-tabs>
+								<table v-if="item.explicate!=''" style="margin-top:20px;">
+										<tr>
+											<td class="biankuang" width="100">修改说明：</td>
+											<td class="biankuang">{{item.explicate}}</td>
+										</tr>
+									</table>
 							</el-card>
 						</el-timeline-item>
 					</el-timeline>
@@ -333,6 +339,12 @@ const submitEdit = (type: string,val?:any) => {
 								</el-descriptions>
 							</el-tab-pane>
 						</el-tabs>
+						<table style="margin-top:20px;">
+										<tr>
+											<td class="biankuang" width="100">修改说明：</td>
+											<td class="biankuang">{{item.explicate}}</td>
+										</tr>
+									</table>
 					</el-card>
 				</el-timeline-item>
 			</el-timeline>
@@ -370,5 +382,8 @@ const submitEdit = (type: string,val?:any) => {
 	}
 	
 }
-
+.biankuang{
+	border: 1px solid #D4D7DE;
+	padding:10px 10px;
+}
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
index 18e1b0134..50025b3ae 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/completedMattersPage.vue
@@ -5,6 +5,7 @@
 -->
 <script lang='ts' setup>
 import { gainAppTaskList } from "@/api/DesignForm/requestapi"
+import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoApp.vue'
 const props = defineProps({
 	pickAppMenu:{
 		type:Object,
@@ -52,9 +53,21 @@ const getToDoList = () =>{
 onMounted(() =>{
 	getToDoList()
 })
+const flowLogInfo = ref<any>()
+const darwOpenOrClose = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-17 14:46:51
+@ 功能: 查看表单详情
+*/
+const lookFlowInfo = (val:any,types:number) =>{
+	flowLogInfo.value = val
+	darwOpenOrClose.value = true
+}
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
+		<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />
 		<div class="app-container">
 			<div class="search">
 				<div class="titleBox">
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
index fe00df873..7d5d3033f 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
@@ -214,6 +214,7 @@ const confirmEvent = (val:any) => {
 					<el-table-column  label="状态" prop="status"  align="center"  width="220" >
 						
 						<template #default="scope">
+						{{scope.row.status}}---->{{scope.row.types}}
 							<el-tag
 								v-if="scope.row.status==1"
 								class="mx-1"
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue
index 5a357f764..9e05420e6 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myDrafts.vue
@@ -4,7 +4,7 @@
 @ 备注: 草稿箱
 -->
 <script lang='ts' setup>
-
+import FormPageCont from '@/components/DesignForm/tableListPage/formPageContApp.vue'
 import { gainAppAllTaskList } from "@/api/DesignForm/requestapi"
 
 //引入页面
@@ -25,6 +25,8 @@ const selectInfo = reactive<taskflowquery>({
 	class:2,
 	id:props.pickAppMenu.appkey
 })
+const tablePageClass = ref(1)
+const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
 const myappbox = ref();
 const loading = ref(false)
 const searckFormRef  = ref(ElForm);
@@ -34,6 +36,8 @@ const drawerMyWith = ref<number>(0); //页面宽度
 const editPageShow = ref(false)
 const sendPageShow = ref(false)
 const taskInfo = ref<any>("")
+const lookPageInfoIsShow = ref(false)
+const pageInfoCont = ref<any>()
 //重置表单
 const resetQuery = () =>{
 	searckFormRef.value.resetFields();
@@ -69,9 +73,16 @@ onMounted(() =>{
 @ 功能: 提交审批
 */
 const submitApproval = (val:any) =>{
-	taskInfo.value = val
-	drawerMyWith.value = myappbox.value?.clientWidth;
-	sendPageShow.value = true
+	// taskInfo.value = val
+	// drawerMyWith.value = myappbox.value?.clientWidth;
+	// sendPageShow.value = true
+	console.log("提交审批--->",val)
+
+	operState.value = 4
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerMyWith.value = myappbox.value?.clientWidth
+	lookPageInfoIsShow.value = true;
 }
 /**
 @ 作者: 秦东
@@ -79,13 +90,19 @@ const submitApproval = (val:any) =>{
 @ 功能: 编辑草稿内容
 */
 const editFlow  = (val:any) =>{
-	taskInfo.value = val
-	drawerMyWith.value = myappbox.value?.clientWidth;
-	editPageShow.value = true
+	// taskInfo.value = val
+	// drawerMyWith.value = myappbox.value?.clientWidth;
+	// editPageShow.value = true
+	operState.value = 5;
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerMyWith.value = myappbox.value?.clientWidth
+	lookPageInfoIsShow.value = true;
 }
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
+		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerMyWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getToDoList" />
 		<AppEditPage v-model:is-open="editPageShow" :task-info="taskInfo" :drawer-width="drawerMyWith" @refreshFunction="getToDoList" />
 		<div class="app-container">
 			<div class="search">
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
index d3ddb13c8..1f63c155e 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue
@@ -6,6 +6,10 @@
 <script lang='ts' setup>
 import { gainAppTaskList } from "@/api/DesignForm/requestapi"
 import { taskflowquery } from '@/api/DesignForm/type'
+
+import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoApp.vue'
+
+
 const props = defineProps({
 	pickAppMenu:{
 		type:Object,
@@ -19,9 +23,9 @@ const searckFormRefTd  = ref(ElForm);	//表单
 const taskFlowAryTd = ref<any>([])  //记录数组
 //搜索条件参数
 const selectInfoTd = reactive<taskflowquery>({
-	page: 2,
+	page: 1,
 	pagesize: 20,
-	class: 1,
+	class: 2,
 	id:props.pickAppMenu.appkey
 })
 const totalstd = ref<number>(0)	//总共多少条记录
@@ -55,9 +59,31 @@ const getToDoList = () =>{
 onMounted(() =>{
 	getToDoList()
 })
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-17 08:13:56
+@ 功能: 搜索
+*/
+const getToDoListTd = () =>{
+	getToDoList()
+}
+
+
+const flowLogInfo = ref<any>()
+const darwOpenOrClose = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-17 14:46:51
+@ 功能: 查看表单详情
+*/
+const lookFlowInfo = (val:any,types:number) =>{
+	flowLogInfo.value = val
+	darwOpenOrClose.value = true
+}
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
+		<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />
 		
 		<div class="app-container">
 			<div class="search">
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
index 99341a3d1..328655636 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/sendCopy.vue
@@ -5,11 +5,20 @@
 -->
 <script lang='ts' setup>
 import { gainAppTaskList } from "@/api/DesignForm/requestapi"
-
+import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfoApp.vue'
+const props = defineProps({
+	pickAppMenu:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+});
 const selectInfo = reactive<taskflowquery>({
 	page: 1,
 	pagesize: 20,
-	class:3
+	class:5,
+	id:props.pickAppMenu.appkey
 })
 const loading = ref(false)
 const searckFormRef  = ref(ElForm);
@@ -25,12 +34,36 @@ const initData = () =>{
 	selectInfo.page = 1;
 	selectInfo.pagesize = 15;
 	selectInfo.title = ""
-	selectInfo.class = 3;
+	selectInfo.class = 5;
 	selectInfo.state = 0;
 }
+const getToDoList = () =>{
+	gainAppTaskList(selectInfo)
+		.then((data) =>{
+			console.log("加载数据--->",data)
+			totals.value = data.data.total
+			taskFlowAry.value = data.data.list
+		})
+}
+onMounted(() =>{
+	getToDoList()
+})
+
+const flowLogInfo = ref<any>()
+const darwOpenOrClose = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-06-17 14:46:51
+@ 功能: 查看表单详情
+*/
+const lookFlowInfo = (val:any,types:number) =>{
+	flowLogInfo.value = val
+	darwOpenOrClose.value = true
+}
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
+		<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" @getmytodolist="getToDoListTd" />
 		<div class="app-container">
 			<div class="search">
 				<div class="titleBox">
diff --git a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
new file mode 100644
index 000000000..5ef298bb8
--- /dev/null
+++ b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
@@ -0,0 +1,218 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-06-17 15:30:36
+@ 备注: App执行任务
+-->
+<script lang='ts' setup>
+import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLookFormCont } from "@/utils/workflow/const";
+import {
+    json2string,
+    objToStringify,
+    string2json,
+    stringToObj
+} from '@/utils/DesignForm/form'
+
+import { haveCustomerFormVersion,generateFlow,gainTaskFormInfo,gainEditDataLog } from '@/api/taskapi/management'
+
+import RunFlowStepApp from '@/views/taskplatform/taskmanagement/runFlowStepApp.vue'
+
+import { judgeSubmitCancel,startRunFlow,afreshRunFlow,onlyPublishFlow,gainEditFormFlowInfo } from '@/api/DesignForm/requestapi'
+
+
+import FlowStep from '@/views/taskplatform/taskmanagement/flowStep.vue'
+
+const props = defineProps({
+	isshow:{
+		type:Boolean,
+		default:true
+	},
+	drawerWith:{
+		type:Number,
+		default:0
+	},
+	flowLogInfo:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	operState:{
+		type:Number,
+		default:1
+	}
+})
+const flowAry = ref<any[]>();
+const emits = defineEmits(["update:isshow","getmytodolist"]);
+const isOpen =   computed({
+	get: () => props.isshow,
+	set: (val) => {
+		emits("update:isshow", val);
+	},
+});
+const logistrue = ref(false)
+const formLoading  = ref(false)
+const loadingData = ref(false)			//加载表单数据
+const flowLoading = ref(false)			//加载流程数据
+const versiontitle = ref<any>("")
+const flowMap = ref<any>()
+const nextStep = ref(0)
+const nodeKey = ref<string>('');
+const currentProgress  = ref<number>(1);
+const newLogAry = ref<any>("")
+const oldLogAry = ref<any>("")
+const newDataLen  = ref<number>(0);
+//表单相关内容
+const formState = reactive({
+    formData: {
+      list: [],
+      form: {},
+      config: {}
+    },
+    dict: {},
+    formId: 25,
+    id: 1,
+    loading: true
+})
+const formEl = ref<any>()
+const drawerBeforeClose = () => {
+	console.log("监听打开关闭",false)
+	emits("getmytodolist")
+	emits("update:isshow", false);
+}
+
+onMounted(()=>{
+	versiontitle.value = props.flowLogInfo.title
+	flowMap.value = JSON.parse(props.flowLogInfo.flowcont)
+	console.log("监听打开关闭",props.flowLogInfo)
+	gainFormData()
+})
+const pageLog = ref<any[]>([])
+//获取表单内容
+const gainFormData = () =>{
+	formLoading.value = true;
+	console.log("获取表单内容--->",props.flowLogInfo)
+	nextStep.value = props.flowLogInfo.nextStep
+	nodeKey.value = props.flowLogInfo.nodeKey;
+	currentProgress.value = props.flowLogInfo.currentStep
+	console.log("props.flowLogInfo--5-------->",props.flowLogInfo.mastesform)
+	formState.formData = stringToObj(props.flowLogInfo.mastesform)
+
+	gainTaskFormInfo({ id: props.flowLogInfo.mastersKeyStr})
+					.then((data:any)=>{
+						if(data.data.logistrue){
+							formState.formData.list.push(editLookFormCont)
+						}
+						console.log("res----获得数据回显------->",data)
+						formEl.value.setValue(data.data.masterDataInfo)
+						newLogAry.value = data.data.newData
+						oldLogAry.value = data.data.oldData
+						logistrue.value = data.data.logistrue
+						newDataLen.value = data.data.newDataLen
+						formLoading.value = false;
+						nextTick(()=>{
+							console.log("获取自定义表单内容-1111-->",data.data.tableData)
+							formEl.value.setValue(data.data.tableData)
+						})
+					})
+					.finally(()=>{
+						formLoading.value = false;
+						gainEditDataLog({id:props.flowLogInfo.mastersKeyStr})
+						.then(({data})=>{
+							console.log("获取修改记录-1111-->",data)
+							pageLog.value = data.logAry
+						});
+					})
+	// haveCustomerFormVersion({id:props.flowLogInfo.version_id.toString()})
+	// 		.then(({ data }) =>{
+				
+	// 			formState.dict = string2json(data.dict)
+	// 			judgeSubmitCancel({"name":data.mastesformjson})
+	// 				.then((dataBut:any) =>{
+	// 					if(dataBut.code == 0){
+	// 						formState.formData.list.push(afreshSubmitButton)
+	// 							// console.log("res----判断按钮------->",dataBut,props.operState)
+	// 							// if (dataBut.data == 3 || dataBut.data == 4){
+	// 							// 	formInfo.formData.list.push(editFormCont)
+	// 							// }
+	// 					}
+	// 				})
+	// 		})
+	// 		.finally(() => {
+	// 			formLoading.value = false;
+				
+					// formEl
+	// 	})
+}
+</script>
+<template>
+	<el-drawer  v-model="isOpen" v-loading="loadingData" element-loading-my-text="Loading..." :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith" class="drawerClass" :before-close="drawerBeforeClose">
+		<table border="0"  class="tableFlowBox">
+			<tr>
+				<td valign="top">
+					<div class="drawerFormBox boxLeft">
+						<ak-form
+							ref="formEl"
+							v-loading="formLoading" element-loading-text="Loading..."
+							:form-data="formState.formData"
+							:type="formType"
+							:dict="formState.dict"
+							request-url="getFormContent"
+							add-url="saveFormContent"
+							edit-url="editFormContent"
+							:before-submit="beforeSubmit"
+							:close-app-submit="closeAppSubmit"
+							:change-key-val="changeKeyVal"
+							:anew-submit = "anewSubmit"
+							:save-edit-form-info="saveEditFormInfo"
+							:send-draft-submit= "sendDraftSubmit"
+						/>
+						<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
+						<el-timeline>
+							<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
+								<el-card>
+									<el-descriptions  border>
+										<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" :label="mastIndex">
+											{{mastItem}}
+										</el-descriptions-item>
+									</el-descriptions>
+									<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
+										<el-tab-pane v-for="(sonItem,sonIndex) in item.sunList" :label="sonIndex" :key="sonIndex">
+											<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
+												<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" :label="sonKey">	{{sonCentor}}
+												</el-descriptions-item>
+											</el-descriptions>
+										</el-tab-pane>
+									</el-tabs>
+									<table style="margin-top:20px;">
+										<tr>
+											<td class="biankuang" width="100">修改说明：</td>
+											<td class="biankuang">{{item.explicate}}</td>
+										</tr>
+									</table>
+								</el-card>
+								
+								
+							</el-timeline-item>
+							
+							
+					
+						</el-timeline>
+
+
+					</div>
+				
+				</td>
+				<td valign="top" width="350">
+					<RunFlowStepApp ref="runstep" v-model:flowary="flowAry" :flow-key="props.flowLogInfo.idStr" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
+				</td>
+			</tr>
+		</table>
+		
+	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+.biankuang{
+	border: 1px solid #D4D7DE;
+	padding:10px 10px;
+}
+</style>
diff --git a/src/views/taskplatform/taskmanagement/runFlowStep.vue b/src/views/taskplatform/taskmanagement/runFlowStep.vue
index 726f18d12..5342544b1 100644
--- a/src/views/taskplatform/taskmanagement/runFlowStep.vue
+++ b/src/views/taskplatform/taskmanagement/runFlowStep.vue
@@ -7,7 +7,7 @@
 import SvgIcon from "@/components/SvgIcon/index.vue";
 import OrgUserPage from "@/views/public/orguser/orguser.vue"
 import OrgAllUserPage from "@/views/public/orguser/orgalluser.vue"
-import { authorizeWorkflow } from '@/api/taskapi/management'
+import { authorizeWorkflow,afreshRunWorkflow } from '@/api/taskapi/management'
 
 // import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
 import { gainRunTaskFlow,submitApprovalResults } from '@/api/DesignForm/requestapi'
@@ -53,7 +53,7 @@ const gainRunFlowTask = () =>{
 	}
 	gainRunTaskFlow(sendInfo)
 		.then((data:any) =>{
-			console.log("获取流程----->",data)
+			console.log("获取流程--werwerwerwer--->",data)
 			flowMaps.value = data.data.flowList
 			flowOpinion.value = data.data.operational
 			currentStep.value = data.data.current_step
@@ -129,7 +129,19 @@ const yesOrNo = (val:string,agreeOrRefuse:number) =>{
 		})
 		
 }
-defineExpose({gainRunFlowTask})
+//重新提交审核
+const anewSubmit = (type: string,val?:any) => {
+	
+		afreshRunWorkflow({id:props.flowKey})
+			.then((data:any) => {
+				
+			})
+			.finally(() => {
+				gainRunFlowTask()
+			})
+
+}
+defineExpose({gainRunFlowTask,anewSubmit})
 </script>
 <template>
 	<div  class="drawerFormBox boxRight">
diff --git a/src/views/taskplatform/taskmanagement/runFlowStepApp.vue b/src/views/taskplatform/taskmanagement/runFlowStepApp.vue
new file mode 100644
index 000000000..118b2af9e
--- /dev/null
+++ b/src/views/taskplatform/taskmanagement/runFlowStepApp.vue
@@ -0,0 +1,249 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-06-17 15:39:17
+@ 备注: 审批设置
+-->
+<script lang='ts' setup>
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import OrgUserPage from "@/views/public/orguser/orguser.vue"
+import OrgAllUserPage from "@/views/public/orguser/orgalluser.vue"
+import { authorizeWorkflow,runTaskFlow } from '@/api/taskapi/management'
+
+// import { nodeFlow,conditionInfo,nodelPeoples } from '@/api/taskapi/types'
+import { gainRunTaskFlow,submitApprovalResults } from '@/api/DesignForm/requestapi'
+//引入图标
+import squareUrlOne from "@/assets/images/1.png"
+import squareUrlTwo from "@/assets/images/2.png"
+
+const state = reactive({
+	circleUrl:squareUrlTwo,
+  	squareUrl: squareUrlOne,
+  	sizeList: ['small', '', 'large'] as const,
+})
+const { circleUrl, squareUrl, sizeList } = toRefs(state)
+
+const props = defineProps({
+	flowKey:{
+		type:String,
+		default:""
+	},
+	currentProgress:{
+		type:Number,
+		default:0
+	}
+})
+
+const emits = defineEmits(["update:flowary","updatelist"]);
+
+const flowLoading = ref(false)
+const openOrClose = ref(false)		//开启指定人员选择
+const openclosebox = ref(false)		//开启全部人员选择
+const presetPersonnel = ref<any>([]);    //预设选择人
+const selectedPeople = ref<any>([]);    //已选择人
+const flowOpinion = ref(false) //是否可以写评论
+const currentStep = ref<number>(props.currentProgress)
+
+const flowMaps = ref<any[]>();
+
+//获取任务流程
+const gainRunFlowTask = () =>{
+	flowLoading.value = true
+	let sendInfo = {
+		id:props.flowKey
+	}
+	gainRunTaskFlow(sendInfo)
+		.then((data:any) =>{
+			console.log("获取流程--获取任务流程--->",data)
+			flowMaps.value = data.data.flowList
+			flowOpinion.value = data.data.operational
+			currentStep.value = data.data.current_step
+			emits("update:flowary", data.data.flowList);
+		})
+		.finally(()=>{
+			flowLoading.value = false
+		})
+}
+//组件渲染之前
+onBeforeMount(()=>{
+	gainRunFlowTask();
+})
+//组件渲染完毕
+onMounted(()=>{
+	
+})  
+//判断是否可以添加人员
+const judgeAddUser =  (val:any):boolean =>{
+	console.log("获取流程----1111->",val.judgelist)
+	if(val.judgelist){
+		return true
+	}
+	return false
+}
+let zhiXingStep = 1;
+//添加操作人
+const addPeople = (val:any) =>{
+	zhiXingStep = val.step
+	presetPersonnel.value = val.pendpers
+	selectedPeople.value = val.operator
+	if(val.runscope == 1){
+		openclosebox.value = true
+	}else{
+		openOrClose.value = true
+	}
+}
+//更新节点操作人
+const updateNode = (val:any) =>{
+
+	if(flowMaps.value&& flowMaps.value.length > 0){
+
+		flowMaps.value.forEach((item:any) =>{
+			if(item.step == zhiXingStep){
+				item.operator = val
+			}
+		})
+	}
+}
+const sendFlowInfo = ref<string>() //审批意见
+//提交审批
+const yesOrNo = (val:string,agreeOrRefuse:number) =>{
+	console.log("提交审批----1111->",val,agreeOrRefuse,sendFlowInfo.value)
+	let sendInfo = {
+		id:props.flowKey,
+		agreeOrRefuse:agreeOrRefuse,
+		suggest:sendFlowInfo.value,
+		flowlist:flowMaps.value
+	}
+	runTaskFlow(sendInfo)
+		.then((data:any)=>{
+
+			// console.log("提交审批----22222->",data)
+			ElMessage({
+				message: '处理完成！',
+				type: 'success'
+			})
+
+		})
+		.finally(()=>{
+			gainRunFlowTask();
+			emits("updatelist");
+		})
+		
+}
+defineExpose({gainRunFlowTask})
+</script>
+<template>
+	<div  class="drawerFormBox boxRight">
+		<div class="flowBox">
+			<!-- <el-affix  :offset="20" style="width:100%">
+				<el-text size="large">审批流程</el-text>
+			</el-affix> -->
+
+			<el-steps v-loading="flowLoading" element-loading-text="Loading..." direction="vertical" :active="currentStep">
+				<el-step v-for="item in flowMaps" :key="item.step">
+					<template #title>
+						{{ item.nodeName }}<span v-if="item.examinemode==1"> ● 依次审批</span><span v-if="item.examinemode==2"> ● 会签</span><span v-if="item.examinemode==3"> ● 或签</span>
+					</template>
+					<template #description>
+						<table>
+							<tr  v-for="items in item.operator" :key="items.id">
+								<td  valign="top" align="center" width="50">
+									<el-avatar v-if="items.iconbase64==''&&items.icon!=''" shape="square" fit="cover" :src="items.icon" />
+									<el-avatar v-else-if="items.iconbase64!=''" shape="square" fit="cover" :src="items.iconbase64" />
+									<el-avatar v-else shape="square" fit="cover" :src="squareUrl" />
+								</td>
+								<td  valign="top" align="left">
+									<el-row>
+										<el-col :span="24">
+											<el-text>{{ items.departmentname }}</el-text>
+											<el-text><span v-if="items.departmentname"> - </span>{{ items.postname }}</el-text>
+											<el-text><span v-if="items.departmentname||items.postname"> - </span>{{ items.name }}</el-text>
+										</el-col>
+										<el-col :span="24">
+											<ul>
+												<li v-for="(logItem,logIndex) in items.log" :key="logIndex" class="logLi">
+													<el-text v-if="logItem.state==2" type="success">
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已同意</span>
+													</el-text>
+													<el-text v-else-if="logItem.state==3" type="danger">
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已驳回</span>
+													</el-text>
+													<el-text v-else-if="logItem.state==4" type="primary">
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>已查看</span>
+													</el-text>
+													<el-text v-else>
+														<span v-if="logItem.cause">{{logItem.cause}}</span><span v-else>未操作</span>
+													</el-text> · {{ logItem.time }}
+												</li>
+											</ul>
+										</el-col>
+									</el-row>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<div  v-if="item.judgelist"  class="addUser" @click="addPeople(item)">
+										<svg-icon icon-class="addxuxian" size="50" />
+									</div>
+								</td>
+								<td></td>
+							</tr>
+						</table>
+					</template>
+				</el-step>
+			</el-steps>
+		</div>
+		<el-affix v-if="flowOpinion" position="bottom" :offset="0">
+			<div class="approvalBoard">
+				<el-text size="large" class="appBoardTitle">审批意见</el-text>
+					<el-row :gutter="20">
+					<el-col :span="24">
+						<el-input
+							v-model="sendFlowInfo"
+							:autosize="{ minRows: 2, maxRows: 6 }"
+							type="textarea"
+							placeholder="请输入审批意见"
+						/>
+					</el-col>
+					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="4"></el-col>
+						<el-col :span="8" class="juzhong"><el-button type="primary" style="width:100%" @click="yesOrNo(props.flowKey,1)">同意</el-button></el-col>
+						<el-col :span="8" class="juzhong"><el-button type="danger" style="width:100%" @click="yesOrNo(props.flowKey,2)">驳回</el-button></el-col>
+						<el-col :span="4"></el-col>
+					</el-row>
+			</div>
+		</el-affix>
+
+
+		<OrgUserPage v-if="openOrClose" v-model:openclose="openOrClose" :preset-personnel="presetPersonnel" :selected-people="selectedPeople" @update-node="updateNode" />
+		<OrgAllUserPage v-if="openclosebox" v-model:openclosebox="openclosebox" :selected-people="selectedPeople"  @update-node="updateNode" />
+	</div>
+</template>
+<style  lang='scss' scoped>
+.drawerFormBox{
+	width: 100%;
+	height: 100%;
+}
+.boxRight{
+	overflow: hidden;
+	overflow-y: auto;
+	border-left: 1px solid #EEEEEE;
+}
+.flowBox{
+	width: 100%;
+	padding: 0 5px 0 10px;
+}
+.approvalBoard{
+	padding: 5px 10px;
+	background-color: #FFFFFF;
+	border-top: 1px solid #EEEEEE;
+	.juzhong{
+		padding: 10px 0;
+		text-align: center;
+	}
+	.appBoardTitle{
+		padding: 5px 0 10px 0;
+		display: block;
+	}
+}
+</style>
diff --git a/src/widget/number/index.vue b/src/widget/number/index.vue
index 07a87edf8..5508d47fd 100644
--- a/src/widget/number/index.vue
+++ b/src/widget/number/index.vue
@@ -83,8 +83,8 @@ const updateModel = (val: any) => {
     })
 }
 onMounted(() => {
-	console.log("编码组件---》",props.data,props.data.control.config)
-	if(props.numrun == 1){
+	console.log("编码组件---》",props.numrun,props.data,props.data.control.config)
+	if(props.numrun == 2){
 		getNumber()
 	}
 })