diff --git a/pages/apply/subPages/FO/jobFireList.vue b/pages/apply/subPages/FO/jobFireList.vue
index 80c7186..da8130d 100644
--- a/pages/apply/subPages/FO/jobFireList.vue
+++ b/pages/apply/subPages/FO/jobFireList.vue
@@ -1,260 +1,239 @@
 <template>
-  <view class="risk-record-page">
-	  <u-sticky>
-	  	<view class="filter-bar">
-	  		<view class="filter filter-date-range" @click="handleShowPicker({title: '时间区间', name: 'dateRange'})">
-	  			<text>{{dateFilterTxt}}</text>
-	  			<u-icon size="14" style="margin-left: 4px;" name="arrow-down"></u-icon>
-	  		</view>
-	  		<uni-search-bar class="search-bar" radius="100" :value="keyword" @confirm="handleSearch"
-	  			@cancel="handleCancelSearch" @clear="handleCancelSearch" placeholder="搜索"></uni-search-bar>
-	  		<view class="filter filter-status" @click="handleShowPicker({title: '状态', name: 'status'})">
-	  			<text>{{statusFilterTxt}}</text>
-	  			<u-icon size="14" style="margin-left: 4px;" name="arrow-down"></u-icon>
-	  		</view>
-	  	</view>
-	  	</u-sticky>
-    <view class="main">
-      <view class="content-list">
-        <common-card
-          :dataSource="item"
-          v-for="item in lists"
-		  class="content"
-          @click="handleToEdit"
-        >
-		<view>
-         <!--  <view class="field">
-              <text class="label">开始时间：</text>
-              <text class="value">{{$u.timeFormat(item.JOB_DATE,'yyyy-mm-dd')}}</text>
-            </view> -->
-		<!-- 	<view class="field">
-			  <text class="label">结束时间：</text>
-			  <text class="value">{{$u.timeFormat(item.JOB_END_DATE,'yyyy-mm-dd')}}</text>
-			</view> -->
-           <view class="field">
-              <text class="label">作业申请人：</text>
-              <text class="value">{{item.Nav_ApplyUser ? item.Nav_ApplyUser.NAME : ''}}</text>
-            </view>
-			<view class="field">
-				<text class="label">创建时间：</text>
-				<text class="value">{{$u.timeFormat(item.CREATE_TIME,'yyyy-mm-dd')}}</text>
+	<view class="risk-record-page">
+		<u-sticky>
+			<view class="filter-bar">
+				<!-- <view class="filter filter-date-range" @click="handleShowPicker({title: '时间区间', name: 'dateRange'})">
+					<text>{{dateFilterTxt}}</text>
+					<u-icon size="14" style="margin-left: 4px;" name="arrow-down"></u-icon>
+				</view> -->
+				<uni-search-bar class="search-bar" radius="100" v-model="keyword" @confirm="handleSearch"
+					@cancel="handleCancelSearch" @clear="handleCancelSearch" placeholder="发起部门搜索" cancel-button="none">
+					<uni-icons slot="searchIcon" color="#999999" size="16" type="search" class="search-slot" />
+				</uni-search-bar>
+				<view class="filter filter-status" @click="handleShowPicker({title: '状态', name: 'status'})">
+					<text>{{statusFilterTxt}}</text>
+					<u-icon size="14" style="margin-left: 4px;" name="arrow-down"></u-icon>
+				</view>
 			</view>
