From e7981cbbf45ac85b64d9aaa82059ae840caa4cf1 Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Tue, 16 Dec 2025 16:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=B8=A6=E7=8F=AD=E4=B8=8B?=
 =?UTF-8?q?=E4=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  14 +
 pages/apply/subPages/FO/FO041Edit.vue   |  38 +--
 pages/apply/subPages/FO/FO041List.vue   | 325 ++++++++++++++++++++++++
 pages/apply/subPages/FO/FO041Show.vue   | 257 +++++++++++++++++++
 services/apply/FOServices/FOServices.js |   2 +-
 utils/common.js                         |   6 +
 6 files changed, 624 insertions(+), 18 deletions(-)
 create mode 100644 pages/apply/subPages/FO/FO041List.vue
 create mode 100644 pages/apply/subPages/FO/FO041Show.vue

diff --git a/pages.json b/pages.json
index caced64..d8b336a 100644
--- a/pages.json
+++ b/pages.json
@@ -280,6 +280,20 @@
 						"navigationBarTitleText": "领导带班下井",
 						"onReachBottomDistance": 100
 					}
+				},
+				{
+					"path": "FO041Show",
+					"style": {
+						"navigationBarTitleText": "领导带班下井",
+						"onReachBottomDistance": 100
+					}
+				},
+				{
+					"path": "FO041List",
+					"style": {
+						"navigationBarTitleText": "领导带班下井",
+						"onReachBottomDistance": 100
+					}
 				}
 			]
 		},
diff --git a/pages/apply/subPages/FO/FO041Edit.vue b/pages/apply/subPages/FO/FO041Edit.vue
index e054eed..6a37b31 100644
--- a/pages/apply/subPages/FO/FO041Edit.vue
+++ b/pages/apply/subPages/FO/FO041Edit.vue
@@ -9,12 +9,12 @@
 					</view>
 
 					<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息填写</view>
-					<u-form-item required label="发起人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyUser')" borderBottom>
+					<u-form-item  label="发起人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyUser')" borderBottom>
 						<u--input disabledColor="#fff" v-model="(model.Nav_ApplyUser||{}).NAME" disabled placeholder="请选择发起人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
 							customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
 						</u--input>
 					</u-form-item>
-					<u-form-item required label="发起部门：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyDepartment')" borderBottom>
+					<u-form-item  label="发起部门：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_ApplyDepartment')" borderBottom>
 						<u--input disabledColor="#fff" v-model="(model.Nav_ApplyDepartment||{}).NAME" disabled placeholder="请选择发起部门" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
 							customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
 						</u--input>
@@ -33,12 +33,12 @@
 						<u--input disabled disabledColor="#fff" v-model="model.JOB_END_DATE" placeholder="请选择值班结束时间" border="none" inputAlign="right" fontSize="14px"></u--input>
 						<u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon>
 					</u-form-item>
-					<u-form-item required label="班次：" prop="Nav_Class.NAME" @click="handleChangeMonitor('Nav_Class')" borderBottom>
+					<u-form-item  label="班次：" prop="Nav_Class.NAME" @click="handleChangeMonitor('Nav_Class')" borderBottom>
 						<u--input disabledColor="#fff" v-model="(model.Nav_Class||{}).NAME" disabled placeholder="请选择班次" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
 							customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
 						</u--input>
 					</u-form-item>
-					<u-form-item required label="值班领导" @click="handleShowSheet({title: '值班领导', name: 'Nav_Users'})">
+					<u-form-item  label="值班领导" @click="handleShowSheet({title: '值班领导', name: 'Nav_Users'})">
 						<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
 					</u-form-item>
 					<view class="tag-view" v-if="model.Nav_Users">
@@ -49,7 +49,7 @@
 					<u-form-item label="交接班地点" prop="LOCATION" borderBottom>
 						<u--input disabledColor="#ffffff" v-model="model.PLACE" border="none" inputAlign="right" fontSize="14px" placeholder="请输入地点"></u--input>
 					</u-form-item>
-					<u-form-item required label="接班人" @click="handleShowSheet({title: '接班人', name: 'Nav_AfterUsers'})">
+					<u-form-item  label="接班人" @click="handleShowSheet({title: '接班人', name: 'Nav_AfterUsers'})">
 						<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
 					</u-form-item>
 					<view class="tag-view" v-if="model.Nav_AfterUsers">
@@ -92,7 +92,7 @@
 										<u--input disabled disabledColor="#fff" v-model="item.END_DATE" placeholder="请选择结束时间" border="none" inputAlign="right" fontSize="14px"></u--input>
 										<u-icon style="margin-left: 4px;" name="arrow-down" size="12"></u-icon>
 									</u-form-item>
