diff --git a/src/views/taskplatform/taskmanagement/drafts.vue b/src/views/taskplatform/taskmanagement/drafts.vue
index d3d50248b..3411b759e 100644
--- a/src/views/taskplatform/taskmanagement/drafts.vue
+++ b/src/views/taskplatform/taskmanagement/drafts.vue
@@ -46,19 +46,7 @@ const resetQueryDr = () => {
   initDataDr();
 };
 //初始化数据
-<<<<<<< HEAD
-const initDataDr = () =>{
-	selectInfoDr.page = 1;
-	selectInfoDr.pagesize = 15;
-	selectInfoDr.title = ""
-	selectInfoDr.class = 1;
-	selectInfoDr.state = 1;
-}
-onMounted(()=>{
-	getToDoListDr();
-})
 
-=======
 const initDataDr = () => {
   selectInfoDr.page = 1;
   selectInfoDr.pagesize = 15;
@@ -69,7 +57,7 @@ const initDataDr = () => {
 onMounted(() => {
   getToDoListDr();
 });
->>>>>>> v3
+
 /**
  * 删除工作流
  */
@@ -106,132 +94,7 @@ const flowLogInfo = ref<any>();
 const versionId = ref<string>(); //使用版本
 const inFoid = ref<string>();
 //编辑表单
-<<<<<<< HEAD
-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 ref="myappbox" class="app_box">
-		<div class="app-container">
-			<div class="search">
-				<el-form ref="searckFormRefdr" :model="selectInfoDr" :inline="true">
-					<el-form-item label="任务标题" prop="name">
-						<el-input
-							v-model="selectInfoDr.title"
-							placeholder="请输入任务标题"
-							@keyup.enter="searchQuery"
-						/>
-					</el-form-item>
-					<el-form-item>
-						<el-button type="primary" @click="getToDoListDr()"><i-ep-search />搜索</el-button>
-						<el-button @click="resetQueryDr()"><i-ep-refresh />重置</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-			<el-card shadow="never">
-				<el-table
-					v-loadingDr="loadingDr"
-					element-loadingDr-text="Loading..."
-					highlight-current-row
-					:data="taskFlowAryDr"
-					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.creatorInfo.name }}（<el-text  type="info">{{ scope.row.creatorInfo.number }}</el-text>）	
-						</template>
-					</el-table-column>
-					<el-table-column  label="发起日期" prop="startDate" 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"
-								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 fixed="right" align="center" label="操作" width="150" >
-						<template #default="scope">
-							<el-button-group>
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="编辑"
-								placement="top-end"
-							>
-								<el-button type="warning"  size="small" class="fa fa-edit"  @click="editFlow(scope.row)" />
-							</el-tooltip>
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="删除"
-								placement="top-end"
-							>
-								<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>
-				<pagination
-					v-model:total="totalsdr"
-					v-model:page="selectInfoDr.page"
-					v-model:limit="selectInfoDr.pagesize"
-					@pagination="getToDoListDr"
-				/>
-			</el-card>
-=======
 const editFlow = (val: any) => {
   operState.value = 4;
   drawerMyWith.value = myappbox.value?.clientWidth;
@@ -373,7 +236,7 @@ const editFlow = (val: any) => {
           @pagination="getToDoListDr"
         />
       </el-card>
->>>>>>> v3
+
 
       <LookAndOperateLogInfo
         v-if="darwOpenOrClose"
diff --git a/src/views/taskplatform/taskmanagement/myrequest.vue b/src/views/taskplatform/taskmanagement/myrequest.vue
index 320dc848a..1bc2576b1 100644
--- a/src/views/taskplatform/taskmanagement/myrequest.vue
+++ b/src/views/taskplatform/taskmanagement/myrequest.vue
@@ -172,10 +172,7 @@ const retractFlowInfo = (val:any) => {
 	})
 	.catch(() => {})
 }
-<<<<<<< HEAD
 
-=======
->>>>>>> v3
 </script>
 <template>
 	<div ref="myappbox" class="app_box">