-			<view class="field">
-				<text class="label">状态：</text>
-				<text class="status">{{item.IS_PUBLISH}}</text>
+		</u-sticky>
+		<view class="main">
+			<view class="content-list">
+				<common-card :dataSource="item" v-for="item in lists" class="content" @click="showDetail(item.ID)">
+						<view>
+							<view class="field">
+								<text class="label">发起人：</text>
+								<text class="value">{{item.Nav_ApplyUser ? item.Nav_ApplyUser.NAME : ''}}</text>
+							</view>
+							<view class="field">
+								<text class="label">发起部门：</text>
+								<text class="value">{{item.Nav_ApplyDepartment ? item.Nav_ApplyDepartment.NAME : ''}}</text>
+							</view>
+							<view class="field">
+								<text class="label">动火区域：</text>
+								<text class="value">{{item.Nav_Area?item.Nav_Area.NAME:''}}</text>
+							</view>
+							<view class="field">
+								<text class="label">状态：</text>
+								<text class="status">{{item.STATUS}}</text>
+							</view>
+						</view>
+
+				</common-card>
+			</view>
+			<view v-if="!lists.length" class="empty-wrap">
+				<u-empty text="暂无数据" icon="/static/empty@2x.png">
+				</u-empty>
 			</view>
 		</view>
-        </common-card>
-      </view>
-	  <view v-if="!lists.length" class="empty-wrap">
-	  	<u-empty text="暂无数据" icon="/static/empty@2x.png">
-	  	</u-empty>
-	  </view>
-    </view>
-    <u-picker
-      :show="comPickerInfo.showPicker"
-      :columns="comPickerInfo.columns"
-      @confirm="onConfirmPicker"
-	  :defaultIndex="[0]"
-      @cancel="closePicker"
-    ></u-picker>
-  </view>
+		<u-picker :show="comPickerInfo.showPicker" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
+			:defaultIndex="[0]" @cancel="closePicker"></u-picker>
+	</view>
 </template>
 
 <script>
-  import {
-	  getRequestOrderPage
-    // getJobData
-  } from '../../../../services/apply/FOServices/FOServices.js'
-  import {
-    extendInclude, extendRule,
-    initFilter
-  } from '../../../../utils/common'
-  import UniSearchBar from '../../../../uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue'
+	import {
+		getRequestOrderPage
+	} from '../../../../services/apply/FOServices/FOServices.js'
+	import {
+		extendInclude,
+		extendRule,
+		initFilter
+	} from '../../../../utils/common'
+	import {
+		getEnum
+	} from '../../../../services/common';
 
