From 6e95e0596273b8f96d71d6fc58e8d32c4d01da7d Mon Sep 17 00:00:00 2001
From: yunkexin <760754045@qq.com>
Date: Thu, 18 Dec 2025 09:25:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=BA=A4=E5=BA=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  21 +
 pages/apply/subPages/FO/FO035Edit.vue   | 494 ++++++++++++++++++++++++
 pages/apply/subPages/FO/FO035List.vue   | 322 +++++++++++++++
 pages/apply/subPages/FO/FO035Show.vue   | 148 +++++++
 services/apply/FOServices/FOServices.js |  22 ++
 utils/common.js                         |  12 +
 6 files changed, 1019 insertions(+)
 create mode 100644 pages/apply/subPages/FO/FO035Edit.vue
 create mode 100644 pages/apply/subPages/FO/FO035List.vue
 create mode 100644 pages/apply/subPages/FO/FO035Show.vue

diff --git a/pages.json b/pages.json
index d8b336a..918f018 100644
--- a/pages.json
+++ b/pages.json
@@ -294,6 +294,27 @@
 						"navigationBarTitleText": "领导带班下井",
 						"onReachBottomDistance": 100
 					}
+				},
+				{
+					"path": "FO035Edit",
+					"style": {
+						"navigationBarTitleText": "技术交底表",
+						"onReachBottomDistance": 100
+					}
+				},
+				{
+					"path": "FO035Show",
+					"style": {
+						"navigationBarTitleText": "技术交底表",
+						"onReachBottomDistance": 100
+					}
+				},
+				{
+					"path": "FO035List",
+					"style": {
+						"navigationBarTitleText": "技术交底表",
+						"onReachBottomDistance": 100
+					}
 				}
 			]
 		},
