diff --git a/pages.json b/pages.json
index 1634b38..389921b 100644
--- a/pages.json
+++ b/pages.json
@@ -368,7 +368,7 @@
       "style": {}
     },
     {
-      "path": "pages/application/hotwork/hotwork-apply/hotwork-apply-list",
+      "path": "pages/application/hotwork/hotwork-list/index",
       "style": {}
     },
     {
diff --git a/pages/application/hotwork/home.vue b/pages/application/hotwork/home.vue
index 97fcf29..2c0a6f1 100644
--- a/pages/application/hotwork/home.vue
+++ b/pages/application/hotwork/home.vue
@@ -12,7 +12,7 @@
 					<text>动火作业审批管理</text>
 				</view>
 				<view class="apps-warp">
-					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-apply/hotwork-apply-list">
+					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-list/index?flow=申请">
 						<view class="imgs action">
 							<image src="../../../static/icon-apps/icon-yxkj-1.png" mode=""></image>
 							<view v-if="count.COUNTBACK" class="cu-tag badge">{{count.COUNTBACK}}</view>
@@ -22,6 +22,15 @@
 							<view>申请</view>
 						</view>
 					</navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-gas/hotwork-gas-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-zl-8.png" mode=""></image>
+              <view v-if="count.COUNTANALYZE" class="cu-tag badge">{{count.COUNTANALYZE}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>气体分析</view>
+            </view>
+          </navigator>
 					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-confirm/hotwork-confirm-list">
 						<view class="imgs action">
 							<image src="../../../static/icon-apps/icon-yh-1.png" mode=""></image>
@@ -90,15 +99,7 @@
 							<view>完工验收</view>
 						</view>
 					</navigator>
-					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-gas/hotwork-gas-list">
-						<view class="imgs action">
-							<image src="../../../static/icon-apps/icon-zl-8.png" mode=""></image>
-							<view v-if="count.COUNTANALYZE" class="cu-tag badge">{{count.COUNTANALYZE}}</view>
-						</view>
-						<view class="text-semi" style="text-align: center;">
-							<view>气体分析</view>
-						</view>
-					</navigator>
+
 					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-guardian/hotwork-guardian-list">
 						<view class="imgs action">
 							<image src="../../../static/icon-apps/icon-jh-1.png" mode=""></image>
@@ -193,7 +194,7 @@
 					title:"加载中..."
 				});//加载中动画
 				uni.request({
-					url: basePath +'/app/hotwork/countCheck',
+					url: basePath +'/app/hotwork/checkWorkCount',
 					method: 'POST',
 					dataType: 'json',
 					header: {
diff --git a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
index 401623b..49952b1 100644
--- a/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
+++ b/pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
@@ -929,6 +929,13 @@
 				formData.OPERATOR=loginUser.USER_ID
 				formData.ACTION_USER=loginUser.NAME
 				formData.APPLY_STATUS=STATUS
+        if(this.pd.WORK_LEVEL == '特级'){
+            formData.TASK_ID=1
+        }else if(this.pd.WORK_LEVEL == '一级'){
+            formData.TASK_ID=2
+        }else if(this.pd.WORK_LEVEL == '二级'){
+            formData.TASK_ID=3
+        }
 				this.buttonloading = true
 				uni.request({
 					url: basePath + "app/hotwork/"+_this.msg,
@@ -941,7 +948,8 @@
 							...formData,
 							CORPINFO_ID:loginUser.CORPINFO_ID,
 							USER_ID:loginUser.USER_ID,
-						  },
+              STEP_ID : STATUS
+          },
 					success: (res) => {
 						uni.showToast({
 							icon:'none',
diff --git a/pages/application/hotwork/hotwork-list/index.vue b/pages/application/hotwork/hotwork-list/index.vue
new file mode 100644
index 0000000..f4a0600
--- /dev/null
+++ b/pages/application/hotwork/hotwork-list/index.vue
@@ -0,0 +1,460 @@
+<template>
+	<view>
+		<cu-custom bgColor="bg-gradual-blueness" :isBack="true" :isRingt="true">
+			<block slot="backText">返回</block>
+			<block slot="content">动火作业{{ flow }}</block>
+			<block slot="right" v-if="flow === '申请'">
+				<view @click="$noMultipleClicks(goToAdd)">申请</view>
+			</block>
+		</cu-custom>
+		<view class="select-fixed top-fixed">
+			<view class="cu-bar search bg-white">
+				<picker @change="statusChange"  :value="sindex" :range="stepList" range-key="STEP_NAME">
+					<view class="saixuan">
+						<text>筛选</text>
+						<text class="cuIcon-triangledownfill"></text>
+					</view>
+				</picker>
+				<view class="search-form radius" style="margin-left: 0;">
+					<text class="cuIcon-search"></text>
+					<input v-model="KEYWORDS" placeholder="请输入关键字"></input>
+
+				</view>
+				<view class="action">
+					<button class="cu-btn bg-green shadow-blur radius" @click="getQuery">搜索</button>
+				</view>
+			</view>
+			<view class="line"></view>
+		</view>
+		<scroll-view class="dy-scroll" @scrolltolower="scrolltolower" scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
+			<view v-if="list.length>0" >
+				<view class="dy-list">
+					<view v-for="(item,index) of list" :key="index" :data-id="item.HOTWORK_ID" class="dy-list-item p20">
+						<view class="dy-title-flex align-center" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>编号:{{item.CHECK_NO}}</text>
+							<text>作业级别:{{item.WORK_LEVEL}}</text>
+						</view>
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>申请人:{{item.APPLY_USER_NAME}}</text>
+							<text>分析人:{{item.ANALYZE_USER_NAME}}</text>
+						</view>
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>作业负责人：{{item.CONFIRM_USER_NAME}}</text>
+             				 <text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
+						</view>
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text>
+              				<text>审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
+						</view>
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>监护人：{{item.GUARDIAN_USER_NAME}}</text>
+							<text>安全交底人：{{item.CONFESS_USER_NAME}}</text>
+						</view>
+
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text>
+						</view>
+						<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>动火前在岗班长：{{item.MONITOR_USER_NAME}}</text>
+							<text>验收部门负责人：{{item.ACCEPT_USER_NAME}}</text>
+						</view>
+            			<view class="dy-subtitle-flex" style="height: 34upx;" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
+							<text>
+								审核状态：
+								<template v-if="item.STATUS==1">{{ item.NEXT_STEP_NAME }}</template>
+								<template v-else>{{ item.NEXT_STEP_NAME }}打回</template>
+							</text>
+							<text v-if="item.STEP_ID<1"><button class="cu-btn bg-red margin-tb-sm sm" @click="$noMultipleClicks(handleDelete,item.HOTWORK_ID)">删除</button></text>
+						</view>
+						<view class="dy-subtitle-flex">
+							<text><button class="cu-btn bg-green" style="padding: 0 5px; height:24px;"
+										  @click="showDrawer('showRight',item)">查看流程图</button></text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else-if="dataFlag=='noData'" class="dy-null">
+				<view class="dy-null-img">
+					<image :src="background[dataFlag].url" mode=""></image>
+				</view>
+				<view class="dy-null-title">
+					{{background[dataFlag].msg}}
+				</view>
+			</view>
+			<view class="cu-tabbar-height"></view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import {
+		basePath,corpinfoId,loginSession,formatDate,loginUser
+	} from '@/common/tool.js';
+	import tkiTree from "@/components/select-tree/select-tree.vue"
+	export default {
+		components: {
+			tkiTree
+		},
+		data() {
+			return {
+        flow:"",
+				showRight: false,
+				dataFlag:'noData',
+				sTop:0,
+				totalHeight:0,
+				list:[],//返回数据
+				page:1,//分页参数--页数
+				rows:10,//分页参数--每页数据条数
+				totalCount:0,//分页参数--初始化页数
+				isEnd:false,//防止多次刷新
+				totalPage:0,//分页参数--分页数量
+				KEYWORDS : '',
+				noClick:true,
+        stepList:[],
+				sindex:-1,
+        STEP_ID:'',
+			}
+		},
+		onReady() {
+			let that=this;
+			let CustomBar = this.CustomBar;
+			uni.getSystemInfo({ //调用uni-app接口获取屏幕高度
+				success(res) { //成功回调函数
+					let titleH=uni.createSelectorQuery().select(".top-fixed"); //想要获取高度的元素名（class/id）
+					titleH.boundingClientRect(data=>{
+						that._data.sTop=data.height  //计算高度：元素高度=窗口高度-元素距离顶部的距离（data.top）
+						that.totalHeight = data.height+CustomBar
+					}).exec()
+				}
+			})
+		},
+		onLoad(e) {//页面第一次加载时触发，从跳转页面返回时不能触发，可以传递参
+      this.flow = e.flow;
+		},
+		onShow() {
+			//页面显示或从后台跳回小程序时显示此页面时触发，从跳转页面返回时触发，不能传递参数
+			var _this = this;
+			_this.background = require('@/common/background.json');
+			_this.showCount = -1;
+			_this.currentPage = 1;
+			_this.list = [];
+			_this.isEnd = false;
+			_this.getData();
+      _this.getSetps();
+			// _this.getDept();
+			loginSession();
+		},
+
+		filters: {
+			formatDate(time) {
+				let date = new Date(time)
+				return formatDate(date, 'yyyy-MM-dd')
+			}
+		},
+		methods: {
+			//跳转事件
+			goToDetail(e) {
+				uni.navigateTo({
+					url: '/pages/application/hotwork/hotwork-apply/hotwork-apply-detail?HOTWORK_ID='+e
+				});
+			},
+			goToAdd(){
+				uni.navigateTo({
+					url: '/pages/application/hotwork/hotwork-apply/hotwork-apply-detail'
+				});
+			},
+			getQuery(){	//搜索按钮事件
+				var _this = this;
+				_this.showCount = -1;
+				_this.currentPage = 1;
+				_this.list = [];
+				_this.isEnd = false;
+				_this.getData();
+			},
+
+			// 抽屉状态发生变化触发
+			change(e, type) {
+				console.log((type === 'showLeft' ? '左窗口' : '右窗口') + (e ? '打开' : '关闭'));
+				this[type] = e
+			},
+			// 滑动到底方法
+			scrolltolower(){
+				var _this = this;
+				_this.showCount = -1;
+				_this.currentPage = _this.currentPage + 1;
+				_this.isEnd = false;
+				if(_this.totalPage >= _this.currentPage){
+					_this.getData();//开始分页查询
+				}
+			},
+
+			statusChange(e){
+				this.sindex = e.detail.value;
+				this.STEP_ID=this.stepList[this.sindex].STEP_ID;
+				this.getQuery();
+			},
+
+      getSetps(){
+        var _this = this;
+        uni.request({
+          url: basePath +'/app/eightwork/getTaskSetps',
+          method: 'POST',
+          dataType: 'json',
+          header: {
+            'Content-type':'application/x-www-form-urlencoded'
+          },
+          data: {
+            TASK_ID: 1,
+          },
+          success: (res) => {
+            if (res.data != null) {
+              _this.stepList = [{"STEP_NAME":"请选择","STEP_ID":""},...res.data.list];
+            }
+          }
+        })
+			},
+			getData(){
+				var _this = this;
+				if (_this.isEnd) {
+					return
+				}else{
+					this.isEnd =true;
+				}
+				uni.showLoading({
+					title:"加载中..."
+				});//加载中动画
+				uni.request({
+					url: basePath +'/app/hotwork/list?showCount='+_this.showCount+'&currentPage='+_this.currentPage ,
+					method: 'POST',
+					dataType: 'json',
+					header: {
+						'Content-type':'application/x-www-form-urlencoded'
+					},
+					data: {
+						CREATOR:loginUser.USER_ID,
+						STEP_ID: _this.STEP_ID,
+						KEYWORDS : _this.KEYWORDS, //关键字模糊查询
+						CORPINFO_ID:loginUser.CORPINFO_ID,
+						USER_ID:loginUser.USER_ID,
+					},
+					success: (res) => {
+						uni.hideLoading();//结束加载中动画
+            _this.totalPage = res.data.page.totalPage;
+            if(_this.list.length == 0){
+              _this.list = res.data.varList;
+            }else{
+              if(res.data.varList != null){
+                _this.list = _this.list.concat(res.data.varList);
+              }
+            }
+					}
+				})
+			},
+			handleDelete(id){
+				var _this = this;
+				uni.showModal({
+					title: '',
+					content: '确定要删除这条申请？',
+					cancelColor:"#000000",
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '处理中'
+							})
+							uni.request({
+								url: basePath+'/app/hotwork/delete',
+								method: 'POST',
+								dataType: 'json',
+								header: {
+									'Content-type':'application/x-www-form-urlencoded'
+								},
+								data: {
+									HOTWORK_ID: id,
+								  CORPINFO_ID:loginUser.CORPINFO_ID,
+								  USER_ID:loginUser.USER_ID,
+								},
+								success: (res) => {
+									uni.hideLoading();
+									uni.showToast({
+										icon: 'none',
+										title: '删除成功',
+										duration: 1500
+									});
+									_this.getQuery()
+								},
+								fail: (err) => {
+									uni.hideLoading();
+									uni.showModal({
+										content: err.errMsg,
+										showCancel: false
+									});
+								}
+							})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.dy-card {
+		background-color: #fff;
+		border-radius: 10upx;
+		margin: 30upx
+	}
+
+	.dy-card-title {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #eee;
+		min-height: 80upx;
+		line-height: 80upx;
+		padding: 0 30upx;
+	}
+
+	.dy-card-content {
+		padding: 0upx 30upx 30upx;
+
+	}
+
+	.dy-card-content-item {
+		margin-top: 20upx;
+	}
+
+	.dy-card-content-item .title {
+		display: flex;
+		align-items: center;
+	}
+
+	.dy-card-content-item .title .l {
+		width: 10upx;
+		height: 30upx;
+		border-radius: 20upx;
+		background-color: #666;
+		margin-right: 10upx;
+	}
+
+	.dy-card-content-item .content {
+		background-color: #F1F1F1;
+		padding: 10upx 14upx;
+		margin-top: 14upx;
+		line-height: 1.6;
+	}
+
+	.dy-card-content-item .name text {
+		background-color: #F1F1F1;
+		padding: 10upx 14upx;
+		margin-top: 14upx;
+		line-height: 1.6;
+		display: inline-block;
+	}
+
+	.dy-card-foot {
+		border-top: 1px solid #eee;
+		padding: 30upx;
+	}
+	.p20 {
+			 padding: 40upx;
+		 }
+
+	.step-top {
+		width: 100%;
+		border-bottom: 1px solid #eee;
+		background: #f9f9f9;
+		padding: 20upx;
+	}
+
+	.step-item-container {
+		width: 100%;
+		padding: 20upx;
+
+	}
+
+	.step-item {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		padding: 20upx 40upx;
+	}
+
+
+	.step-item-wrap {
+		width: 100%;
+		border-left: 1px solid #ccc;
+		min-height: 100upx;
+		position: relative;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.step-item-wrap.active .step-item-wrap-doter .step-item-wrap-dot {
+		background: #4cc9fb;
+	}
+
+	.step-item-wrap.success .step-item-wrap-doter .step-item-wrap-dot {
+		background: #5db174;
+	}
+
+	.step-item-wrap.erroractive .step-item-wrap-doter .step-item-wrap-dot {
+		background: red;
+	}
+
+	.step-item-wrap.active {
+		border-left: 1px solid #5db174;
+	}
+
+	.step-item-wrap.activeing {
+		border-left: 1px solid #ccc;
+	}
+
+	.step-item-wrap:last-child {
+		border: none;
+	}
+
+	.step-item-wrap-doter {
+		width: 30upx;
+		height: 30upx;
+		border-radius: 100%;
+		background: #fff;
+		position: absolute;
+		top: 0upx;
+		left: -12upx;
+		text-align: center;
+		padding-top: 5upx;
+
+	}
+
+	.step-item-wrap-dot {
+		width: 20upx;
+		height: 20upx;
+		background: #c0c4cc;
+		border-radius: 100%;
+	}
+
+	.step-item-wrap-right {
+		margin-left: 40upx;
+		margin-top: -5upx;
+		padding-bottom: 60upx;
+	}
+
+
+	.step-item-wrap-right-info {
+		color: #999;
+		margin-top: 10upx;
+	}
+	.step-item-wrap.active .step-item-wrap-right,.step-item-wrap.active .step-item-wrap-right-info {
+		color: #4cc9fb;
+	}
+
+	.step-item-wrap.success .step-item-wrap-right,.step-item-wrap.success .step-item-wrap-right-info {
+		color: #5db174;
+	}
+
+	.step-item-wrap.erroractive .step-item-wrap-right,.step-item-wrap.erroractive .step-item-wrap-right-info {
+		color: red;
+	}
+</style>