完成工作流开发

src/api/DesignForm/requestapi.ts

@@ -236,3 +236,28 @@ export function afreshRunFlow(data?:enableVersionId){
 		data: data
 	});
 }
+//已有表单数据，只发布流程
+export function onlyPublishFlow(data?:any){
+	return request({
+		url: '/systemapi/task_flow/onlyPublishFlow',
+		method: 'post',
+		data: data
+	});
+}
+//撤回申请
+export function retractRunFlow(data?:enableVersionId){
+	return request({
+		url: '/systemapi/task_flow/retractRunFlow',
+		method: 'post',
+		data: data
+	});
+}
+
+//获取要修改的数据
+export function gainEditFormFlowInfo(data?:enableVersionId){
+	return request({
+		url: '/systemapi/task_flow/gainEditFormFlowInfo',
+		method: 'post',
+		data: data
+	});
+}

src/components/DesignForm/public/form/form.vue

@@ -40,6 +40,7 @@ const props = withDefaults(
 		saveDraftPage?: Function	//保存草稿
 		saveEditFormInfo?: Function //保存草稿  只改表单不操作流程
 		sendDraftSubmit?: Function //草稿提交审批
+		submitEdit?: Function //提交修改数据申请
 		value?: { [key: string]: any } // 表单初始值，同setValue
 		options?: { [key: string]: any } // 表单组件选项，同setOptions
 		dict?: object // 固定匹配的字典
@@ -332,10 +333,74 @@ provide(constFormBtnEvent, (obj: any) => {
 		case 'draftSubmit':	//草稿提交审批
 			draftSubmit()
 			break
+		case 'submitEdit': //申请修改
+			submitEditButton()
+			break
 		default:
 			break
     }
 })
+//修改流程表单数据回显
+const getEditData = (params = {}) => {
+	let requestUrl ="/systemapi/task_flow/gainEditFormFlowInfo"
+	loading.value = true
+    const newParams: any = params
+    // 同时可使用props或是events里的事件，根据使用使用其中一种即可
+    let newParams2
+    const beforeRequest = props.formData.events?.beforeRequest
+    if (typeof beforeRequest === 'function') {
+      	newParams2 = beforeRequest(newParams, route)
+    }
+    if (typeof props.beforeRequest === 'function') {
+      	newParams2 = props.beforeRequest(newParams, route)
+    }
+    if (newParams2 === false) {
+		// 停止数据请求
+		return
+    }
+	currencyFormApiSubmit(requestUrl, newParams2 ?? newParams)
+		.then((res: any) => {
+			loading.value = false
+			const result = res.data.masterDataInfo
+			result.formKey = newParams.id
+			result.formId = newParams.version
+			
+			if (result) {
+				let formatRes: any = result
+				// 比较适用通用表单，保存在服务端
+				const afterResponse = props.formData.events?.afterResponse
+				
+				if (typeof afterResponse === 'string' && afterResponse) {
+					formatRes = formatResult(result, afterResponse)
+				} else if (typeof afterResponse === 'function') {
+					formatRes = afterResponse(result) ?? result
+				}
+				// 比较适用于导出vue文件
+				if (typeof props.afterResponse === 'string' && props.afterResponse) {
+					formatRes = formatResult(result, props.afterResponse)
+				} else if (typeof props.afterResponse === 'function') {
+					formatRes = props.afterResponse(result) ?? result
+				}
+				if (formatRes === false) {
+					return
+				}
+				console.log("停止数据请求--->",formatRes)
+				setValue(formatRes.result || formatRes)
+				nextTick(() => {
+					// 将dict保存，可用于从接口中设置表单组件options。
+					if (formatRes.dict && Object.keys(formatRes.dict).length) {
+						resultDict.value = formatRes.dict
+					}
+				})
+			}
+			return res.data
+		})
+		.catch(res => {
+			loading.value = false
+			return ElMessage.error(res.message)
+		})
+}
+
 // 获取表单数据，编辑时，外部调用
 const getData = (params = {}) => {
     let requestUrl = props.formData.config?.requestUrl || props.requestUrl
@@ -839,6 +904,72 @@ const sendDraftSubmit  = (type: string, res: any) => {
       	ElMessage.error(res.message || '提交失败！')
     }
 }