-									<u-form-item required label="巡视区域" @click="handleShowSheet({title: '巡视区域', name: 'Nav_DetailAreas',itemData:item})">
+									<u-form-item  label="巡视区域" @click="handleShowSheet({title: '巡视区域', name: 'Nav_DetailAreas',itemData:item})">
 										<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
 									</u-form-item>
 									<view class="tag-view" v-if="item.Nav_DetailAreas">
@@ -110,8 +110,8 @@
 
 									</u-form-item>
 									<u--textarea autoHeight v-model="item.MEASURE" placeholder="请输入处置措施" border="surround"></u--textarea>
-									<u-form-item required label="现场责任人：" prop="Nav_User.NAME" @click="handleShowSheet({title: '现场责任人', name: 'Nav_User',itemData:item})" borderBottom>
-										<u--input disabledColor="#fff" v-model="item.Nav_User.NAME" disabled placeholder="请选择现场责任人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
+									<u-form-item  label="现场责任人：" prop="Nav_User.NAME" @click="handleShowSheet({title: '现场责任人', name: 'Nav_User',itemData:item})" borderBottom>
+										<u--input disabledColor="#fff" v-model="(item.Nav_User||{}).NAME" disabled placeholder="请选择现场责任人" suffixIcon="arrow-down" suffixIconStyle="font-size:12px" fontSize="14px"
 											customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
 										</u--input>
 									</u-form-item>
@@ -342,16 +342,20 @@
 					const orgId = uni.getStorageSync('orgId')
 					const json = initFilter(orgId, "", "")
 					extendRule(json, 'ID', 1, this.ID);
-					extendInclude(json, 'Nav_CheckType');
-					extendInclude(json, 'Nav_Type');
-					extendInclude(json, 'Nav_CheckRecordFiles.Nav_ImgFile');
+					extendInclude(json, 'Nav_ApplyUser');
+					extendInclude(json, 'Nav_ApplyDepartment');
+					extendInclude(json, 'Nav_Company');
+					extendInclude(json, 'Nav_ProductionUnit');
+					extendInclude(json, 'Nav_Class');
+					extendInclude(json, 'Nav_Users');
+					extendInclude(json, 'Nav_Users.Nav_User');
+					extendInclude(json, 'Nav_Files.Nav_ImgFile');
+					extendInclude(json, 'Nav_AfterUsers');
+					extendInclude(json, 'Nav_AfterUsers.Nav_AfterUser');
 					extendInclude(json, 'Nav_Details');
-					extendInclude(json, 'Nav_Details.Nav_RiskArea');
-					extendInclude(json, 'Nav_Details.Nav_CheckRecordDetailBasics.Nav_Law');
-					extendInclude(json, 'Nav_Details.Nav_Contents');
-					extendInclude(json, 'Nav_Details.Nav_Question');
-					extendInclude(json, 'Nav_Details.Nav_CheckRecordDetailFiles.Nav_ImgFile');
-					extendInclude(json, 'Nav_Details.Nav_CheckRecordDetailUsers.Nav_User');
+					extendInclude(json, 'Nav_Details.Nav_User');
+					extendInclude(json, 'Nav_Details.Nav_DetailFiles.Nav_ImgFile');
+					extendInclude(json, 'Nav_Details.Nav_DetailAreas.Nav_Area');
 
 					extendIgnoreDataRule(json)
 					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
