diff --git a/supervise-uniapp/App.vue b/supervise-uniapp/App.vue
index cd0d74e5..32242828 100644
--- a/supervise-uniapp/App.vue
+++ b/supervise-uniapp/App.vue
@@ -12,6 +12,7 @@
 			sid: "",
 			headImage: "",
 			username: "",
+			orgSidPath: "",
 			orgNamePath: "",
 			organizationSid: "",
 		}, //全局变量，
diff --git a/supervise-uniapp/common/request.api.js b/supervise-uniapp/common/request.api.js
index 807cb51f..ea62fbeb 100644
--- a/supervise-uniapp/common/request.api.js
+++ b/supervise-uniapp/common/request.api.js
@@ -84,19 +84,46 @@ export default {
 
 	// 获取首页面数据
 	getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params),
-	
+
 	// 获取消息类型列表
 	messageTypeList: (params = {}) => request.post("/reportwxmpapi/MessageType/list ", params),
-	
+
 	// 获取风险预警消息
 	riskListPage: (params = {}) => request.post("/reportwxmpapi/ImgMessagesLog/listPage", params),
-	
+
 	// 获取待阅工作、已阅工作
 	messageListPage: (params = {}) => request.post("/reportwxmpapi/messagepushlog/listPage", params),
-	
+
 	// 获取设备状态
 	deviceListPage: (params = {}) => request.post("/reportwxmpapi/RiskMessagesLog/listPage", params),
 
+
+	// 获取待办工作列表
+	todoAllTaskList: (params = {}) => request.post("/api/portal/v1/flow/todoAllTaskList/" + params.params.userSid,
+		params),
+
+	// 获取已办工作列表
+	doneAllTaskList: (params = {}) => request.post("/api/portal/v1/flow/doneAllTaskList/" + params.params.userSid,
+		params),
+
+	// 获取业务流转记录
+	flowRecordList: (params = {}) => request.get("/api/portal/v1/flow/task/flowRecord/" + params.procInsId + "/" +
+		params.deployId, {}),
+
+	// 同意申请
+	completeProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/complete", params),
+
+	// 终止申请
+	breakProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/breakProcess", params),
+
+	// 撤回申请
+	revokeProcess: (params = {}) => request.post("/enterprisecentre/v1/sealrecord/revokeProcess", params),
+
+	// 获取用章申请详情
+	sealApplyDetail: (params = {}) => request.get("/enterprisecentre/v1/sealrecord/fetchDetailsBySid/" + params,
+		params),
+
+
 	// 获取云仓列表
 	storeHouseListPage: (params = {}) => request.post("/api/portal/v1/flow/storeHouseListPage", params),
 	// 获取云仓详情
@@ -119,17 +146,17 @@ export default {
 
 	// 获取数据总览列表
 	projectListPage: (params = {}) => request.post("/reportwxmpapi/projectdaily/selectListPage", params),
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
 	// 修改密码
 	updatePassword: (params = {}) => request.post("/api/portal/v1/sysuser/updatePassword", params),
-	
+
 	// 修改头像
 	uploadHandImage: (params = {}) => request.post("/api/portal/v1/sysuser/uploadImage", params),
-	
+
 }