+/**
+ * 申请修改
+ */
+ const submitEditButton = (params = {}) => {
+	let apiUrl = "/systemapi/task_flow/editFormLogData"
+	if (props.isSearch || !apiUrl || loading.value) {
+		if (!props.isSearch && !apiUrl) {
+			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
+			}
+			console.log("提交修改数据",apiUrl,submitParams,formatParams)
+			// 提交保存表单
+			currencyFormApiSubmit(apiUrl, submitParams ?? formatParams)
+				.then((res: any) => {
+						submitEdit('success', res)
+					})
+					.catch(res => {
+						submitEdit('fail', res)
+					})
+		}else {
+			// 没通过校验
+			submitEdit('validate', fields)
+		}
+	})
+}
+//提交修改数据
+const submitEdit = (type: string, res: any) => {
+	const sendDraftSubmit = props.formData.events?.sendDraftSubmit
+	let notReturn
+    if (typeof sendDraftSubmit === 'function') {
+      	notReturn = sendDraftSubmit(type, res)
+		//   console.log("notReturn-1-123456->",props.sendDraftSubmit)
+    } else if (typeof props.sendDraftSubmit === 'function') {
+      	notReturn = props.sendDraftSubmit(type, res)
+		//   console.log("notReturn--123456->",props.anewSubmit)
+    }
+	loading.value = false
+	if (notReturn === false) {
+		// 有返回false时则不提示
+		return
+    }
+}
 
 defineExpose({
     setOptions,
@@ -850,7 +981,9 @@ defineExpose({
     submit,
 	anewSubmit,
 	saveDraftPage,
-	saveEditFormInfo
+	saveEditFormInfo,
+	getEditData,
+	submitEdit
 })
 </script>
 <template>

src/utils/workflow/const.ts

@@ -249,10 +249,30 @@ export let  editFormCont = {
 		span: ""
     },
     list: [
+		{
+			type: "textarea",
+			iconFont: "fa-text-height",
+			control:{
+				modelValue: "",
+				placeholder: "请输入您修改此数据的原因"
+			},
+			config:{},
+			name: "explicate",
+			item:{
+				label: "修改说明",
+				rules: [
+					{
+						required: true,
+						message: "必填项",
+						trigger: "change"
+					}
+				]
+			}
+		},
 		{
 			type: "button",
 			control:{
-				label: "确认修改",
+				label: "提交申请",
 				type: "primary",
 				key: "submitEdit"
 			},
@@ -337,3 +357,31 @@ export let  draftSubmitButton = {
 		}
 	]
 }
+
+//查看申请修改
+export let  editLookFormCont = {
+    type: "div",
+    control:{},
+    config:{
+		textAlign: "center",
+		span: ""
+    },
+    list: [
+		{
+			type: "textarea",
+			iconFont: "fa-text-height",
+			control:{
+				modelValue: "",
+				placeholder: "请输入您修改此数据的原因"
+			},
+			config:{
+				editDisabled: true
+			},
+			name: "explicate",
+			item:{
+				label: "修改说明",
+				rules: []
+			}
+		}
+	]
+}

src/views/taskplatform/taskmanagement/drafts.vue

@@ -8,6 +8,8 @@ import { Delete, Edit, Search, Share, Upload,View } from '@element-plus/icons-vu
 import { taskFlowList,delRunFlow } from '@/api/DesignForm/requestapi'
 import { taskflowquery } from '@/api/DesignForm/type'
 
+import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfo.vue'
+
 const selectInfoDr = reactive<taskflowquery>({
 	page: 1,
 	pagesize: 20,
@@ -79,13 +81,25 @@ const delFlowForm = (val:any) => {
 	.catch(() => {})
 
 }
+const myappbox = ref()
+const darwOpenOrClose = ref(false)
+const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批
+const drawerMyWith = ref<number>(0);		//页面宽度
+const flowLogInfo = ref<any>()
+const versionId = ref<string>()		//使用版本
+const inFoid = ref<string>()
 //编辑表单
 const editFlow = (val:any) => {
-	
+	operState.value = 4
+	drawerMyWith.value = myappbox.value?.clientWidth
+	flowLogInfo.value = val
+	versionId.value = val.version
+	darwOpenOrClose.value = true
+	inFoid.value = val.idStr
 }
 </script>
 <template>
-	<div class="app_box">
+	<div ref="myappbox" class="app_box">
 		<div class="app-container">
 			<div class="search">
 				<el-form ref="searckFormRefdr" :model="selectInfoDr" :inline="true">
@@ -113,7 +127,7 @@ const editFlow = (val:any) => {
 					class="table_box"
 				>
 					<el-table-column fixed label="标题" prop="title" width="500" />
-					<el-table-column  label="创建人" prop="creater" >
+					<el-table-column  label="创建人" prop="creater"  width="200" >
 						<template #default="scope">
 							{{ scope.row.creatorInfo.name }}（<el-text  type="info">{{ scope.row.creatorInfo.number }}</el-text>）	
 						</template>
@@ -171,6 +185,7 @@ const editFlow = (val:any) => {
 					</el-table-column>
 					<el-table-column fixed="right" align="center" label="操作" width="150" >
 						<template #default="scope">
+							<el-button-group>
 							<el-tooltip
 								class="box-item"
 								effect="dark"
@@ -187,6 +202,7 @@ const editFlow = (val:any) => {
 							>
 								<el-button type="danger" size="small" class="fa fa-trash-o" @click="delFlowForm(scope.row)" />
 							</el-tooltip>
+							</el-button-group>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -200,7 +216,7 @@ const editFlow = (val:any) => {
 
 
 
-
+			<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" :infoid="inFoid" :oper-state="operState" @getmytodolist="getMyToDoList" />
 
 
 		</div>

src/views/taskplatform/taskmanagement/editFlowData.vue

@@ -0,0 +1,317 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-12-01 13:57:39
+@ 备注: 流程结束后进行数据修改
+-->
+<script lang='ts' setup>
+import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton } from "@/utils/workflow/const";
+import {
+    json2string,
+    objToStringify,
+    string2json,
+    stringToObj
+} from '@/utils/DesignForm/form'
+import { haveCustomerFormVersion,generateFlow } from '@/api/taskapi/management'
+import RunFlowStep from '@/views/taskplatform/taskmanagement/runFlowStep.vue'
+import { judgeSubmitCancel,startRunFlow,afreshRunFlow,onlyPublishFlow,gainEditFormFlowInfo } from '@/api/DesignForm/requestapi'
+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 formState = reactive({
+    formData: {
+      list: [],
+      form: {},
+      config: {}
+    },
+    dict: {},
+    formId: 25,
+    id: 1,
+    loading: true
+})
+//获取表单内容
+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)
+	// formState.formData.list.push(submitButton)
+	haveCustomerFormVersion({id:props.flowLogInfo.formVersionId})
+		.then(({ data }) =>{
+			console.log("res----------->",props.flowLogInfo.flowkeys, data)
+			// formState.formData = stringToObj(data.mastesform)
+			formState.dict = string2json(data.dict)
+			if(props.operState == 2 || props.operState == 3 || props.operState == 4){
+				judgeSubmitCancel({"name":data.mastesformjson})
+						.then((dataBut:any) =>{
+							console.log("res----判断按钮------->",dataBut,props.operState)
+							if(dataBut.code == 0){
+								// formState.formData.list.push(afreshSubmitButton)
+								// console.log("res----判断按钮------->",dataBut,props.operState)
+								if (dataBut.data == 3 || dataBut.data == 4){
+									
+									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)
+									}
+									
+								}
+							}
+						})
+			}
+			nextTick(() => {
+				// formEl.value.getEditData({ id: props.flowLogInfo.flowkeys,version: props.flowLogInfo.formVersionId})
+				
+				// formState.loading = false
+			})
+			formLoading.value = false
+		})
+		.finally(() => {
+			gainEditFormFlowInfo({ id: props.flowLogInfo.flowkeys})
+				.then((data:any)=>{
+					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
+				})
+
+		})
+		
+}
+
+const formType = computed(() => {
+    // 带有参数id为编辑状态
+    if (true) {
+      return 2
+    } else {
+      return 1
+    }
+	// return props.operState
+})
+
+const formEl = ref<any>()
+const drawerBeforeClose = () => {
+	console.log("监听打开关闭",false)
+	emits("getmytodolist")
+	emits("update:isshow", false);
+}
+//关闭拉窗
+const closeAppSubmit = () => {
+	drawerBeforeClose();
+}
+onMounted(()=>{
+	versiontitle.value = "修改" + props.flowLogInfo.title + "数据"
+	flowMap.value = JSON.parse(props.flowLogInfo.flowcont)
+	gainFormData()
+})
+</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"
+							:submit-edit="submitEdit"
+							:close-app-submit="closeAppSubmit"
+						/>
+
+						<el-divider v-if="logistrue" content-position="left">修改记录{{logistrue}}}</el-divider>
+						<el-timeline>
+							<el-timeline-item v-if="newLogAry.length > 0" :timestamp="newLogAry.logTime" placement="top">
+								<el-card>
+									<el-descriptions
+										direction="vertical"
+										:column="4"
+										size="24px"
+										border
+									>	
+										<div  v-for="(item,index) in newLogAry"  :key="index">
+											<el-descriptions-item v-if="!Array.isArray(item)&&index!='logTime'" :label="index">
+												{{ item }}
+											</el-descriptions-item>
+											<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4">
+											
+												<el-descriptions
+													
+													direction="vertical"
+													:column="4"
+													size="24px"
+													border
+												>
+													<el-descriptions-item  v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs">
+														{{ items }}
+													</el-descriptions-item>
+												</el-descriptions>
+												
+											</el-descriptions-item>
+											
+										</div>
+									</el-descriptions>
+
+								</el-card>
+							</el-timeline-item>
+							
+							<el-timeline-item v-for="itemss in oldLogAry" :key="itemss.id" :timestamp="itemss.logTime" placement="top">
+								<el-card>
+									<el-descriptions
+										direction="vertical"
+										:column="4"
+										size="24px"
+										border
+									>	
+										<div  v-for="(item,index) in itemss"  :key="index">
+											<el-descriptions-item v-if="!Array.isArray(item)&&index!='logTime'" :label="index">
+												{{ item }}
+											</el-descriptions-item>
+											<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4">
+											
+												<el-descriptions
+													
+													direction="vertical"
+													:column="4"
+													size="24px"
+													border
+												>
+													<el-descriptions-item  v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs">
+														{{ items }}
+													</el-descriptions-item>
+												</el-descriptions>
+												
+											</el-descriptions-item>
+											
+										</div>
+									</el-descriptions>
+								</el-card>
+							</el-timeline-item>
+					
+						</el-timeline>
+
+
+					</div>
+				</td>
+				<td valign="top" width="350">
+					<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.flowLogInfo.flowkeys" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
+				</td>
+			</tr>
+		</table>
+	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+.tableFlowBox{
+	width: 100%;
+	height: 100%;
+	// background-color: #000000;
+	.drawerFormBox{
+		width: 100%;
+		height: 100%;
+		// background-color: #ff0000;
+	}
+}
+.boxLeft{
+	padding: 0 10px 0 15px;
+	overflow: hidden;
+	overflow-y: auto;
+}
+.flowBox{
+	padding: 0 5px 0 10px;
+}
+.boxRight{
+	overflow: hidden;
+	overflow-y: auto;
+	border-left: 1px solid #EEEEEE;
+}
+.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>
+<style  lang='scss'>
+
+.drawerClass ::v-deep.el-drawer__header {
+        font-size: 22px;
+        text-align: center;
+        margin-bottom: 0px;
+        padding: 0;
+        .el-drawer__close-btn{
+            background-color: rgb(255, 77, 79);
+            color: white;
+        }
+    }
+    ::v-deep .el-drawer__body {
+        padding: 0px;
+    }
+    .details {
+        width: 80%;
+        margin-right: 0px;
+        margin-left: 20%;
+        box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+    }
+.drawerBody{
+	padding: 20px;
+	
+}
+
+</style>
+

src/views/taskplatform/taskmanagement/lookFlowInfo.vue

@@ -4,7 +4,7 @@
 @ 备注: 
 -->
 <script lang='ts' setup>
-import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton } from "@/utils/workflow/const";
+import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLookFormCont } from "@/utils/workflow/const";
 import {
     json2string,
     objToStringify,
@@ -16,7 +16,7 @@ import { haveCustomerFormVersion,generateFlow } from '@/api/taskapi/management'
 
 import RunFlowStep from '@/views/taskplatform/taskmanagement/runFlowStep.vue'
 
-import { judgeSubmitCancel,startRunFlow,afreshRunFlow } from '@/api/DesignForm/requestapi'
+import { judgeSubmitCancel,startRunFlow,afreshRunFlow,onlyPublishFlow,gainEditFormFlowInfo } from '@/api/DesignForm/requestapi'
 
 
 
@@ -40,6 +40,7 @@ const props = defineProps({
 		default:1
 	}
 })