diff --git a/pages/apply/subPages/FO/FO041List.vue b/pages/apply/subPages/FO/FO041List.vue
new file mode 100644
index 0000000..8baae26
--- /dev/null
+++ b/pages/apply/subPages/FO/FO041List.vue
@@ -0,0 +1,325 @@
+<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" 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>
+		</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_ProductionUnit ? item.Nav_ProductionUnit.NAME : ''}}</text>
+							</view>
+							<view class="field">
+								<text class="label">班次：</text>
+								<text class="value">{{item.Nav_Class ? item.Nav_Class.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>
+		<u-picker :show="comPickerInfo.showPicker" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
+			:defaultIndex="[0]" @cancel="closePicker"></u-picker>
+	</view>
+</template>
+
+<script>
+	import {
+		getRequestOrderPage
+	} from '../../../../services/apply/FOServices/FOServices.js'
+	import {
+		extendInclude,
+		extendRule,
+		initFilter
+	} from '../../../../utils/common'
+	import {
+		getEnum
+	} from '../../../../services/common';
+
+	export default {
+		data() {
+			return {
+				pageIndex: 1,
+				total: 0,
+				lists: [],
+				keyword: '',
+				searchStartTime: '',
+				filterStatus: null,
+				dateFilterTxt: '时间区间',
+				statusFilterTxt: '状态筛选',
+				comPickerInfo: {
+					showPicker: false,
+					columns: [],
+					title: '',
+					name: ''
+				},
+				listStatus: '',
+			}
+		},
+		onLoad() {
+			this.getEnums()
+		},
+		methods: {
+			handleSearch(obj) {
+				this.keyword = obj.value
+			},
+			getEnums() {
+				var dataParm = {
+					'name': "FOStatusEnum"
+				}
+				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_Class")
+				extendInclude(json, "Nav_ApplyDepartment")
+				extendInclude(json, "Nav_Company")
+				extendInclude(json, "Nav_ProductionUnit")
+				extendInclude(json, "Nav_ApplyUser")
+				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/LeaderWellRecord/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_ApplyDepartment?i.Nav_ApplyDepartment.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: ''
+				}
+			},
+		},
+		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>
+	.risk-record-page {
+		position: relative;
+	}
+
+	.risk-record-page .main {
+		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;
+		}
+
+		.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;
+		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;
+		font-size: 12px;
+		line-height: 18px;
+		color: #333;
+	}
+
+	.content-list {
+		padding: 10px 0;
+	}
+
+	.content .field {
+		font-size: 12px;
+		line-height: 18px;
+		margin-bottom: 4px;
+	}
+
+	.content .field .label {
+		color: #666;
+	}
+
+	.content .field .value {
+		color: #333333;
+	}
+	.status {
+		background-color: rgba(5, 109, 232, 0.1);
+		color: #056DE8;
+		padding: 0px 5px 0px 5px;
+		border-radius: 5px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/FO041Show.vue b/pages/apply/subPages/FO/FO041Show.vue
new file mode 100644
index 0000000..a938c5b
--- /dev/null
+++ b/pages/apply/subPages/FO/FO041Show.vue
@@ -0,0 +1,257 @@
+<template>
+	<view style="padding-bottom: 80px;">
+		<view class="card">
+			<view class="background"></view>
+			<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm">
+				<view style="position: relative;">
+					<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
+				</view>
+
+				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息</view>
+				<u-form-item label="公司：" prop="Product_Unit"  borderBottom>
+					<u--input v-model="(model.Nav_Company||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+					</u--input>
+				</u-form-item>
+				<u-form-item label="生产单元：" prop="Product_Unit"  borderBottom>
+					<u--input v-model="(model.Nav_ProductionUnit||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+					</u--input>
+				</u-form-item>
+				<u-form-item  label="发起时间：" prop="Nav_User.NAME"  borderBottom>
+					<u--input disabledColor="#fff" v-model="model.CREATE_TIME" disabled fontSize="14px"
+						customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
+					</u--input>
+				</u-form-item>
+				<u-form-item  label="发起部门：" prop="Nav_User.NAME"  borderBottom>
+					<u--input disabledColor="#fff" v-model="(model.Nav_ApplyDepartment||{}).NAME" disabled fontSize="14px"
+						customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
+					</u--input>
+				</u-form-item>
+				<u-form-item  label="发起人：" prop="Nav_User.NAME"  borderBottom>
+					<u--input disabledColor="#fff" v-model="(model.Nav_ApplyUser||{}).NAME" disabled   fontSize="14px"
+						customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
+					</u--input>
+				</u-form-item>
+				<u-form-item  label="值班领导" >
+				</u-form-item>
+				<view class="tag-view" v-if="model.Nav_Users">
+					<uni-tag class="tag" v-for="(i, k) in model.Nav_Users.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.Nav_User.NAME" type="primary" />
+				</view>
+				
+				<u-form-item label="值班开始时间" prop="CHECKDATETIME" borderBottom >
+					<u--input disabled disabledColor="#fff" v-model="model.JOB_START_DATE"  border="none" inputAlign="right" fontSize="14px"></u--input>
+				
+				</u-form-item>
+				<u-form-item label="值班结束时间" prop="ENDTIME" borderBottom >
+					<u--input disabled disabledColor="#fff" v-model="model.JOB_END_DATE"  border="none" inputAlign="right" fontSize="14px"></u--input>
+					
+				</u-form-item>
+				<u-form-item  label="班次：" prop="Nav_Class.NAME"  borderBottom>
+					<u--input disabledColor="#fff" v-model="(model.Nav_Class||{}).NAME" disabled  fontSize="14px"
+						customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
+					</u--input>
+				</u-form-item>
+				<u-form-item label="交接班地点" prop="LOCATION" borderBottom>
+					<u--input disabledColor="#ffffff" v-model="model.PLACE" border="none" inputAlign="right" fontSize="14px" ></u--input>
+				</u-form-item>
+				<u-form-item  label="交班人" >
+				</u-form-item>
+				<view class="tag-view" v-if="model.Nav_Users">
+					<uni-tag class="tag" v-for="(i, k) in model.Nav_Users.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.Nav_User.NAME" type="primary" />
+				</view>
+				<u-form-item  label="接班人" >
+				</u-form-item>
+				<view class="tag-view" v-if="model.Nav_AfterUsers">
+					<uni-tag class="tag" v-for="(i, k) in model.Nav_AfterUsers.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.Nav_AfterUser.NAME" type="primary" />
+				</view>
+				<u-form-item label="交班人签字" borderBottom>
+				</u-form-item>
+				<view v-for="item of model.Nav_Users">
+					<imageSign slot="right" v-if='item.DEAL_STATUS== 1'
+						:user='item.Nav_User'>
+					</imageSign>
+				</view>
+				<u-form-item label="接班人签字" borderBottom>
+				</u-form-item>
+				<view v-for="item of model.Nav_AfterUsers">
+					<imageSign slot="right" v-if='item.AFTER_USER_DEAL_STATUS== 1'
+						:user='item.Nav_AfterUser'>
+					</imageSign>
+				</view>
+				
+				<view class="upload-title">附件：</view>
+				<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
+			
+
+			</u--form>
+			<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm" class="sub-form" style="margin-top: 20px;" v-if="model.Nav_Details.length>0">
+				<view style="position: relative;">
+					<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
+				</view>
+
+				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">基本信息</view>
+				<uni-collapse :border="false" accordion>
+					<view v-for="(item, index) in model.Nav_Details" :key="index">
+						<uni-collapse-item title-border="none" :border="false">
+							<template v-slot:title>
+								<view class="uni-collapse-item__title-box">
+									<view class="uni-collapse-item__title-text">
+										{{item.QUOTA?index+1+'.'+item.QUOTA:index+1+'.'}}
+									</view>
+									<view @click.stop style="margin-right: 10px;">
+										<!-- <u-icon @click="handleDelRowBefore(index)" name="trash" color="#ff4d4f" size="21" style="margin-right: 10px;"></u-icon> -->
+										<!-- <u-icon name="arrow-down" size="12"></u-icon> -->
+									</view>
+								</view>
+							</template>
+							<view class="content">
+							<u-form-item label="开始时间" prop="CHECKDATETIME" borderBottom >
+								<u--input disabled disabledColor="#fff" v-model="item.START_DATE"  border="none" inputAlign="right" fontSize="14px"></u--input>
+							
+							</u-form-item>
+							<u-form-item label="结束时间" prop="ENDTIME" borderBottom>
+								<u--input disabled disabledColor="#fff" v-model="item.END_DATE" border="none" inputAlign="right" fontSize="14px"></u--input>
+							
+							</u-form-item>
+							<u-form-item  label="巡视区域">
+							</u-form-item>
+							<view class="tag-view" v-if="item.Nav_DetailAreas">
+								<uni-tag class="tag" v-for="(i, k) in item.Nav_DetailAreas.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.Nav_Area.NAME" type="primary" />
+							</view>
+							<u-form-item label="现场情况描述：">
+							
+							</u-form-item>
+							<u--textarea autoHeight disabled v-model="item.DESCRIPTION"  border="surround"></u--textarea>
+							<u-form-item label="发现问题：">
+							
+							</u-form-item>
+							<u--textarea autoHeight disabled v-model="item.QUESTION"  border="surround"></u--textarea>
+							<u-form-item label="处置措施：">
+							
+							</u-form-item>
+							<u--textarea autoHeight  disabled v-model="item.MEASURE"  border="surround"></u--textarea>
+							<u-form-item  label="现场责任人：" prop="Nav_User.NAME" borderBottom>
+								<u--input disabledColor="#fff" v-model="(item.Nav_User||{}).NAME" disabled   fontSize="14px"
+									customStyle="margin:0px;display:flex;padding:3px 0px" border="none" inputAlign="right">
+								</u--input>
+							</u-form-item>
+							<u-form-item label="现场责任人签名" borderBottom>
+								<imageSign slot="right" v-if='item.USER_DEAL_STATUS== 1'
+									:user='item.Nav_User'>
+								</imageSign>
+							</u-form-item>
+							<u-form-item label="交接事项：">
+							
+							</u-form-item>
+							<u--textarea autoHeight disabled v-model="item.ITEM" border="surround"></u--textarea>
+							
+							<u-form-item label="附件" prop="CHECKSTANDARD">
+							</u-form-item>
+							<full-upload v-model="item.Nav_DetailFiles" :isShowBtn='false' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+
+							</view>
+
+
+						</uni-collapse-item>
+					</view>
+				</uni-collapse>
+			</u--form>
+		</view>
+		<view class="bottom-button" style="padding: 10px 16px;" v-if="isLoadOK&&tableKey==1">
+			<u-button type="primary" @click="onTableBtnAgree" color="#3d4b70">签到</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		initFilter,
+		extendRule,
+		extendInclude
+	} from '../../../../utils/common'
+
+	import {
+		getRequest,
+	} from '../../../../services/apply/FOServices/FOServices'
+
+	import '../../../../utils/showMsg.js'
+	import color from '../../../../uni_modules/uview-ui/libs/config/color'
+	import config from '../../../../config/common'
+	import imageSign from '@/components/custom/imageSign.vue'
+
+	export default {
+		components: {
+			imageSign
+		},
+		data() {
+			return {
+				model: {
+					Nav_Team: "",
+					Nav_Class: "",
+					Nav_User: "",
+					NavUsersName: '',
+					Nav_Users: [],
+					ORG_ID: "",
+					Nav_User: {
+						NAME: ''
+					},
+					Nav_Team: {
+						NAME: ''
+					},
+					Nav_Monitor: {
+						NAME: ''
+					},
+					Nav_Class: {
+						NAME: ''
+					},
+					Nav_Record: {
+						NAME: ''
+					},
+					Nav_Details: [{}],
+				},
+				listPropUpload: ['PRE_SHIFT_MEETING_RECORD_ID'],
+				listPropValUpload: [],
+				TaskID: "",
+				tableKey: '0',
+				isLoadOK: false,
+				ID: '',
+			}
+		},
+		onLoad(option) {
+			this.ID = option.ID;
+			this.TaskID = option.taskID;
+			this.tableKey = option.tableKey ? option.tableKey : '0'
+			this.loadData()
+		},
+		methods: {
+			loadData() {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "CODE", 1)
+				extendRule(json, 'ID', 1, this.ID);
+				getRequest(json, "/FO/FOLeaderWellRecord/GetEdit").then(res => {
+					this.model = res
+					this.isLoadOK = true;
+				})
+			},
+			onTableBtnAgree() {
+				let json = {};
+				json.ID = this.ID;
+				json.TaskID = this.TaskID;
+				getRequest(json, "/FO/FOLeaderWellRecord/PersonalAgree").then(res => {
+					if (res) {
+						uni.$showMsgFunc('操作成功!', () => {
+							uni.navigateBack()
+						}, 'success', 1000)
+					}
+				})
+
+			}
+		},
+		computed: {
+
+		}
+	}
+</script>
+
+<style>
+	@import url("../../../../style/css/newTemplate.css");
+</style>
\ No newline at end of file
diff --git a/services/apply/FOServices/FOServices.js b/services/apply/FOServices/FOServices.js
index 0de5738..a77eeab 100644
--- a/services/apply/FOServices/FOServices.js
+++ b/services/apply/FOServices/FOServices.js
@@ -360,7 +360,7 @@ export function getLeaderWellRecord(params) {
   return new Promise((resolve, reject) => {
     request.post("/FO/LeaderWellRecord/Get", params).then((result) => {
       if (result.IsSuccessful) {
-        resolve(result);
+        resolve(result.Data);
       }
     }).catch((error)=>{
       reject(error);
diff --git a/utils/common.js b/utils/common.js
index 86d9001..549ef81 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1687,6 +1687,12 @@ export function SourceFormcode(json) {
 		case 'FO010': //班组安全活动编辑
 			linkToUrl = '../apply/subPages/FO/4teamActivityEdit'
 			break;
+		case 'FO041': //班组安全活动编辑
+			linkToUrl = '../apply/subPages/FO/FO041Edit'
+			break;
+		case 'FO041_SHOWPRINT': //班组安全活动编辑
+			linkToUrl = '../apply/subPages/FO/FO041Show'
+			break;
 
 		case 'HM061_SHOWPRINT': //危险辨识任务签到
 			linkToUrl = '../apply/subPages/HM/1riskTaskShow'