-  export default {
-    components: { UniSearchBar },
-    data() {
-      return {
-        pageIndex: 1,
-        total: 0,
-        lists: [],
-        keyword: '',
-        searchStartTime: '',
-        filterStatus: null,
-        dateFilterTxt: '时间区间',
-        statusFilterTxt: '状态筛选',
-        comPickerInfo: {
-          showPicker: false,
-          columns: [],
-          title: '',
-          name: ''
-        }
-      }
-    },
-    onLoad() {
-		this.loadData()
-    },
-    methods: {
-      handleSearch(obj) {
-      	this.keyword = obj.value
-      },
-      handleToEdit(obj) {
-        uni.navigateTo({
-          url: '/pages/apply/subPages/FO2/jobShow?ID=' + obj.ID
-        })
-      },
-     handleCancelSearch() {
-     	this.keyword = ''
-     },
-      loadData() {
-        const orgId = uni.getStorageSync('orgId')
-        const json = initFilter(orgId, "", "CREATE_TIME", 1, this.pageIndex)
-          extendInclude(json, 'Nav_OperationStep');
-        		 extendInclude(json, 'Nav_ApplyUser');
-        		  extendInclude(json, 'Nav_MonitorUser');
-				  if (this.keyword) {
-				  	extendRule(json, 'Nav_OperationStep.NAME', 9, this.keyword)
-				  }
-				  if (this.searchStartTime) {
-				  	extendRule(json, 'CREATE_TIME', 6, this.searchStartTime)
-				  }
-				  if (this.filterStatus !== null) {
-				  	extendRule(json, 'IS_PUBLISH', 1, this.filterStatus)
-				  }
-        getRequestOrderPage(json,"/FO/CrucialLicenseJob/OrderPaged").then(res => {
-          this.total = res.TotalCount
-		  for (let i = 0; i < res.Data.length; i++) {
-		  	if (res.Data[i].IS_PUBLISH == 0) {
-		  		res.Data[i].IS_PUBLISH = "草稿";
-		  	}else if(res.Data[i].IS_PUBLISH == 1) {
-		  		res.Data[i].IS_PUBLISH = "分析中";
-		  	}else if(res.Data[i].IS_PUBLISH == 2) {
-		  		res.Data[i].IS_PUBLISH = "签到中";
-		  	}else if(res.Data[i].IS_PUBLISH == 4) {
-		  		res.Data[i].IS_PUBLISH = "审核中";
-		  	}
-		  	else if(res.Data[i].IS_PUBLISH == 5) {
-		  		res.Data[i].IS_PUBLISH = "归档";
-		  	}
-			else if(res.Data[i].IS_PUBLISH == 9) {
-				res.Data[i].IS_PUBLISH = "审批拒绝";
+	export default {
+		data() {
+			return {
+				pageIndex: 1,
+				total: 0,
+				lists: [],
+				keyword: '',
+				searchStartTime: '',
+				filterStatus: null,
+				dateFilterTxt: '时间区间',
+				statusFilterTxt: '状态筛选',
+				comPickerInfo: {
+					showPicker: false,
+					columns: [],
+					title: '',
+					name: ''
+				},
+				listStatus: '',
 			}
-		  }
-          const newRes = (res.Data || []).map(i => {
-            return {
-              ...i,
-              title: i.Nav_OperationStep?.NAME,
-            }
-          })
-          if (this.pageIndex !== 1) {
-          	this.lists = this.lists.concat(newRes)
-          } else {
-          	this.lists = newRes
-          }
-        })
-      },
-      handleShowPicker(p) {
-        let column = []
-        if (p.name === 'dateRange') {
-           column = ['全部', '当天', '最近三天', '最近一周', '最近一月']
-        }
-        if (p.name === 'status') {
-          column = ['全部', '草稿', '分析中','签到中','审核中','审批拒绝', '归档']
-        }
-        this.comPickerInfo = {
-          showPicker: true,
-          title: p.title,
-          name: p.name,
-          columns: [column]
-        }
-      },
-     onConfirmPicker(e) {
-     	if (this.comPickerInfo.name === 'dateRange') {
-     		let currentDate = new Date();
-     		if (e.indexs[0] === 2) {
-     			currentDate.setDate(currentDate.getDate() - 3);
-     		} else if (e.indexs[0] === 3) {
-     			currentDate.setDate(currentDate.getDate() - 7);
-     		} else if (e.indexs[0] === 4) {
-     			currentDate.setDate(currentDate.getMonth());
-     		}
-     		if (e.indexs[0] === 0) {
-     			this.searchStartTime = ''
-     			this.dateFilterTxt = '时间区间'
-     		} else {
-     			this.dateFilterTxt = e.value[0]
-     			this.searchStartTime = uni.$u.timeFormat(currentDate, 'yyyy-mm-dd 00:00:00');
-     		}
-     	}
-     	if (this.comPickerInfo.name === 'status') {
-     		if (e.indexs[0] === 1) {
-     			// 草稿 0
-     			this.filterStatus = 0
-     		} else if (e.indexs[0] === 2) {
-     			// 分析中 1
-     			this.filterStatus = 1
-     		} else if (e.indexs[0] === 3) {
-     			// 签到中 2
-     			this.filterStatus = 2
-     		}else if (e.indexs[0] === 4) {
-     			// 审核中 4
-     			this.filterStatus = 4
-     		}else if (e.indexs[0] === 5) {
-     			// 审批拒绝 9
-     			this.filterStatus = 9
-     		}
-			else if (e.indexs[0] === 6) {
-     			// 归档 5
-     			this.filterStatus = 5
-     		}
-			
-     		if (e.indexs[0] === 0) {
-     			// 全部
-     			this.filterStatus = null
-     			this.statusFilterTxt = '状态筛选'
-     		} else {
-     			this.statusFilterTxt = e.value[0]
-     		}
-     	}
-     	this.closePicker()
-     },
-      closePicker() {
-        this.comPickerInfo = {
-          showPicker: false,
-          columns: [],
-          title: '',
-          name: ''
-        }
-      },
-    },
-	onReachBottom() {
-		// 页码 +1
-		if (this.total > 10 * this.pageIndex)
-			this.pageIndex++
-		// 重新获取列表数据
-	},
-	watch: {
-		pageIndex(n, o) {
-			this.loadData()
 		},
-		keyword(n, o) {
-			this.pageIndex = 1
-			this.keyword = n
-			this.loadData()
+		onLoad() {
+			this.getEnums()
 		},
-		searchStartTime(n, o) {
-			this.pageIndex = 1
-			this.searchStartTime = n
-			this.loadData()
+		methods: {
+			handleSearch(obj) {
+				this.keyword = obj.value
+			},
+			getEnums() {
+				var dataParm = {
+					'name': "PFStandardStatus"
+				}
+				getEnum(dataParm).then(res => {
+					this.listStatus = res
+					this.loadData()
+				})
+			},
+			getNameById(id) {
+				const item = this.listStatus.find(item => item.ID === id);
+				return item ? item.NAME : '--';
+			},
+			handleCancelSearch() {
+				this.keyword = ''
+			},
+			loadData() {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "CREATE_TIME", 1, this.pageIndex)
+				extendInclude(json, 'Nav_ApplyUser');
+				extendInclude(json, 'Nav_ApplyDepartment');
+				extendInclude(json, 'Nav_Company');
+				extendInclude(json, 'Nav_ProductionUnit');
+				extendInclude(json, 'Nav_OperationStep');
+				extendInclude(json, 'Nav_FireUser');
+				extendInclude(json, 'Nav_FireDepartment');
+				extendInclude(json, 'Nav_SafeUser');
+				extendInclude(json, 'Nav_Area');
+				extendInclude(json, 'Nav_MonitorUser');
+				if (this.keyword) {
+					extendRule(json, 'Nav_ApplyDepartment.NAME', 9, this.keyword)
+				}
+				if (this.searchStartTime) {
+					extendRule(json, 'MEETING_TIME', 6, this.searchStartTime)
+				}
+				if (this.filterStatus !== null) {
+					extendRule(json, 'STATUS', 1, this.filterStatus)
+				}
+				getRequestOrderPage(json, "/FO/FireJob/OrderPaged").then(res => {
+					this.total = res.TotalCount;
+					for (let i = 0; i < res.Data.length; i++) {
+						res.Data[i].STATUS = this.getNameById(res.Data[i].STATUS)
+					}
+					let newRes = (res.Data || []).map(i => {
+						return {
+							...i,
+							title: i.Nav_OperationStep?i.Nav_OperationStep.NAME:'',
+						}
+					})
+
+					if (this.pageIndex !== 1) {
+						this.lists = this.lists.concat(newRes)
+					} else {
+						this.lists = newRes
+					}
+				})
+			},
+			showDetail(id) {
+				uni.navigateTo({
+					url: '/pages/apply/subPages/FO/FO041Show?ID=' + id
+				})
+			},
+			handleShowPicker(p) {
+				let column = []
+				if (p.name === 'dateRange') {
+					column = ['全部', '当天', '最近三天', '最近一周', '最近一月']
+				}
+				if (p.name === 'status') {
+					let arr = []
+					arr.push('全部')
+					this.listStatus.map(item => {
+						arr.push(item.NAME)
+					})
+					column = arr
+				}
+				this.comPickerInfo = {
+					showPicker: true,
+					title: p.title,
+					name: p.name,
+					columns: [column]
+				}
+			},
+			onConfirmPicker(e) {
+				if (this.comPickerInfo.name === 'dateRange') {
+					let currentDate = new Date();
+					if (e.indexs[0] === 2) {
+						currentDate.setDate(currentDate.getDate() - 3);
+					} else if (e.indexs[0] === 3) {
+						currentDate.setDate(currentDate.getDate() - 7);
+					} else if (e.indexs[0] === 4) {
+						currentDate.setDate(currentDate.getMonth());
+					}
+					if (e.indexs[0] === 0) {
+						this.searchStartTime = ''
+						this.dateFilterTxt = '时间区间'
+					} else {
+						this.dateFilterTxt = e.value[0]
+						this.searchStartTime = uni.$u.timeFormat(currentDate, 'yyyy-mm-dd 00:00:00');
+					}
+				}
+				if (this.comPickerInfo.name === 'status') {
+					if (e.indexs[0] == 0) {
+						this.filterStatus = null
+					} else {
+						this.filterStatus = this.listStatus[e.indexs[0] - 1].ID
+					}
+				}
+				this.closePicker()
+			},
+			closePicker() {
+				this.comPickerInfo = {
+					showPicker: false,
+					columns: [],
+					title: '',
+					name: ''
+				}
+			},
 		},
-		filterStatus(n, o) {
-			this.pageIndex = 1
-			this.filterStatus = n
-			this.loadData()
+		onReachBottom() {
+			// 页码 +1
+			if (this.total > 10 * this.pageIndex)
+				this.pageIndex++
+		},
+		watch: {
+			pageIndex(n, o) {
+				this.loadData()
+			},
+			keyword(n, o) {
+				this.pageIndex = 1
+				this.keyword = n
+				this.loadData()
+			},
+			searchStartTime(n, o) {
+				this.pageIndex = 1
+				this.searchStartTime = n
+				this.loadData()
+			},
+			filterStatus(n, o) {
+				this.pageIndex = 1
+				this.filterStatus = n
+				this.loadData()
+			}
 		}
 	}
-  }
 </script>
 
 <style>
@@ -263,60 +242,60 @@
 	}
 
 	.risk-record-page .main {
-			padding: 0px 16px;
-			position: relative;
+		padding: 0px 16px;
+		position: relative;
+	}
+
+	.risk-record-page>>>.uni-searchbar {
+		padding: 0px;
+		display: flex;
+		align-items: center;
+		font-size: 12px;
+
+		.uni-searchbar__box {
+			height: 30px;
 		}
-	
-		.risk-record-page>>>.uni-searchbar {
-			padding: 0px;
+
+		.uni-searchbar__box-icon-clear {
 			display: flex;
 			align-items: center;
-			font-size: 12px;
-	
-			.uni-searchbar__box {
-				height: 30px;
-			}
-	
-			.uni-searchbar__box-icon-clear {
-				display: flex;
-				align-items: center;
-			}
-	
-			.uni-input-placeholder {}
-	
-			.uni-searchbar__box-search-input {
-				font-size: 12px;
-			}
-	
-			.uni-searchbar__text-placeholder {
-				font-size: 12px;
-				margin-left: 0px;
-			}
-	
-			.uni-text {
-				font-size: 12px;
-			}
 		}
-	
-		.filter-bar .search-bar {
-			margin-left: 20px;
-			margin-right: 20px;
-			width: 100%;
-			display: flex;
-			flex: 1;
-			align-items: center;
+
+		.uni-input-placeholder {}
+
+		.uni-searchbar__box-search-input {
 			font-size: 12px;
 		}
-	
-		.filter-bar {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			background-color: #ffffff;
-			padding: 10px 16px 10px 16px;
-			box-shadow: 0px 0px 5px 0px #eaedf4;
+
+		.uni-searchbar__text-placeholder {
+			font-size: 12px;
+			margin-left: 0px;
 		}
 
+		.uni-text {
+			font-size: 12px;
+		}
+	}
+
+	.filter-bar .search-bar {
+		margin-left: 20px;
+		margin-right: 20px;
+		width: 100%;
+		display: flex;
+		flex: 1;
+		align-items: center;
+		font-size: 12px;
+	}
+
+	.filter-bar {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #ffffff;
+		padding: 10px 16px 10px 16px;
+		box-shadow: 0px 0px 5px 0px #eaedf4;
+	}
+
 	.filter-bar .filter {
 		display: flex;
 		align-items: center;