diff --git a/pages/apply/subPages/FO/FO035Edit.vue b/pages/apply/subPages/FO/FO035Edit.vue
new file mode 100644
index 0000000..c582e4a
--- /dev/null
+++ b/pages/apply/subPages/FO/FO035Edit.vue
@@ -0,0 +1,494 @@
+<template>
+	<view class="todo-page">
+		<view class="background"></view>
+		<view class="allview">
+			<view class="card">
+				<u--form labelWidth="auto" :model="model" ref="wForm" 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="CHECKDATETIME" borderBottom @click="showCheckDate(1)">
+						<u--input disabled disabledColor="#fff" v-model="model.DISCLOSURE_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 label="交底地点" prop="LOCATION" borderBottom>
+						<u--input disabledColor="#ffffff" v-model="model.JOB_LOCATION" border="none" inputAlign="right" fontSize="14px" placeholder="请输入交底地点"></u--input>
+					</u-form-item>
+					<u-form-item label="交底人：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_User')" borderBottom>
+						<u--input disabledColor="#fff" v-model="(model.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>
+					<u-form-item label="交底人部门：" prop="Nav_User.NAME" @click="handleChangeMonitor('Nav_Department')" borderBottom>
+						<u--input disabledColor="#fff" v-model="(model.Nav_Department||{}).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 label="交底内容" prop="LOCATION">
+
+					</u-form-item>
+					<u--textarea v-model="model.DisclosureContent" placeholder="请输入交底内容" border="surround"></u--textarea>
+					<view class="upload-title">附件：</view>
+					<full-upload v-model="model.Nav_Files"></full-upload>
+					<u-form-item label="人员" @click="handleShowSheet({title: '人员', name: 'Nav_Person'})">
+						<u-icon name="man-add" size="24" color="#3d9cff" slot="right"></u-icon>
+					</u-form-item>
+					<view class="tag-view" v-if="model.Nav_Person">
+						<uni-tag class="tag" v-for="(i, k) in model.Nav_Person.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.Nav_User.NAME" type="primary" />
+					</view>
+
+				</u--form>
+			</view>
+			<view style="padding: 10px 16px;" class="bottom-button">
+				<u-button type="primary" @click="submit" color="#3d4b70" :loading="stepLoad">提交</u-button>
+			</view>
+			<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
+				@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
+			<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="comPickerInfo.showSheet=false" @cancel="comPickerInfo.showSheet=false" keyName="NAME"></u-picker>
+			<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal>
+			<people-selector :defaultChecked="peopleSelectOption.defaultChecked" :show="peopleSelectOption.showSelector" @select="handleSelectorPeople" @close="peopleSelectOption.showSelector = false">
+			</people-selector>
+			<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" v-model='dateTimePickerInfo.defaultDateTime' @confirm="handleCheckDate" @close="dateTimePickerInfo.showCheckDate = false"
+				@cancel="dateTimePickerInfo.showCheckDate = false" :mode="dateTimePickerInfo.mode"></u-datetime-picker>
+			<query-selector :show="showPopupMonitor" :total="curTotalMonitor" :lists="monitorLists" :defaultValue="currentOperateMonitor.NAME" @close="handleClosePopupMonitor" @search="handleSearchMonitor"
+				@select="handleSelectedMonitor" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		extendFilterGroup,
+		extendGroupRule,
+		extendInclude,
+		extendOrder,
+		extendRule,
+		extendIgnoreDataRule,
+		guid,
+		initFilter,
+		initFilterGroup
+	} from '../../../../utils/common'
+	import {
+		FMProductionUnit,
+		CheckPeriods,
+		CheckLevels,
+		MineTypeIndex,
+		MineTypeName
+	} from '../../../../utils/enums.js'
+	import {
+		getUserLists,
+		getDepartmentLists,
+	} from '../../../../services/safe';
+	import {
+		getUser,
+		getTechDisclosure,
+		fullFOTechDisclosure,
+		getRiskArea
+	} from '../../../../services/apply/FOServices/FOServices.js'
+	import stepTitle from '@/components/custom/step-title.vue'
+	import swipeActionItem from '../../../../uni_modules/uview-ui/libs/config/props/swipeActionItem';
+	import {
+		getEnum
+	} from '../../../../services/common';
+	export default {
+		components: {
+			stepTitle,
+		},
+		data() {
+			return {
+				showDelModalIndex: undefined,
+				showDelModalIndex1: undefined,
+				subsectionList: ['无隐患', '有隐患', '不涉及'],
+				isMultiple: false,
+				defaultChecked: [],
+				RiskLevel: ['一般', '重大'],
+				showPopupUnit: false,
+				UnitDefaultIndex: [0],
+				RiskLevelDefaultIndex: [0],
+				UnitLists: [],
+				showPopupRiskLevel: false,
+				TypeLists: [],
+				showPopupType: false,
+				TypeDefaultIndex: [0],
+				PeriodLists: [],
+				showPopupPeriod: false,
+				PeriodDefaultIndex: [0],
+				LevelLists: [],
+				showPopupStep: false,
+				showPopupLevel: false,
+				curTotalStep: 0,
+				stepLists: [],
+				LevelDefaultIndex: [0],
+				showPopupDate: false,
+				listPropUpload: ['NOTIFY_ID'],
+				listPropValUpload: [],
+				ORG_ID: uni.getStorageSync('orgId'),
+				checkListData: {},
+				monitorLists: [],
+				currentOperateMonitor: {},
+				showPopupMonitor: false,
+				curTotalMonitor: 0,
+				model: {
+					Nav_User: {
+						NAME: ''
+					},
+					Nav_Department: {
+						NAME: ''
+					},
+					Nav_Person: [],
+				},
+				peopleSelectOption: {
+					showSelector: false,
+					value: null,
+					index: 0,
+					defaultChecked: []
+				},
+				dateTimePickerInfo: {
+					showCheckDate: false,
+					dataIndex: undefined,
+					defaultDateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'),
+					value: '',
+					name: '',
+					mode: ''
+				},
+				selectorInfo: {
+					name: 'user',
+					isMultiple: false,
+					showPopup: false,
+					totalCount: 0,
+					title: '考核结果选择',
+					itemData: {},
+					dataItem: {},
+					index: 0,
+					columns: [],
+					dataLists: [],
+					defaultText: '',
+					defaultChecked: []
+				},
+				comPickerInfo: {
+					showSheet: false,
+					dataItem: {},
+					columns: [],
+					title: '',
+					dataIndex: undefined,
+					formIndex: undefined,
+					name: ''
+				},
+				dateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM'),
+				stepsText: ['发起', '归档'],
+				stepsPage: 0,
+				stepsPageList: 0,
+				Pu: '',
+				Check_Type_ID: '',
+				TypeListres: {},
+				TaskID: '',
+				poparr: '',
+				currentOperateStep: {},
+				chooseCheckContent: '',
+				chooseCheckArea: '',
+				currentOperateArea: {},
+				areaLists: [],
+				curTotalArea: 0,
+				showPopupArea: false,
+				nowIndex: {},
+				nowName: '',
+				newCheckList: false,
+				stepLoad: true,
+				enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
+				enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
+
+			}
+		},
+		onLoad(option) {
+			this.TaskID = option.taskID ? option.taskID : '';
+			this.model.ID = option.ID ? option.ID : '';
+			this.ID = option.ID ? option.ID : '';
+			this.loadData();
+		},
+		methods: {
+			loadData() {
+				if (this.ID == undefined || this.ID == '') {
+					this.stepLoad = false
+					this.model.Nav_Details = []
+					if (this.ID == undefined || this.ID == '')
+						this.ID = guid()
+					this.model.ID = this.ID
+					const orgId = uni.getStorageSync('orgId')
+					const json = initFilter(orgId, "", "")
+					let userid = uni.getStorageSync('appInfo').User.ID
+					extendRule(json, 'ID', 1, userid);
+					extendInclude(json, 'Nav_Department');
+					extendIgnoreDataRule(json)
+					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
+					getUser(json).then(res => {
+						this.stepLoad = false
+						this.model.Nav_User.NAME = res.NAME
+						this.model.USER_ID = res.ID
+						this.model.Nav_Department.NAME = res.Nav_Department.NAME
+						this.model.DEPARTMENT_ID = res.DEPARTMENT_ID
+					})
+				} else {
+					const orgId = uni.getStorageSync('orgId')
+					const json = initFilter(orgId, "", "")
+					extendRule(json, 'ID', 1, this.ID);
+					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_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');
+					getTechDisclosure(json).then(res => {
+						this.stepLoad = false
+						this.model = res;
+						this.model.ID = this.ID
+
+					})
+				}
+			},
+			handleAddPerson() {
+				this.model.Nav_Person.unshift({
+					TECH_DISCLOSURE_FROM_ID: this.model.ID,
+					ID: guid(),
+					ORG_ID: this.ORG_ID,
+					Nav_User: {
+						NAME: "",
+						CODE: ""
+					},
+					USER_ID: "",
+					IS_DELETED: false,
+					DEAL_STATUS: 0,
+				})
+			},
+			async handleShowSheet(p) {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "", 0, p.pageIndex ?? 1)
+				// const json = initFilter(this.ORG_ID, "", "", 0, p.pageIndex ?? 1)
+				let dataSelect = []
+				var defaultChecked = []
+
+
+				if (p.val) {
+					extendRule(json, 'NAME', 9, p.val);
+				}
+
+				json.Limit = 20
+				if (p.pageIndex) {
+					json.Start = (p.pageIndex - 1) * json.Limit;
+				}
+				json.Sort = 'NAME'
+				// json.SelectField = ["ID", "NAME", "NAME", "CODE"]
+				// json.Sort = "NAME"
+				// json.Order = 1
+				this.selectorInfo.isMultiple = true
+
+
+				// extendRule(json, 'DEVICE_STATUS', 1, '1');
+				dataSelect = await getUserLists(json).then(res => {
+					this.selectorInfo.totalCount = res.TotalCount
+					if (res != undefined && res.Data.length > 0) {
+						for (let i = 0; i < res.Data.length; i++) {
+							res.Data[i].name = res.Data[i].NAME
+						}
+					}
+					return res.Data
+				})
+				if (this.model.Nav_Person && this.model.Nav_Person.length > 0 && this.model.Nav_Person[0]
+					.Nav_User != null) {
+					// this.selectorInfo.defaultChecked = []
+					this.model.Nav_Person.forEach(e => {
+						defaultChecked.push(e.Nav_User)
+					})
+				} else {
+					defaultChecked = null
+				}
+				if (defaultChecked == null)
+					defaultChecked = []
+				if (dataSelect.length) {
+					this.selectorInfo = {
+						isMultiple: this.selectorInfo.isMultiple,
+						totalCount: this.selectorInfo.totalCount,
+						showPopup: true,
+						title: p.title,
+						name: p.name,
+						dataLists: dataSelect,
+						defaultChecked: defaultChecked,
+						index: p.index
+					}
+				} else {
+					// 暂无数据
+				}
+			},
+			//数据加载
+			handleSearch(val, pageIndex) {
+				var p = {
+					name: this.selectorInfo.name,
+					title: this.selectorInfo.title,
+					val: val,
+					pageIndex: pageIndex,
+				}
+				this.handleShowSheet(p)
+			},
+
+			handleSelected(e) {
+				this.selectorInfo.showPopup = false
+				let listArea = []
+				if (e.length > 0) {
+					e.forEach((item, i) => {
+						if (item.name != null || item.NAME != null) {
+							listArea.push({
+								ID: guid(),
+								TECH_DISCLOSURE_FROM_ID: this.model.ID,
+								USER_ID: item.ID,
+								ORG_ID: item.ORG_ID,
+								Nav_User: item
+							})
+						}
+					})
+				}
+				this.model.Nav_Person = listArea
+
+			},
+			handleClosePopupMonitor() {
+				this.showPopupMonitor = false
+			},
+			handleChangeMonitor(name) {
+				this.currentOperateMonitor = name
+				this.showPopupMonitor = true
+				this.handleSearchMonitor('init')
+			},
+			handleSearchMonitor(val, pageIndex) {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "NAME", '', pageIndex)
+
+				if (val !== 'init') {
+					const tempGroup = initFilterGroup(false);
+					extendGroupRule(tempGroup, 'NAME', 9, val)
+					extendFilterGroup(json, tempGroup);
+				}
+				json.Limit = 20
+				if (pageIndex) {
+					json.Start = (pageIndex - 1) * 20;
+				}
+
+				if (this.currentOperateMonitor == 'Nav_User') {
+					extendRule(json, 'ENABLE_STATUS', 1, '0')
+					extendInclude(json, 'Nav_Department');
+					getUserLists(json).then(res => {
+						if (res.IsSuccessful) {
+							this.monitorLists = res.Data.map(i => {
+								return {
+									...i,
+									name: i.NAME,
+									code: i.CODE
+								}
+							})
+							this.curTotalMonitor = res.TotalCount
+						}
+					})
+				} else if (this.currentOperateMonitor == 'Nav_Department') {
+					extendRule(json, 'ENABLE_STATUS', 1, '0')
+					getDepartmentLists(json).then(res => {
+						if (res.IsSuccessful) {
+							this.monitorLists = res.Data.map(i => {
+								return {
+									...i,
+									name: i.NAME,
+									code: i.CODE
+								}
+							})
+							this.curTotalMonitor = res.TotalCount
+						}
+					})
+				}
+
+			},
+			handleSelectedMonitor(val) {
+				this.showPopupMonitor = false
+				if (this.currentOperateMonitor == 'Nav_User') {
+					this.model.Nav_User = val
+					this.model.USER_ID = val.ID
+					this.model.Nav_Department = val.Nav_Department
+					this.model.DEPARTMENT_ID = val.Nav_Department.ID
+				} else if (this.currentOperateMonitor == 'Nav_Department') {
+					this.model.Nav_Department = val
+					this.model.DEPARTMENT_ID = val.ID
+				}
+				this.currentOperateMonitor = val
+			},
+			handleDelRowBefore(item) {
+				this.nowIndex = item
+				this.showDelModalIndex = 1
+
+			},
+			confirmDel() {
+
+				this.nowIndex.IS_DELETED = true
+				this.showDelModalIndex = undefined
+			},
+			cacelDel() {
+				this.showDelModalIndex = undefined
+			},
+			showCheckDate(dataIndex, item) {
+				this.dateTimePickerInfo = {
+					showCheckDate: true,
+					defaultDateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'),
+					dataIndex: dataIndex,
+					item: item,
+					mode: 'datetime'
+				}
+			},
+			//隐藏控件 显示时间
+			handleCheckDate(e) {
+				this.model.DISCLOSURE_DATE = uni.$u.timeFormat(e.value,
+					'yyyy-mm-dd hh:MM:ss')
+				this.dateTimePickerInfo.showCheckDate = false
+
+			},
+			submit() {
+				this.modelEdit = JSON.parse(JSON.stringify(this.model))
+				delete this.modelEdit.Nav_Department
+				delete this.modelEdit.Nav_User
+
+				if (this.TaskID == null || this.TaskID == '') {
+					this.modelEdit.TaskID = '00000000-0000-0000-0000-000000000000'
+				} else {
+					this.modelEdit.TaskID = this.TaskID
+				}
+				if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
+					this.modelEdit.ORG_ID = this.ORG_ID
+
+				this.modelEdit.PUBLISH = 'SaveAndNotify'
+				fullFOTechDisclosure(this.modelEdit).then(res => {
+					if (res) {
+						uni.$showMsgFunc('操作成功!', () => {
+							uni.navigateBack()
+						}, 'success', 1000)
+					}
+				})
+
+
+			}
+
+		}
+
+
+
+	}
+</script>
+
+<style scoped>
+	@import url("../../../../style/css/newTemplate.css");
+</style>
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/FO035List.vue b/pages/apply/subPages/FO/FO035List.vue
new file mode 100644
index 0000000..929df5d
--- /dev/null
+++ b/pages/apply/subPages/FO/FO035List.vue
@@ -0,0 +1,322 @@
+<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_User ? item.Nav_User.NAME : ''}}</text>
+							</view>
+							<view class="field">
+								<text class="label">交底地点：</text>
+								<text class="value">{{item.JOB_LOCATION }}</text>
+							</view>
+							<view class="field">
+								<text class="label">交底时间：</text>
+								<text class="value">{{item.DISCLOSURE_DATE}}</text>
+							</view>
+							<view class="field">
+								<text class="label">状态：</text>
+								<text class="status">{{item.FORM_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': "FOTeamActivityState"
+				}
+				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_Department")
+				extendInclude(json, "Nav_User")
+				if (this.keyword) {
+					extendRule(json, 'Nav_Department.NAME', 9, this.keyword)
+				}
+				if (this.searchStartTime) {
+					extendRule(json, 'MEETING_TIME', 6, this.searchStartTime)
+				}
+				if (this.filterStatus !== null) {
+					extendRule(json, 'FORM_STATUS', 1, this.filterStatus)
+				}
+				getRequestOrderPage(json, "/FO/TechDisclosureFromTech/OrderPaged").then(res => {
+					this.total = res.TotalCount;
+					for (let i = 0; i < res.Data.length; i++) {
+						res.Data[i].FORM_STATUS = this.getNameById(res.Data[i].FORM_STATUS)
+					}
+					let newRes = (res.Data || []).map(i => {
+						return {
+							...i,
+							title: i.Nav_Department?i.Nav_Department.NAME:'',
+						}
+					})
+
+					if (this.pageIndex !== 1) {
+						this.lists = this.lists.concat(newRes)
+					} else {
+						this.lists = newRes
+					}
+				})
+			},
+			showDetail(id) {
+				uni.navigateTo({
+					url: '/pages/apply/subPages/FO/FO035Show?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/FO035Show.vue b/pages/apply/subPages/FO/FO035Show.vue
new file mode 100644
index 0000000..ea6078a
--- /dev/null
+++ b/pages/apply/subPages/FO/FO035Show.vue
@@ -0,0 +1,148 @@
+<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="CHECKDATETIME" borderBottom >
+					<u--input disabled disabledColor="#fff" v-model="model.DISCLOSURE_DATE"  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 label="交底地点" prop="LOCATION" borderBottom>
+					<u--input disabledColor="#ffffff" disabled v-model="model.JOB_LOCATION" border="none" inputAlign="right" fontSize="14px" placeholder="请输入交底地点"></u--input>
+				</u-form-item>
+				<u-form-item label="交底人：" prop="Nav_User.NAME"  borderBottom>
+					<u--input disabledColor="#fff" v-model="(model.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="被交底人：" prop="UserNames">
+				
+				</u-form-item>
+				<rich-text autoHeight v-html="model.UserNames" border="none" disabled class="richtext"></rich-text>
+				<u-form-item label="交底内容" prop="LOCATION">
+				
+				</u-form-item>
+				<u--textarea v-model="model.DisclosureContent" disabled  border="surround"></u--textarea>
+				<view class="upload-title">附件：</view>
+				<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
+				<u-form-item label="交底人签字" >
+				</u-form-item>
+				<image style="width: 150px;height: 60px;" :src="imgurl+model.Nav_User.FILE_PATH" v-if="model.Nav_User&&model.Nav_User.FILE_PATH">
+				</image>
+				<u-form-item label="被交底人签字" >
+				</u-form-item>
+				<view v-for="item of model.Nav_Person">
+					<image style="width: 150px;height: 60px;" :src="imgurl+item.Nav_User.FILE_PATH" v-if="item.DEAL_STATUS== 1">
+					</image>
+				</view>
+
+			</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'
+
+	export default {
+		data() {
+			return {
+				model: {
+					Nav_User: {
+						NAME: ''
+					},
+					Nav_Department: {
+						NAME: ''
+					},
+					Nav_Person: [],
+				},
+				imgurl :config.uni_app_web_api_url+ ':5199' ,
+				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/FOTechDisclosureFromTech/GetEdit").then(res => {
+					this.model = res
+					let strUserName = ''
+					if (res.Nav_Person && res.Nav_Person.length > 0) {
+						for (let i = 0; i < res.Nav_Person.length; i++) {
+							if (res.Nav_Person[i].DEAL_STATUS == 0) {
+								strUserName += (strUserName.length > 0 ? " " : "") +
+									"<view style='color:#E35D58;background-color:rgba(227,93,88,0.2);padding:5px;line-height:20px;white-space:nowrap;'>" +
+									res.Nav_Person[i].Nav_User.NAME + "</view>";
+							} else {
+								strUserName += (strUserName.length > 0 ? " " : "") +
+									"<text style='padding:5px;line-height:20px;white-space:nowrap;color:#303133'>" +
+									res.Nav_Person[i].Nav_User.NAME + "</text>";
+							}
+							if(res.Nav_Person[i].DEAL_STATUS == 1){
+						
+								res.Nav_Person[i].imgurl = config.uni_app_web_api_url+ ':5199' + res.Nav_Person[i].Nav_User.FILE_PATH
+								console.log(res.Nav_Person[i].imgurl)
+							}
+					
+						}
+					}
+					this.model.UserNames = strUserName;
+					this.isLoadOK = true;
+				})
+			},
+			onTableBtnAgree() {
+				let json = {};
+				json.ID = this.ID;
+				json.TaskID = this.TaskID;
+				getRequest(json, "/FO/FOTechDisclosureFromTech/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 a77eeab..c437156 100644
--- a/services/apply/FOServices/FOServices.js
+++ b/services/apply/FOServices/FOServices.js
@@ -367,6 +367,17 @@ export function getLeaderWellRecord(params) {
     })
   })
 }
+export function getTechDisclosure(params) {
+  return new Promise((resolve, reject) => {
+    request.post("/FO/TechDisclosureFromTech/Get", params).then((result) => {
+      if (result.IsSuccessful) {
+        resolve(result.Data);
+      }
+    }).catch((error)=>{
+      reject(error);
+    })
+  })
+}
 export function fullFOLeaderWellRecord(params) {
   return new Promise((resolve, reject) => {
     request.post("/FO/FOLeaderWellRecord/FullUpdate", params).then((result) => {
@@ -378,6 +389,17 @@ export function fullFOLeaderWellRecord(params) {
     })
   })
 }
+export function fullFOTechDisclosure(params) {
+  return new Promise((resolve, reject) => {
+    request.post("/FO/FOTechDisclosureFromTech/FullUpdate", params).then((result) => {
+      if (result.IsSuccessful) {
+        resolve(result);
+      }
+    }).catch((error)=>{
+      reject(error);
+    })
+  })
+}
 export function getClassLists(params) {
 	return new Promise((resolve, reject) => {
 		request.post("/FM/Class/OrderPaged", params).then((result) => {
diff --git a/utils/common.js b/utils/common.js
index 549ef81..d33a9d8 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -1693,6 +1693,18 @@ export function SourceFormcode(json) {
 		case 'FO041_SHOWPRINT': //班组安全活动编辑
 			linkToUrl = '../apply/subPages/FO/FO041Show'
 			break;
+		case 'FO035': //班组安全活动编辑
+			linkToUrl = '../apply/subPages/FO/FO035Edit'
+			break;
+		case 'FO035_SHOWPRINT': //班组安全活动编辑
+			linkToUrl = '../apply/subPages/FO/FO035Show'
+			break;
+		case 'FO037': //班组安全活动编辑
+			linkToUrl = '../apply/subPages/FO/FO037Edit'
+			break;
+		case 'FO037_SHOWPRINT': //班组安全活动编辑
+			linkToUrl = '../apply/subPages/FO/FO037Show'
+			break;
 
 		case 'HM061_SHOWPRINT': //危险辨识任务签到
 			linkToUrl = '../apply/subPages/HM/1riskTaskShow'