+const flowAry = ref<any[]>();
 const emits = defineEmits(["update:isshow","getmytodolist"]);
 const isOpen =   computed({
 	get: () => props.isshow,
@@ -47,16 +48,17 @@ const isOpen =   computed({
 		emits("update:isshow", val);
 	},
 });
-
+const logistrue = ref(false)
 const formLoading  = ref(false)
 const loadingData = ref(false)			//加载表单数据
 const flowLoading = ref(false)			//加载流程数据
-const versiontitle = ref<any>("1")
+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 formState = reactive({
     formData: {
@@ -106,11 +108,27 @@ const gainFormData = () =>{
 						})
 			}
 			nextTick(() => {
-				formEl.value.getData({ id: props.flowLogInfo.flowkeys,version: props.flowLogInfo.formVersionId})
-				formState.loading = false
+				// formEl.value.getData({ id: props.flowLogInfo.flowkeys,version: props.flowLogInfo.formVersionId})
+				// formState.loading = false
 			})
 			formLoading.value = false
 		})
+		.finally(() => {
+			gainEditFormFlowInfo({ id: props.flowLogInfo.flowkeys})
+				.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
+					
+					
+				})
+
+		})
 		
 }
 
@@ -142,7 +160,7 @@ const closeAppSubmit = () => {
 const runstep = ref(null)
 //重新提交审核
 const anewSubmit = (type: string,val?:any) => {
-	console.log("重新提交数据---<",type,val)
+	
 	if(type == "success"){
 		afreshRunFlow({id:props.flowLogInfo.flowkeys})
 			.then((data:any) => {
@@ -166,9 +184,23 @@ const saveEditFormInfo  = (type: string,val?:any) => {
 const sendDraftSubmit =  (type: string,val?:any) => {
 	
 	if(type == "success"){
+		let sendInfo ={
+			id:props.flowLogInfo.flowkeys,
+			flowList:flowAry.value,
+			state:3
+		}
+		onlyPublishFlow(sendInfo)
+			.then((data:any) =>{
+				console.log("草稿提交审批---<",sendInfo,data)
+				if(data.code == 0){
+					ElMessage.success(data.msg || '提交成功！')
 					runstep.value.gainRunFlowTask()
 					drawerBeforeClose();
 				}
+			})
+		// 
+		// 
+	}
 }
 </script>
 <template>
@@ -193,10 +225,83 @@ const sendDraftSubmit =  (type: string,val?:any) => {
 							:save-edit-form-info="saveEditFormInfo"
 							:send-draft-submit= "sendDraftSubmit"
 						/>
+						<el-divider v-if="logistrue" content-position="left">历史记录</el-divider>
+						<el-timeline>
+							<el-timeline-item v-if="newLogAry.length > 0" :timestamp="newLogAry.logTime" placement="top">
+								<el-card>
+									<el-descriptions
+										direction="vertical"
+										:column="4"
+										size="24px"
+										border
+									>	
+										<div  v-for="(item,index) in newLogAry"  :key="index">
+											<el-descriptions-item v-if="!Array.isArray(item)&&index!='logTime'" :label="index">
+												{{ item }}
+											</el-descriptions-item>
+											<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4">
+											
+												<el-descriptions
+													
+													direction="vertical"
+													:column="4"
+													size="24px"
+													border
+												>
+													<el-descriptions-item  v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs">
+														{{ items }}
+													</el-descriptions-item>
+												</el-descriptions>
+												
+											</el-descriptions-item>
+											
+										</div>
+									</el-descriptions>
+
+								</el-card>
+							</el-timeline-item>
+							
+							<el-timeline-item v-for="itemss in oldLogAry" :key="itemss.id" :timestamp="itemss.logTime" placement="top">
+								<el-card>
+									<el-descriptions
+										direction="vertical"
+										:column="4"
+										size="24px"
+										border
+									>	
+										<div  v-for="(item,index) in itemss"  :key="index">
+											<el-descriptions-item v-if="!Array.isArray(item)&&index!='logTime'" :label="index">
+												{{ item }}
+											</el-descriptions-item>
+											<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4">
+											
+												<el-descriptions
+													
+													direction="vertical"
+													:column="4"
+													size="24px"
+													border
+												>
+													<el-descriptions-item  v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs">
+														{{ items }}
+													</el-descriptions-item>
+												</el-descriptions>
+												
+											</el-descriptions-item>
+											
 										</div>
+									</el-descriptions>
+								</el-card>
+							</el-timeline-item>
+					
+						</el-timeline>
+
+
+					</div>
+				
 				</td>
 				<td valign="top" width="350">
-					<RunFlowStep ref="runstep" :flow-key="props.flowLogInfo.flowkeys" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
+					<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.flowLogInfo.flowkeys" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
 				</td>
 			</tr>
 		</table>

src/views/taskplatform/taskmanagement/myrequest.vue

@@ -7,11 +7,13 @@
 import { ElMessage,ElMessageBox } from 'element-plus'
 
 import { Delete, Edit, Search, Share, Upload,View } from '@element-plus/icons-vue'
-import { taskFlowList,delRunFlow } from '@/api/DesignForm/requestapi'
+import { taskFlowList,delRunFlow,retractRunFlow } from '@/api/DesignForm/requestapi'
 import { taskflowquery } from '@/api/DesignForm/type'
 
 // import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookAndOperateLogInfo.vue'
 import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfo.vue'
+import EditFlowData from '@/views/taskplatform/taskmanagement/editFlowData.vue'
+
 
 const selectMyInfo = reactive<taskflowquery>({
 	page: 1,
@@ -59,7 +61,7 @@ onMounted(()=>{
 })
 const flowLogInfo = ref<any>()
 const darwOpenOrClose = ref(false)
-
+const editOpenOrClose = ref(false)
 /**
  * 查看流程任务
  * val					记录内容
@@ -90,7 +92,7 @@ const editFormSend = (val:any) =>{
 	drawerMyWith.value = myappbox.value?.clientWidth
 	flowLogInfo.value = val
 	versionId.value = val.version
-	darwOpenOrClose.value = true
+	editOpenOrClose.value = true
 	inFoid.value = val.idStr
 }
 /**
@@ -136,6 +138,35 @@ const submitApproval = (val:any) =>{
 	darwOpenOrClose.value = true
 	inFoid.value = val.idStr
 }
+/**
+ * 撤回申请189778492982824960
+ */
+const retractFlowInfo = (val:any) => {
+	ElMessageBox.confirm(
+		"您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！",
+		'Warning',
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+		}
+	)
+	.then(() => {
+
+		let sendInfo = {
+			id: val.flowkeys,
+		}
+		retractRunFlow(sendInfo)
+			.then((data)=>{
+				getMyToDoList();
+				ElMessage({
+					message: '撤回成功！',
+					type: 'success'
+				})
+			})
+	})
+	.catch(() => {})
+}
 </script>
 <template>
 	<div ref="myappbox" class="app_box">
@@ -258,6 +289,15 @@ const submitApproval = (val:any) =>{
 							>
 								<el-button type="primary" size="small" class="fa fa-eye" @click="lookFlowInfo(scope.row,1)" />
 							</el-tooltip>
+							<el-tooltip
+								v-if="scope.row.isRetract"
+								class="box-item"
+								effect="dark"
+								content="撤回"
+								placement="top-end"
+							>
+								<el-button  size="small" class="fa fa-reply-all" @click="retractFlowInfo(scope.row)" />
+							</el-tooltip>
 							<el-tooltip
 								v-if="scope.row.status==2||scope.row.status==1"
 								class="box-item"
@@ -291,7 +331,7 @@ const submitApproval = (val:any) =>{
 
 			<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" :infoid="inFoid" :oper-state="operState" @getmytodolist="getMyToDoList" />
 
-			
+			<EditFlowData v-if="editOpenOrClose" v-model:isshow="editOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" :infoid="inFoid" :oper-state="operState" @getmytodolist="getMyToDoList" />
 
 
 		</div>

src/views/taskplatform/taskmanagement/runFlowStep.vue

@@ -32,7 +32,7 @@ const props = defineProps({
 	}
 })
 
-const emits = defineEmits(["updatelist"]);
+const emits = defineEmits(["update:flowary","updatelist"]);
 
 const flowLoading = ref(false)
 const openOrClose = ref(false)		//开启指定人员选择
@@ -56,6 +56,7 @@ const gainRunFlowTask = () =>{
 			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
@@ -161,6 +162,9 @@ defineExpose({gainRunFlowTask})
 													<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 }}