\ No newline at end of file
diff --git a/supervise-uniapp/common/wxSilentLogin.js b/supervise-uniapp/common/wxSilentLogin.js
index 0c8d6139..de1ac3cc 100644
--- a/supervise-uniapp/common/wxSilentLogin.js
+++ b/supervise-uniapp/common/wxSilentLogin.js
@@ -82,6 +82,7 @@ const wxSilentLogin = () => {
 										.mobile
 									
 									getApp().globalData.isAdmin = res.data.data.isAdmin
+									getApp().globalData.orgSidPath = res.data.data.orgSidPath
 									getApp().globalData.orgNamePath = res.data.data.orgNamePath
 									getApp().globalData.organizationSid = res.data.data.organizationSid
 									getApp().globalData.headImage = res.data.data.headImage
diff --git a/supervise-uniapp/components/ProcessButtons/ProcessButtons.vue b/supervise-uniapp/components/ProcessButtons/ProcessButtons.vue
new file mode 100644
index 00000000..578612fb
--- /dev/null
+++ b/supervise-uniapp/components/ProcessButtons/ProcessButtons.vue
@@ -0,0 +1,202 @@
+<template>
+	<view class="pages">
+
+		<view style="flex: 1;"></view>
+		<text class="btn-break" @click="btnClick('break')" v-show="showBreak">撤回</text>
+		<text class="btn-stop" @click="btnClick('stop')" v-show="showOther">终止</text>
+		<text class="btn-agree" @click="btnClick('agree')" v-show="showOther">同意</text>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "ProcessButtons",
+		props: {
+
+			showBreak: {
+				type: Boolean,
+				default: false
+			},
+			showOther: {
+				type: Boolean,
+				default: true
+			},
+			linkByParameter: Object,
+			
+		},
+		watch: {
+			linkByParameter(newVal) {
+				console.log('xxx', newVal);
+			}
+		},
+
+		data() {
+			return {};
+		},
+		methods: {
+
+
+			btnClick(type) {
+				var _that = this
+				console.log('1111>>>>>>', _that.linkByParameter)
+				switch (type) {
+					case "break":
+
+						wx.showModal({
+							title: '请填写审批意见',
+							editable: true,
+							confirmText: "提交",
+							content: '',
+							success(res) {
+								if (res.confirm) {
+									console.log('用户点击确定', res)
+
+									if (res.content) {
+
+										_that.linkByParameter.comment = res.content
+									} else {
+										wx.showToast({
+											title: '请填写审批意见',
+											icon: 'error',
+											duration: 3000
+										})
+										return
+									}
+									console.log('1111>>>>>>', _that.linkByParameter)
+									_that.$api.revokeProcess(_that.linkByParameter).then((resp) => {
+										console.log('1111>>>>>>', resp)
+										
+										_that.$emit("call-father");
+
+									}).catch(e => {
+										console.log('eeeee', e)
+										
+									})
+
+								} else if (res.cancel) {
+									console.log('用户点击取消', res)
+								}
+							}
+						})
+
+						break;
+					case "stop":
+
+						wx.showModal({
+							title: '请填写审批意见',
+							editable: true,
+							confirmText: "提交",
+							content: '',
+							success(res) {
+								if (res.confirm) {
+									console.log('用户点击确定', res)
+
+									if (res.content) {
+
+										_that.linkByParameter.comment = res.content
+									} else {
+										wx.showToast({
+											title: '请填写审批意见',
+											icon: 'error',
+											duration: 3000
+										})
+										return
+									}
+									console.log('1111>>>>>>', _that.linkByParameter)
+									_that.$api.breakProcess(_that.linkByParameter).then((resp) => {
+										console.log('1111>>>>>>', resp)
+										_that.$emit("call-father");
+
+									}).catch(e => {
+										console.log('eeeee', e)
+									})
+
+								} else if (res.cancel) {
+									console.log('用户点击取消', res)
+								}
+							}
+						})
+
+
+						break;
+
+					case "agree":
+
+						wx.showModal({
+							title: '请填写审批意见',
+							editable: true,
+							confirmText: "提交",
+							content: '',
+							success(res) {
+								if (res.confirm) {
+									console.log('用户点击确定', res)
+
+									_that.linkByParameter.comment = res.content == '' ? "同意" : res.content
+									console.log('1111>>>>>>', _that.linkByParameter)
+									_that.$api.completeProcess(_that.linkByParameter).then((resp) => {
+										console.log('1111>>>>>>', resp)
+
+										_that.$emit("call-father");
+									}).catch(e => {
+										console.log('eeeee', e)
+									})
+
+								} else if (res.cancel) {
+									console.log('用户点击取消', res)
+								}
+							}
+						})
+
+
+						break;
+					default:
+						break;
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+		width: 90%;
+		background: #fff;
+		display: flex;
+		flex-direction: row;
+		justify-content: end;
+		padding: 10px 20px;
+
+		.btn-break {
+			margin-right: 10px;
+			background: #fff;
+			border-radius: 15px;
+			border: 1px solid #999;
+			font-size: 14px;
+			text-align: center;
+			padding: 5px 20px;
+			color: #666;
+		}
+
+		.btn-stop {
+			margin-right: 10px;
+			background: #fff;
+			border-radius: 15px;
+			border: 1px solid #999;
+			font-size: 14px;
+			text-align: center;
+			padding: 5px 20px;
+			color: #666;
+		}
+
+		.btn-agree {
+			background: #0A59F7;
+			border-radius: 15px;
+			font-size: 14px;
+			text-align: center;
+			padding: 5px 20px;
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/components/ProcessRecords/ProcessRecords.vue b/supervise-uniapp/components/ProcessRecords/ProcessRecords.vue
new file mode 100644
index 00000000..3e6be72e
--- /dev/null
+++ b/supervise-uniapp/components/ProcessRecords/ProcessRecords.vue
@@ -0,0 +1,371 @@
+<template>
+	<view class="pages">
+		<view class="top">
+				<text class="title">审批流程</text>
+				<text class="state" v-if="isFinish!=''">- 已办结</text>
+		</view>
+	
+
+		<view v-for="(item,index) in dataList" class="newslist">
+
+			<view class="item">
+
+				<view class="item-top">
+
+					<text class="item-top-taskName">{{item.taskName}}</text>
+					<text class="item-top-taskstate" v-if="item.comment.type ==''">审批中</text>
+				</view>
+
+				<view class="item-bom">
+
+					<view class="item-bom-view1"
+						:class="{'item-bom-view2':item.comment.type =='','item-bom-view3':item.comment.type =='0'}">
+					</view>
+
+					<view class="item-bom-one" v-if="item.taskUserInfos.length==1">
+
+						<view class="item-bom-one-lay">
+							<view class="item-bom-one-lay-img">
+
+								<image class="item-bom-one-lay-img-header"
+									src='https://supervise.yxtsoft.com/img/user/userImage.png'></image>
+
+								<image class="item-bom-one-lay-img-state" v-if="item.comment.type=='0'"
+									src='/static/baseIcon/fqw.png'></image>
+
+								<image class="item-bom-one-lay-img-state" v-if="item.comment.type=='1'"
+									src='/static/baseIcon/ty.png'></image>
+
+								<image class="item-bom-one-lay-img-state" v-if="item.comment.type=='6'"
+									src='/static/baseIcon/jj.png'></image>
+
+								<image class="item-bom-one-lay-img-state" v-if="item.comment.type==''"
+									src='/static/baseIcon/spz.png'></image>
+
+							</view>
+
+							<view class="item-bom-one-lay-right">
+
+								<view class="item-bom-one-lay-right-top">
+									<text
+										class="item-bom-one-lay-right-top-name">{{item.taskUserInfos[0].assigneeName}}</text>
+									<text class="item-bom-one-lay-right-top-time"
+										v-show="item.finishTime!=null">{{item.finishTime}}</text>
+								</view>
+
+								<text class="item-bom-one-lay-right-top-state" v-if="item.comment.type=='0'">发起申请</text>
+								<text class="item-bom-one-lay-right-top-state" v-if="item.comment.type=='1'">已同意</text>
+								<text class="item-bom-one-lay-right-top-state" v-if="item.comment.type=='6'">已拒绝</text>
+
+							</view>
+
+						</view>
+
+						<view class="item-bom-one-opinion" v-if="item.comment.comment!=''">
+
+							<text>审批意见：</text>
+							<text>{{item.comment.comment}}</text>
+
+						</view>
+
+
+					</view>
+
+					<scroll-view class="item-bom-list" scroll-x="true" @scroll="scroll"
+						v-if="item.taskUserInfos.length>1">
+
+						<view style="display: flex;flex-direction: row; margin-right: 20px;">
+
+							<view v-for="(info,pos) in item.taskUserInfos" class="item-bom-list-newslist">
+
+								<view class="item-bom-list-newslist-item">
+
+									<view class="item-bom-list-newslist-item-img">
+
+										<image class="item-bom-list-newslist-item-img-header"
+											src='https://supervise.yxtsoft.com/img/user/userImage.png'></image>
+
+										<image class="item-bom-list-newslist-item-img-state"
+											src='../../static/baseIcon/spz.png'></image>
+
+									</view>
+
+									<text class="item-bom-list-newslist-item-name">{{info.assigneeName}}</text>
+
+								</view>
+
+							</view>
+						</view>
+					</scroll-view>
+
+
+				</view>
+
+
+
+			</view>
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "ProcessRecords",
+		props: {
+			dataList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			procInsId: {
+				type: String,
+				default: ""
+			},
+			deployId: {
+				type: String,
+				default: ""
+			},
+			isFinish:{
+				type: String,
+				default: ""
+			}
+		},
+		data() {
+			return {
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+			};
+		},
+		methods: {
+			scroll: function(e) {
+				console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+		margin-bottom: 150px;
+		display: flex;
+		flex-direction: column;
+	
+	.top{
+		display: flex;
+		flex-direction: row;
+		width: 100%;
+			background: #fff;
+			align-items: center;
+				padding-top: 15px;
+		.title {
+			
+			margin-left: -5px;
+			font-size: 18px;
+			font-weight: 600;
+			font-family: sans-serif;
+			color: #000;
+		}
+		.state{
+		
+			margin-left: 5px;
+			font-size: 15px;
+			font-weight: 600;
+			font-family: sans-serif;
+			color: #848484;
+		}
+	}
+
+		
+
+		.newslist {
+				background: #fff;
+			padding-bottom: 10px;
+			padding-left: 20px;
+			padding-right: 20px;
+			width: 100%;
+			padding-top: 10px;
+			display: flex;
+			flex-direction: column;
+
+			.item {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+
+				.item-top {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+
+					.item-top-taskName {
+						font-size: 16px;
+						font-weight: 600;
+						font-family: sans-serif;
+						color: #000;
+					}
+
+					.item-top-taskstate {
+						margin-left: 10px;
+						font-size: 15px;
+						color: #848484;
+					}
+				}
+
+				.item-bom {
+					margin-left: 5px;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					margin-top: 10px;
+					margin-right: 20px;
+
+					.item-bom-view1 {
+						width: 2px;
+						height: 100%;
+						margin-right: 5px;
+						background: #1684FC;
+					}
+
+					.item-bom-view2 {
+						margin-right: 5px;
+						width: 2px;
+						height: 100%;
+						background: #ccc;
+					}
+
+					.item-bom-view3 {
+						margin-right: 5px;
+						width: 2px;
+						height: 100%;
+						background: none
+					}
+
+
+					.item-bom-one {
+						width: 100%;
+						margin: 10px;
+						display: flex;
+						flex-direction: column;
+						margin-right: 30px;
+
+						.item-bom-one-lay {
+							display: flex;
+							flex-direction: row;
+							align-items: center;
+
+							.item-bom-one-lay-img {
+								width: 50px;
+								height: 50px;
+
+								.item-bom-one-lay-img-header {
+									width: 40px;
+									height: 40px;
+									border-radius: 10px;
+								}
+
+								.item-bom-one-lay-img-state {
+									width: 15px;
+									height: 15px;
+									z-index: 1000;
+									position: relative;
+									top: -15px;
+									right: -28px;
+								}
+							}
+
+
+							.item-bom-one-lay-right {
+								flex: 1;
+								margin-left: 5px;
+								margin-top: -10px;
+								display: flex;
+								flex-direction: column;
+
+								.item-bom-one-lay-right-top {
+									display: flex;
+									flex-direction: row;
+									align-items: center;
+
+									.item-bom-one-lay-right-top-name {
+										flex: 1;
+										font-size: 14px;
+										color: #232323;
+									}
+
+									.item-bom-one-lay-right-top-time {
+										font-size: 12px;
+										color: #999999;
+
+									}
+								}
+
+								.item-bom-one-lay-right-top-state {
+									margin-top: 5px;
+									font-size: 12px;
+									color: #666666;
+								}
+							}
+						}
+
+						.item-bom-one-opinion {
+							font-size: 13px;
+							color: #666666;
+						}
+
+					}
+
+
+					.item-bom-list {
+						width: 90%;
+
+						.item-bom-list-newslist {
+							display: flex;
+							flex-direction: row;
+
+							.item-bom-list-newslist-item {
+								display: flex;
+								margin: 10px;
+								flex-direction: column;
+								justify-content: center;
+
+								.item-bom-list-newslist-item-img {
+									width: 50px;
+									height: 50px;
+
+									.item-bom-list-newslist-item-img-header {
+										width: 40px;
+										height: 40px;
+										border-radius: 10px;
+
+									}
+
+									.item-bom-list-newslist-item-img-state {
+										width: 15px;
+										height: 15px;
+										z-index: 1000;
+										position: relative;
+										top: -15px;
+										right: -28px;
+									}
+								}
+
+								.item-bom-list-newslist-item-name {
+									text-align: center;
+									margin-left: -8px;
+									font-size: 14px;
+									color: #232323;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages.json b/supervise-uniapp/pages.json
index 96b7aaaa..761ce2b3 100644
--- a/supervise-uniapp/pages.json
+++ b/supervise-uniapp/pages.json
@@ -33,6 +33,14 @@
 				"navigationBarTitleText": "工作台"
 			}
 		},
+		{
+					"path": "pages/index/WaitingProcessed",
+					"style": {
+						"navigationBarTitleText": "待办工作",
+						"enablePullDownRefresh": true
+					}
+		
+				},
 
 	{
 		"path": "pages/home/MessageFragment",
@@ -69,14 +77,7 @@
 		},
 
 
-		{
-			"path": "pages/index/WaitingProcessed",
-			"style": {
-				"navigationBarTitleText": "待办工作",
-				"enablePullDownRefresh": true
-			}
-
-		},
+		
 
 
 		{
@@ -363,6 +364,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/index/sealApplyDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "印鉴申请详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"lazyCodeLoading": "requiredComponents",
 	"globalStyle": {
diff --git a/supervise-uniapp/pages/home/WorkFragment.vue b/supervise-uniapp/pages/home/WorkFragment.vue
index acb57571..5fc0d1b4 100644
--- a/supervise-uniapp/pages/home/WorkFragment.vue
+++ b/supervise-uniapp/pages/home/WorkFragment.vue
@@ -19,7 +19,7 @@
 
 				<view style="display: flex;flex-direction: row;">
 
-					<!-- <view class="top_item" @click="topClick('1')">
+					<view class="top_item" @click="topClick('1')">
 						<view class="top_item_icon">
 							<text class="top_item_icon_num" v-show="dbNum!=0">{{dbNum}}</text>
 							<image class="top_item_icon_img" src="https://supervise.yxtsoft.com/img/newApp/dbgz.png">
@@ -35,7 +35,7 @@
 							</image>
 						</view>
 						<text class="top_item_text">已办工作</text>
-					</view> -->
+					</view>
 					<view class="top_item" @click="topClick('3')">
 						<view class="top_item_icon">
 							<text class="top_item_icon_num" v-show="dyNum!=0">{{dyNum}}</text>
@@ -296,7 +296,7 @@
 					// if (resp.success) {
 					console.log('1111', resp)
 					this.isShow = msg;
-					this.dbNum = resp.todoNumber
+					this.dbNum = resp.toDo
 					this.dyNum = resp.pendingMessages
 					this.textArr = resp.notice
 					this.swipers = resp.urls
diff --git a/supervise-uniapp/pages/index/AlreadyProcessed.vue b/supervise-uniapp/pages/index/AlreadyProcessed.vue
index 2e8d1c4d..d0cae543 100644
--- a/supervise-uniapp/pages/index/AlreadyProcessed.vue
+++ b/supervise-uniapp/pages/index/AlreadyProcessed.vue
@@ -17,44 +17,36 @@
 			@refresherrestore="onRestore" @refresherabort="onAbort" @scrolltolower="scrollBottem">
 
 			<view>
-				<view v-for="(item,index) in dataList" class="newslist">
+				<view v-for="(item,index) in dataList" class="newslist" @click="itemClick(item)">
 
 					<view class="item-top">
 
 						<image class="item-top-img" src="../../static/baseIcon/work.png" mode="aspectFill"></image>
-						<view class="item-top-text" v-html="highLight(item.workName)">{{item.workName}}</view>
-						<text class="item-top-text2">{{item.state}}</text>
+						<view class="item-top-text" v-html="highLight(item.procDefName)">{{item.procDefName}}</view>
+						<text class="item-top-text2">{{item.endTime==null?item.taskName:"已办结"}}</text>
 					</view>
 
 					<view class="item-con">
-						<view >
+						<view>
 							<text class="item-con-text">发起人：</text>
-							<text class="item-con-text">{{item.name}}</text>
+							<text class="item-con-text">{{item.startUserName}}</text>
 						</view>
 						<view style="margin-top: 8px;">
 							<text class="item-con-text">发起部门：</text>
-							<text class="item-con-text">{{item.department}}</text>
+							<text class="item-con-text">{{item.startDeptName}}</text>
 						</view>
-						<view  style="margin-top: 8px;">
+						<view style="margin-top: 8px;">
 							<text class="item-con-text">发起日期：</text>
-							<text class="item-con-text">{{item.startDate}}</text>
+							<text class="item-con-text">{{item.createTime}}</text>
 						</view>
-						<view  style="margin-top: 8px;">
+						<view style="margin-top: 8px;">
 							<text class="item-con-text">当前处理人：</text>
-							<text class="item-con-text">{{item.currentProcessor}}</text>
+							<text class="item-con-text">{{item.assigneeName}}</text>
 						</view>
-						
 
-					</view>
 
-					<view class="item-bom">
-						<view style="flex: 1;"></view>
-						<image class="item-bom-img" src="../../static/baseIcon/submitTime.png" mode="aspectFill">
-						</image>
-						<text class="item-bom-text">{{item.submitDate}}</text>
 					</view>
 
-
 				</view>
 
 				<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
@@ -71,20 +63,20 @@
 			<view class="drawerView">
 				<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">申请日期</text>
 				<view class="drawerView-date">
-					<input class="drawerView-date-text" v-model="search.startDate" placeholder="开始日期" :disabled="true"
-						@click="openDate(1)">
+					<input class="drawerView-date-text" v-model="listQuery.params.startDate" placeholder="开始日期"
+						:disabled="true" @click="openDate(1)">
 					<text style="margin-left: 10px;margin-right: 10px;color: #777;">至</text>
-					<input class="drawerView-date-text" v-model="search.endDate" placeholder="结束日期" :disabled="true"
-						@click="openDate(2)">
+					<input class="drawerView-date-text" v-model="listQuery.params.endDate" placeholder="结束日期"
+						:disabled="true" @click="openDate(2)">
 				</view>
 
-				<text
-					style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif; margin-top: 20px;">发起人</text>
+				<!-- 	<text
+					style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif; margin-top: 20px;">发起人</text> -->
 
 				<!-- 		<uni-data-checkbox @change="checkboxChange"  selectedColor="#007AFF" mode="list" :localdata="personnelList" :multiple="false" >
 					
 				</uni-data-checkbox> -->
-
+				<!-- 
 				<scroll-view scroll-y :show-scrollbar="true"
 					style="display: flex;flex-direction: column; margin-top: 20px;width: 100%; height:50%; overflow:auto;">
 
@@ -93,14 +85,12 @@
 						<view class="to_do_content_list_checkbox">
 							<view class="checkbox"></view>
 						</view>
-						<!-- 内容 -->
 						<view class="to_do_content_list_cont">{{item.name}}</view>
 					</view>
 
 
 
-				</scroll-view>
-
+				</scroll-view -->>
 
 
 
@@ -132,111 +122,10 @@
 	export default {
 		data() {
 			return {
-				searchText: "",
-				search: {
-					startDate: "",
-					endDate: "",
-					promoter: ""
-				},
 				selectDate: "",
 				datetimeShow: false,
 				datetimeIndex: "1",
-				personnelList: [{
-						id: "1",
-						name: "张安1",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "2",
-						name: "张安2",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "3",
-						name: "张安3",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "4",
-						name: "张安4",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "5",
-						name: "张安5",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "6",
-						name: "张安6",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "7",
-						name: "张安7",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "8",
-						name: "张安8",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "9",
-						name: "张安9",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "10",
-						name: "张安10",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "11",
-						name: "张安11",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "12",
-						name: "张安12",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "13",
-						name: "张安13",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "14",
-						name: "张安14",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "1",
-						name: "张安1",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "15",
-						name: "张安16",
-						department: "研发部",
-						checked: false
-					},
+				personnelList: [
 
 				],
 				triggered: true,
@@ -251,171 +140,43 @@
 					current: 1,
 					size: 10,
 					params: {
+						procDefName: "",
+						startDate: "",
+						endDate: "",
+						userSid: "",
 						woekName: "",
 					}
 				},
 				loadingType: 'more', //加载更多状态
-				dataList: [{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor:"张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-
-				],
+				dataList: [],
 
 			};
 		},
-		
+
 		created() {
 			this.$bus.$on('wholeSpin', msg => {
 				//这里获取到http工具js文件中传过来的wholeSpin值
 				console.log(">>>>>", this.isShow)
-		
+
 				var userSid = getApp().globalData.sid
 				console.log(">>>>>", userSid)
 				this.loadData();
 			});
 		},
-		
-		
+
+
 		onLoad() {
-		
+
 		},
-		
+
 		onShow() {
 			console.log('onShow', getApp().globalData.isLogin)
-			
+
 			let token = uni.getStorageSync("Global-Auth-Token")
 			if (token != null && token.length != 0) {
 				getApp().globalData.token = token
 			}
-			let isLogin =uni.getStorageSync("isLogin")
+			let isLogin = uni.getStorageSync("isLogin")
 			if (isLogin != null && isLogin == 1) {
 				getApp().globalData.isLogin = isLogin
 			}
@@ -423,26 +184,28 @@
 			if (sid != null && sid.length != 0) {
 				getApp().globalData.sid = sid
 			}
-			
+
 			console.log('用户Sid', getApp().globalData.sid)
 			console.log('token', getApp().globalData.token)
 			console.log('是否登陆', getApp().globalData.isLogin)
-			
+
 			// setTimeout(() => {
 			if (getApp().globalData.isLogin) {
 				var userSid = getApp().globalData.sid
 				console.log(">>>>>", userSid)
-					this.loadData();
+				this.listQuery.params.userSid = userSid
+				this.dataList = []
+				this.loadData();
 				// uni.setTabBarBadge({ //显示数字
 				// 	index: 0, //tabbar下标
 				// 	text: '100' //数字
 				// })
 			} else {
-			
+
 				/*  #ifdef  MP-WEIXIN */
 				this.WxSilentLogin()
 				/* #endif */
-			
+
 				/*  #ifdef APP-PLUS */
 				uni.redirectTo({
 					url: '../login/login'
@@ -450,27 +213,7 @@
 				/* #endif */
 			}
 		},
-		
-		// onShow() {
-		// 	this.listQuery.current = 1
-		// 	this.dataList = [];
-		// 	this.loadData();
-		// },
-		// onLoad() {
-
-		// },
-		// onPullDownRefresh() {
-		// 	this.listQuery.current = 1
-		// 	this.loadData('refresh');
-		// 	setTimeout(function() {
-		// 		uni.stopPullDownRefresh();
-		// 	}, 2000);
-		// },
-		// //加载更多
-		// onReachBottom() {
-		// 	this.listQuery.current = this.listQuery.current + 1
-		// 	this.loadData();
-		// },
+
 		onReady() {
 			/*  #ifdef  MP-WEIXIN */
 			// 微信小程序需要用此写法
@@ -504,17 +247,21 @@
 				console.log("onAbort");
 			},
 			searchInput(e) {
-				console.log("searchText》》》", e.detail.value);
-				this.searchText = e.detail.value
+				this.listQuery.params.procDefName = e.detail.value
+				this.dataList = []
+				this.listQuery.current = 1,
+					this.listQuery.size = 10,
+
+					this.loadData()
 			},
 			highLight(value) {
 				console.log("highLight》》》", value);
 				if (value == '' || value == undefined || value == null)
 					return
-				if (value.includes(this.searchText)) {
+				if (value.includes(this.listQuery.params.procDefName)) {
 					value = value.replace(
-						this.searchText,
-						"<font style='color:red!important'>" + this.searchText + "</font>"
+						this.listQuery.params.procDefName,
+						"<font style='color:red!important'>" + this.listQuery.params.procDefName + "</font>"
 					)
 					return value
 				} else {
@@ -560,10 +307,10 @@
 
 				switch (this.datetimeIndex) {
 					case "1":
-						this.search.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						this.listQuery.params.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
 						break;
 					case "2":
-						this.search.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						this.listQuery.params.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
 						break;
 					default:
 						break;
@@ -594,24 +341,21 @@
 				// 	this.personnelList[index].checked = !this.personnelList[index].checked
 			},
 			resetClik() {
-				this.search = {
-					startDate: "",
-					endDate: "",
-					promoter: ""
-				}
+				this.listQuery.params.startDate = ""
+				this.listQuery.params.endDate = ""
 			},
 
 			assignClick() {
-				console.log('confirm', this.search)
+				console.log('confirm', this.listQuery.params)
 				this.datetimeShow = false
 
 				this.$refs['drawer'].close()
-				
-				uni.showToast({
-					icon: "none",
-					title:  JSON.stringify( this.search),
-					duration: 5000,
-				});
+
+				this.dataList = []
+				this.listQuery.current = 1,
+					this.listQuery.size = 10,
+
+					this.loadData()
 			},
 
 			//加载商品 ，带下拉刷新和上滑加载
@@ -627,18 +371,11 @@
 				}
 
 				var list = []
-
-				this.$api.storeHouseListPage(this.listQuery).then((resp) => {
+				console.log('listQuery', this.listQuery)
+				this.$api.doneAllTaskList(this.listQuery).then((resp) => {
 					// if (resp.success) {
 					console.log('1111', resp)
 
-					this.listQuery = {
-						current: resp.current,
-						size: 10,
-						params: {
-
-						}
-					}
 					list = resp.records
 
 					console.log("消息列表", list)
@@ -665,6 +402,35 @@
 				})
 
 			},
+			itemClick(item) {
+				console.log('item', item)
+
+				var sid = item.processVariables.businessSid
+				var procInsId = item.procInsId
+				var deployId = item.deployId
+				var previousPersonSid = item.previousPersonSid
+				var taskId = item.taskId
+				var taskDefKey = item.taskDefKey
+
+				var isFinish = item.endTime == null?"":item.endTime
+
+				console.log('sid', sid)
+				console.log('procInsId', procInsId)
+				console.log('deployId', deployId)
+				console.log('previousPersonSid', previousPersonSid)
+				console.log('taskId', taskId)
+				console.log('taskDefKey', taskDefKey)
+				console.log('isFinish', isFinish)
+
+
+
+				uni.navigateTo({
+					url: 'sealApplyDetail?sid=' + sid + "&procInsId=" + procInsId + "&deployId=" + deployId +
+						"&previousPersonSid=" + previousPersonSid + "&type=2" + "&isFinish="+isFinish+
+					"&taskId=" + taskId + "&taskDefKey=" + taskDefKey
+				});
+
+			}
 		}
 	}
 </script>
diff --git a/supervise-uniapp/pages/index/WaitingProcessed.vue b/supervise-uniapp/pages/index/WaitingProcessed.vue
index b15740a5..11073706 100644
--- a/supervise-uniapp/pages/index/WaitingProcessed.vue
+++ b/supervise-uniapp/pages/index/WaitingProcessed.vue
@@ -17,27 +17,27 @@
 			@refresherrestore="onRestore" @refresherabort="onAbort" @scrolltolower="scrollBottem">
 
 			<view>
-				<view v-for="(item,index) in dataList" class="newslist">
+				<view v-for="(item,index) in dataList" class="newslist" @click="itemClick(item)">
 
 					<view class="item-top">
 
 						<image class="item-top-img" src="../../static/baseIcon/work.png" mode="aspectFill"></image>
-						<view class="item-top-text" v-html="highLight(item.workName)">{{item.workName}}</view>
-						<text class="item-top-text2">{{item.state}}</text>
+						<view class="item-top-text" v-html="highLight(item.procDefName)">{{item.procDefName}}</view>
+						<text class="item-top-text2">{{item.taskName}}</text>
 					</view>
 
 					<view class="item-con">
 						<view>
 							<text class="item-con-text">发起人：</text>
-							<text class="item-con-text">{{item.name}}</text>
+							<text class="item-con-text">{{item.startUserName}}</text>
 						</view>
 						<view style="margin-top: 8px;">
 							<text class="item-con-text">发起部门：</text>
-							<text class="item-con-text">{{item.department}}</text>
+							<text class="item-con-text">{{item.startDeptName}}</text>
 						</view>
 						<view style="margin-top: 8px;">
 							<text class="item-con-text">发起日期：</text>
-							<text class="item-con-text">{{item.startDate}}</text>
+							<text class="item-con-text">{{item.createTime}}</text>
 						</view>
 
 					</view>
@@ -46,7 +46,7 @@
 						<view style="flex: 1;"></view>
 						<image class="item-bom-img" src="../../static/baseIcon/submitTime.png" mode="aspectFill">
 						</image>
-						<text class="item-bom-text">{{item.submitDate}}</text>
+						<text class="item-bom-text">{{item.processCreateTime}}</text>
 					</view>
 
 
@@ -66,21 +66,21 @@
 			<view class="drawerView">
 				<text style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif;">申请日期</text>
 				<view class="drawerView-date">
-					<input class="drawerView-date-text" v-model="search.startDate" placeholder="开始日期" :disabled="true"
-						@click="openDate(1)">
+					<input class="drawerView-date-text" v-model="listQuery.params.startDate" placeholder="开始日期"
+						:disabled="true" @click="openDate(1)">
 					<text style="margin-left: 10px;margin-right: 10px;color: #777;">至</text>
-					<input class="drawerView-date-text" v-model="search.endDate" placeholder="结束日期" :disabled="true"
-						@click="openDate(2)">
+					<input class="drawerView-date-text" v-model="listQuery.params.endDate" placeholder="结束日期"
+						:disabled="true" @click="openDate(2)">
 				</view>
 
-				<text
-					style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif; margin-top: 20px;">发起人</text>
+				<!-- <text
+					style="color: #101010;font-size: 16px;font-weight: 600;font-family: sans-serif; margin-top: 20px;">发起人</text> -->
 
 				<!-- 		<uni-data-checkbox @change="checkboxChange"  selectedColor="#007AFF" mode="list" :localdata="personnelList" :multiple="false" >
 					
 				</uni-data-checkbox> -->
 
-				<scroll-view scroll-y :show-scrollbar="true"
+				<!-- 	<scroll-view scroll-y :show-scrollbar="true"
 					style="display: flex;flex-direction: column; margin-top: 20px;width: 100%; height:50%; overflow:auto;">
 
 					<view class="to_do_content_list" :class="{'to_do_finish':item.checked}"
@@ -88,13 +88,12 @@
 						<view class="to_do_content_list_checkbox">
 							<view class="checkbox"></view>
 						</view>
-						<!-- 内容 -->
 						<view class="to_do_content_list_cont">{{item.name}}</view>
 					</view>
 
 
 
-				</scroll-view>
+				</scroll-view> -->
 
 
 
@@ -127,111 +126,10 @@
 	export default {
 		data() {
 			return {
-				searchText: "",
-				search: {
-					startDate: "",
-					endDate: "",
-					promoter: ""
-				},
 				selectDate: "",
 				datetimeShow: false,
 				datetimeIndex: "1",
-				personnelList: [{
-						id: "1",
-						name: "张安1",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "2",
-						name: "张安2",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "3",
-						name: "张安3",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "4",
-						name: "张安4",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "5",
-						name: "张安5",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "6",
-						name: "张安6",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "7",
-						name: "张安7",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "8",
-						name: "张安8",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "9",
-						name: "张安9",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "10",
-						name: "张安10",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "11",
-						name: "张安11",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "12",
-						name: "张安12",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "13",
-						name: "张安13",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "14",
-						name: "张安14",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "1",
-						name: "张安1",
-						department: "研发部",
-						checked: false
-					},
-					{
-						id: "15",
-						name: "张安16",
-						department: "研发部",
-						checked: false
-					},
+				personnelList: [
 
 				],
 				triggered: true,
@@ -246,141 +144,15 @@
 					current: 1,
 					size: 10,
 					params: {
+						proDefName: "",
+						startDate: "",
+						endDate: "",
+						userSid: "",
 						woekName: "",
 					}
 				},
 				loadingType: 'more', //加载更多状态
-				dataList: [{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
-					{
-						workName: "测试XXXX申请",
-						state: "经理审核",
-						name: "张磊",
-						department: "研发部",
-						startDate: "2022-01-23-10:26",
-						currentProcessor: "张衡、吴",
-						submitDate: "2022.01.28  10:28"
-
-					},
+				dataList: [
 
 				],
 
@@ -394,6 +166,7 @@
 
 				var userSid = getApp().globalData.sid
 				console.log(">>>>>", userSid)
+				this.listQuery.params.userSid = userSid
 				this.loadData();
 			});
 		},
@@ -427,6 +200,8 @@
 			if (getApp().globalData.isLogin) {
 				var userSid = getApp().globalData.sid
 				console.log(">>>>>", userSid)
+				this.listQuery.params.userSid = userSid
+				this.dataList=[]
 				this.loadData();
 				// uni.setTabBarBadge({ //显示数字
 				// 	index: 0, //tabbar下标
@@ -446,26 +221,6 @@
 			}
 		},
 
-		// onShow() {
-		// 	this.listQuery.current = 1
-		// 	this.dataList = [];
-		// 	this.loadData();
-		// },
-		// onLoad() {
-
-		// },
-		// onPullDownRefresh() {
-		// 	this.listQuery.current = 1
-		// 	this.loadData('refresh');
-		// 	setTimeout(function() {
-		// 		uni.stopPullDownRefresh();
-		// 	}, 2000);
-		// },
-		// //加载更多
-		// onReachBottom() {
-		// 	this.listQuery.current = this.listQuery.current + 1
-		// 	this.loadData();
-		// },
 		onReady() {
 			/*  #ifdef  MP-WEIXIN */
 			// 微信小程序需要用此写法
@@ -499,17 +254,21 @@
 				console.log("onAbort");
 			},
 			searchInput(e) {
-				console.log("searchText》》》", e.detail.value);
-				this.searchText = e.detail.value
+				this.listQuery.params.proDefName = e.detail.value
+				this.dataList = []
+				this.listQuery.current = 1,
+					this.listQuery.size = 10,
+
+					this.loadData()
 			},
 			highLight(value) {
 				console.log("highLight》》》", value);
 				if (value == '' || value == undefined || value == null)
 					return
-				if (value.includes(this.searchText)) {
+				if (value.includes(this.listQuery.params.proDefName)) {
 					value = value.replace(
-						this.searchText,
-						"<font style='color:red!important'>" + this.searchText + "</font>"
+						this.listQuery.params.proDefName,
+						"<font style='color:red!important'>" + this.listQuery.params.proDefName + "</font>"
 					)
 					return value
 				} else {
@@ -555,10 +314,10 @@
 
 				switch (this.datetimeIndex) {
 					case "1":
-						this.search.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						this.listQuery.params.startDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
 						break;
 					case "2":
-						this.search.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
+						this.listQuery.params.endDate = formatTimeTwo(parseInt(date.value), "Y-M-D")
 						break;
 					default:
 						break;
@@ -589,24 +348,27 @@
 				// 	this.personnelList[index].checked = !this.personnelList[index].checked
 			},
 			resetClik() {
-				this.search = {
-					startDate: "",
-					endDate: "",
-					promoter: ""
-				}
+				this.listQuery.params.startDate = ""
+				this.listQuery.params.endDate = ""
 			},
 
 			assignClick() {
-				console.log('confirm', this.search)
+				console.log('confirm', this.listQuery.params)
 				this.datetimeShow = false
 
 				this.$refs['drawer'].close()
 
-				uni.showToast({
-					icon: "none",
-					title: JSON.stringify(this.search),
-					duration: 5000,
-				});
+				this.dataList = []
+				this.listQuery.current = 1,
+					this.listQuery.size = 10,
+
+					this.loadData()
+
+				// uni.showToast({
+				// 	icon: "none",
+				// 	title: JSON.stringify(this.listQuery.params),
+				// 	duration: 5000,
+				// });
 			},
 
 			//加载商品 ，带下拉刷新和上滑加载
@@ -622,23 +384,23 @@
 				}
 
 				var list = []
-
-				this.$api.storeHouseListPage(this.listQuery).then((resp) => {
+				console.log('listQuery', this.listQuery)
+				this.$api.todoAllTaskList(this.listQuery).then((resp) => {
 					// if (resp.success) {
 					console.log('1111', resp)
 
-					this.listQuery = {
-						current: resp.current,
-						size: 10,
-						params: {
+					// this.listQuery = {
+					// 	current: resp.current,
+					// 	size: 10,
+					// 	params: {
+
+					// 	}
+					// }
 
-						}
-					}
 					list = resp.records
 
 					console.log("消息列表", list)
-					// this.goodsList = list;
-					// let goodsList = await this.$api.json('goodsList');
+
 					if (type === 'refresh') {
 						this.dataList = [];
 					}
@@ -660,6 +422,31 @@
 				})
 
 			},
+
+			itemClick(item) {
+				console.log('item', item)
+
+				var sid = item.processVariables.businessSid
+				var procInsId = item.procInsId
+				var deployId = item.deployId
+				var previousPersonSid = item.previousPersonSid
+				var taskId = item.taskId
+				var taskDefKey = item.taskDefKey
+
+				console.log('sid', sid)
+				console.log('procInsId', procInsId)
+				console.log('deployId', deployId)
+				console.log('previousPersonSid', previousPersonSid)
+				console.log('taskId', taskId)
+				console.log('taskDefKey', taskDefKey)
+
+				uni.navigateTo({
+					url: 'sealApplyDetail?sid=' + sid + "&procInsId=" + procInsId + "&deployId=" + deployId
+					 + "&previousPersonSid=" +previousPersonSid + "&type=1"
+					  + "&taskId=" +taskId + "&taskDefKey="+taskDefKey
+				});
+
+			}
 		}
 	}
 </script>
diff --git a/supervise-uniapp/pages/index/sealApplyDetail.vue b/supervise-uniapp/pages/index/sealApplyDetail.vue
new file mode 100644
index 00000000..1bfd0e48
--- /dev/null
+++ b/supervise-uniapp/pages/index/sealApplyDetail.vue
@@ -0,0 +1,337 @@
+<template>
+	<view class="pages">
+
+		<view class="top">
+
+			<text class="top-text1">{{info.applicant_name}}提交的印鉴使用申请</text>
+			<text class="top-text2">{{info.ent_name}}</text>
+
+		</view>
+
+		<view class="con">
+
+			<view class="con-item">
+				<text class="con-item-title">项目名称</text>
+				<text class="con-item-data">{{info.project_name}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">申请人</text>
+				<text class="con-item-data">{{info.applicant_name}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">使用人</text>
+				<text class="con-item-data">{{info.user_name}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">用印事由</text>
+				<text class="con-item-data">{{info.use_reason}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">使用日期</text>
+				<text class="con-item-data">{{info.use_date}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">用印文件名称</text>
+				<text class="con-item-data">{{info.use_file_name}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">加盖何种公章</text>
+				<text class="con-item-data">{{seal_type}}</text>
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">用印文件(附件)</text>
+
+				<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
+					<view style="display: flex;flex-direction: row;">
+						<view v-for="(item,index) in info.file_paths" class="newslist" @click="itemClick(item)">
+
+
+							<image class="newslist-item" :src="item"></image>
+						</view>
+					</view>
+				</scroll-view>
+
+
+			</view>
+			<view class="con-item">
+				<text class="con-item-title">备注</text>
+				<text class="con-item-data">{{info.remarks}}</text>
+			</view>
+		</view>
+
+		<ProcessRecords class="Process" :deployId='params.deployId' :procInsId='params.procInsId' :dataList='dataList' :isFinish="isFinish">
+		</ProcessRecords>
+
+
+		<ProcessButtons v-show="showBtn" class="ProcessButtons" :showBreak='showBreak' :showOther="showOther" :linkByParameter="linkByParameter"
+		@call-father="fatherMethodHandle">
+		 </ProcessButtons>
+
+		<view style="display: flex;flex-direction: column; height: 50px; margin-top: 150px;width: 100%;"></view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				scrollTop: 0,
+				old: {
+					scrollTop: 0
+				},
+				sid: "",
+				type: "",
+				showBtn: false,
+				showBreak: false,
+				showOther: true,
+				isFinish:"",
+				previousPersonSid:"",
+				linkByParameter:{
+					businessSid:"",
+					instanceId:"",
+					taskId:"",
+					taskDefKey:"",
+					orgsidPath:"",
+					comment:"",
+					userSid:"",
+				},
+				params: {
+					procInsId: "",
+					deployId: ""
+				},
+				info: {},
+				seal_type: "",
+				dataList: []
+			}
+		},
+		onLoad(option) {
+			this.sid = option.sid
+			this.type = option.type
+			this.previousPersonSid = option.previousPersonSid
+			this.isFinish = option.isFinish
+			
+	console.log('this.isFinish>>>>>>', option.isFinish)		
+			var userSid = getApp().globalData.sid
+
+			if (this.type == '1') {
+
+				this.showBtn = true
+				this.showBreak = false
+
+			} else {
+				this.showOther = false
+
+				if(this.isFinish){
+						this.showBtn = false
+				}else{
+					if (this.previousPersonSid != userSid) {
+						this.showBtn = false
+						this.showBreak = false
+					
+					} else {
+						this.showBtn = true
+						this.showBreak = true
+					}
+						
+				}
+			
+			}
+
+			this.getData(this.sid)
+			
+			this.linkByParameter={
+				
+				businessSid:option.sid,
+				instanceId:option.procInsId,
+				taskId: option.taskId,
+				taskDefKey:option.taskDefKey,
+				orgsidPath:getApp().globalData.orgSidPath,
+				comment:"",
+				userSid:getApp().globalData.sid,
+			}
+			
+
+			this.params = {
+				procInsId: option.procInsId,
+				deployId: option.deployId
+			}
+
+			console.log('this.params>>>>>>', this.params)
+
+			this.$api.flowRecordList(this.params).then((resp) => {
+
+				console.log('getData>>>>>>', resp.flowList)
+
+				this.dataList = resp.flowList
+
+
+			}).catch(e => {
+				console.log('eeeee', e)
+			})
+
+
+		},
+		methods: {
+			scroll: function(e) {
+				console.log(e)
+				this.old.scrollTop = e.detail.scrollTop
+			},
+			itemClick(imgUrl) {
+				wx.previewImage({
+					current: '',
+					urls: [imgUrl]
+
+				})
+			},
+			getData(sid) {
+				console.log('sid', sid)
+				var _this = this
+				this.$api.sealApplyDetail(sid).then((resp) => {
+					console.log('1111>>>>>>', resp)
+
+					_this.info = resp
+
+					for (var i = 0; i < _this.info.seal_type.length; i++) {
+						var data = _this.info.seal_type[i]
+						_this.seal_type += data + ","
+					}
+
+					console.log('seal_type>>>>>>', _this.seal_type.substring(0, _this.seal_type.length - 1))
+
+					_this.seal_type = _this.seal_type.substring(0, _this.seal_type.length - 1)
+
+					// _this.info.file_paths = [
+					// 	'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
+					// 	'https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg',
+					// 	'https://fuss10.elemecdn.com/9/bb/e27858e973f5d7d3904835f46abbdjpeg.jpeg',
+					// 	'https://fuss10.elemecdn.com/d/e6/c4d93a3805b3ce3f323f7974e6f78jpeg.jpeg',
+					// 	'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
+					// 	'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg'
+					// ]
+
+
+
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+
+
+			},
+			fatherMethodHandle(){
+					this.showBtn = false
+				this.$api.flowRecordList(this.params).then((resp) => {
+				
+					console.log('getData>>>>>>', resp.flowList)
+				
+					this.dataList = resp.flowList
+				
+				
+				}).catch(e => {
+					console.log('eeeee', e)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+
+		.top {
+			margin-top: 10px;
+			background: #fff;
+			padding: 10px 20px;
+			display: flex;
+			flex-direction: column;
+
+			.top-text1 {
+				font-size: 16px;
+				color: #101010;
+				font-weight: 600;
+				font-family: sans-serif;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+			}
+
+			.top-text2 {
+				margin-top: 5px;
+				font-size: 14px;
+				color: #666;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 1;
+				-webkit-box-orient: vertical;
+			}
+		}
+
+		.con {
+			margin-top: 10px;
+			background: #fff;
+			padding: 10px 20px;
+			display: flex;
+			flex-direction: column;
+
+			.con-item {
+				display: flex;
+				flex-direction: column;
+
+				.con-item-title {
+					margin-top: 10px;
+					font-size: 14px;
+					color: #A7A7A7;
+				}
+
+				.con-item-data {
+					margin-top: 5px;
+					font-size: 15px;
+					color: #191919;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					-webkit-box-orient: vertical;
+				}
+
+				.newslist {
+					display: flex;
+					flex-direction: row;
+					width: 100%;
+
+					.newslist-item {
+						display: flex;
+						flex-direction: row;
+						margin: 10px 15px 0px 0px;
+						border: 1px solid #4D72FF;
+						width: 80px;
+						height: 80px;
+					}
+				}
+
+			}
+
+		}
+
+		.Process {
+			margin-top: 20px;
+		}
+
+		.ProcessButtons {
+			z-index: 9999;
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/supervise-uniapp/pages/login/login.vue b/supervise-uniapp/pages/login/login.vue
index bec0266c..1e380ddb 100644
--- a/supervise-uniapp/pages/login/login.vue
+++ b/supervise-uniapp/pages/login/login.vue
@@ -216,6 +216,7 @@
 						getApp().globalData.sid = uinfo.sid
 						getApp().globalData.mobile = uinfo.mobile
 						getApp().globalData.isAdmin = uinfo.isAdmin
+						getApp().globalData.orgSidPath = uinfo.orgSidPath
 						getApp().globalData.orgNamePath = uinfo.orgNamePath
 						getApp().globalData.organizationSid = uinfo.organizationSid
 						getApp().globalData.headImage = uinfo.headImage
diff --git a/supervise-uniapp/static/baseIcon/fqw.png b/supervise-uniapp/static/baseIcon/fqw.png
new file mode 100644
index 00000000..1add124a
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/fqw.png differ
diff --git a/supervise-uniapp/static/baseIcon/jj.png b/supervise-uniapp/static/baseIcon/jj.png
new file mode 100644
index 00000000..6c4bb542
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/jj.png differ
diff --git a/supervise-uniapp/static/baseIcon/spz.png b/supervise-uniapp/static/baseIcon/spz.png
new file mode 100644
index 00000000..a9f59040
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/spz.png differ
diff --git a/supervise-uniapp/static/baseIcon/ty.png b/supervise-uniapp/static/baseIcon/ty.png
new file mode 100644
index 00000000..9de10bb6
Binary files /dev/null and b/supervise-uniapp/static/baseIcon/ty.png differ