diff --git a/pages/apply/subPages/SE/2trainRecordShow.vue b/pages/apply/subPages/SE/2trainRecordShow.vue
index 979ba80..e25b063 100644
--- a/pages/apply/subPages/SE/2trainRecordShow.vue
+++ b/pages/apply/subPages/SE/2trainRecordShow.vue
@@ -43,11 +43,7 @@
 					<u-form-item label="培训内容：" prop="TRAINCONTENT" borderBottom>
 						<u-textarea autoHeight v-html="model.TRAINCONTENT" border="none" disabled></u-textarea>
 					</u-form-item>
-					<view class="upload-title">附件</view>
-					<full-upload v-model="model.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload' :isShowBtn="false"></full-upload>
-					<u-form-item label="审阅意见：" prop="TRAIN_PLAN" borderBottom>
-						<u--input v-model="model.STATUS>2?'已阅':''" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
-					</u-form-item>
+
 					<u-form-item label="请假人员：" prop="LeaveUsers" borderBottom>
 						<u-textarea autoHeight v-html="model.LeaveUsers" border="none" disabled></u-textarea>
 					</u-form-item>
@@ -57,17 +53,86 @@
 					<u-form-item label="培训人员：" prop="Users">
 					</u-form-item>
 					<rich-text autoHeight v-html="model.Users" border="none" disabled style="font-size: 14px;"></rich-text>
-					<view style="margin-top: 10px;">
+<!-- 					<view style="margin-top: 10px;">
 						<u-button type="primary" class="bottom" v-if='isLoadOK&&tableKey!=1&&model.Nav_Notify.CHECKTYPE == 51' @click="openTest(model.ID)">查看试卷</u-button>
+					</view> -->
+					<view class="upload-title">附件</view>
+					<full-upload v-model="model.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload' :isShowBtn="false"></full-upload>
+					<u-form-item label="审阅意见：" prop="TRAIN_PLAN" borderBottom>
+						<u--input v-model="model.STATUS>2?'已阅':''" border="none" slot="right" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
+					</u-form-item>
+					<u-form-item label="合格率：" prop="Nav_TrainCheckType.NAME" borderBottom>
+						<u--input v-model="passRate" border="none" inputAlign="right" disabled disabledColor="#ffffff" fontSize="14px"></u--input>
+					</u-form-item>
+				</u--form>
+				<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm" v-if="model.Nav_Users">
+					<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;margin-top: 20px;">培训签到表</view>
+					<uni-collapse :border="false" accordion>
+						<view v-for="(item, index) in model.Nav_Users.filter(it=>it.OK)" :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.Nav_User?index+1+'.'+item.Nav_User.NAME:index+1+'.'}}
+										</view>
+									</view>
+								</template>
+								<view class="content" style="padding: 0px 0px 0px 10px;">
+
+									<u-form-item label="部门" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.DEPARTMENT_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
+									<u-form-item label="工号" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="(item.Nav_User||{}).CODE" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
+									<u-form-item label="岗位" prop="HIDDEN_PLACE" border-bottom>
+										<u--input v-model="item.POST_NAME" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
+									<u-form-item label="分数" prop="HIDDEN_PLACE" border-bottom v-if='model.Nav_Notify.CHECKTYPE == 51||model.Nav_Notify.CHECKTYPE == 56||model.Nav_Notify.CHECKTYPE == 81'>
+										<u--input v-model="item.SCORE" disabled disabledColor="#ffffff" inputAlign="right" fontSize="14px" border="none">
+										</u--input>
+									</u-form-item>
+									<u-form-item label="查看试卷" prop="HIDDEN_PLACE">
+									</u-form-item>
+									<view v-if="!signable">
+										<view v-if="isLoadOK&&model.Nav_Notify.CHECKTYPE&&(model.Nav_Notify.CHECKTYPE == 51||model.Nav_Notify.CHECKTYPE == 56||model.Nav_Notify.CHECKTYPE == 81)">
+											<u-button type="primary" class="bottom" v-if='model.Nav_Notify.CHECKTYPE == 51' @click="openTest(model.ID)">查看试卷</u-button>
+											<full-upload v-model="item.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload' :isShowBtn="false" v-else></full-upload>
+										</view>
+										<view v-else>
+											<u-button type="primary" class="bottom" @click="openTest(model.ID)">查看试卷</u-button>
+										</view>
+									</view>
+
+									<u-form-item label="电子签名" prop="CHECKSTANDARD">
+									</u-form-item>
+									<view v-if="model.Nav_User&&model.Nav_User.FILE_PATH">
+										<image style="width: 150px;height: 60px;" :src="imgurl+model.Nav_User.FILE_PATH">
+										</image>
+									</view>
+
+								</view>
+
+
+							</uni-collapse-item>
+						</view>
+					</uni-collapse>
+
 				</u--form>
 			</view>
 			<view class="bottom-button" v-if='isLoadOK&&tableKey==1&&model.STATUS==1'>
 				<u-button type="primary" class="bottom" color="#3d4b70" @click="onTableBtnAgree" :disabled="isAgree">签到</u-button>
 			</view>
 			<view class="bottom-button" v-if='isLoadOK&&tableKey==1&&model.STATUS==2'>
-				<u-button type="primary" class="bottom" color="#3d4b70" @click="onTableBtnAudit">审核</u-button>
+				<u-button type="primary" class="bottom" color="#3d4b70" @click="onTableBtnAudit">审阅</u-button>
 			</view>
 		</view>
 	</view>
@@ -93,6 +158,7 @@
 	export default {
 		data() {
 			return {
+				imgurl: config.uni_app_web_api_url + ':5199',
 				model: {},
 				TaskID: "",
 				tableKey: '0',
@@ -103,6 +169,9 @@
 				isAgree: false,
 				enumsData: {}, // 存储所有枚举数据（键：枚举名称，值：处理后的枚举列表）
 				enumsText: {}, // 存储枚举文本列表（用于下拉选择等场景）
+				signable: false,
+				userId: uni.getStorageSync('appInfo').User.ID,
+				passRate: '100%'
 			}
 		},
 		onLoad(option) {
@@ -205,6 +274,15 @@
 					this.model.MissUsers = MissUsers;
 					this.model.LeaveUsers = LeaveUsers;
 					this.model.Users = Users;
+					let passRateThis = 0
+					let userAll = res.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null)
+					let userPass = res.Nav_Users.filter(e => e.STATUS == 0 && e.ENABLE_STATUS == 0 && e.EXAMINATION_RESULTS != null && e.EXAMINATION_RESULTS == 1)
+					if (userAll && userAll.length > 0 && userPass && userPass.length > 0) {
+						passRateThis = (userPass.length / userAll.length).toFixed(4) * 100;
+					}
+					this.passRate = passRateThis+'%'
+
+					this.signable = res.STATUS == 1 && res.Nav_Users && res.Nav_Users.find(it => it.USER_ID === this.userId) && (this.tableKey == "1")
 					this.isLoadOK = true;
 				})
 			},
@@ -280,6 +358,8 @@
 
 <style>
 	/* @import url("@/style/css/editTemplate.css"); */
+	@import url("../../../../style/css/newTemplate.css");
+
 	.card {
 		margin: 20px 16px 140px 16px;
 		/* border: 1px solid #EBEEF5; */
diff --git a/pages/apply/subPages/SE/7answerPageEdit.vue b/pages/apply/subPages/SE/7answerPageEdit.vue
index c2ae708..7e5c32f 100644
--- a/pages/apply/subPages/SE/7answerPageEdit.vue
+++ b/pages/apply/subPages/SE/7answerPageEdit.vue
@@ -2,59 +2,57 @@
 	<view class="todo-page">
 		<view class="card">
 			<uni-card margin="0" :is-shadow="true">
-				<u--form labelPosition="left" labelWidth="auto" labelAlign="center" ref="wForm"
-					errorType="border-bottom">
+				<u--form labelPosition="left" labelWidth="auto" labelAlign="center" ref="wForm" errorType="border-bottom">
 					<u-form-item label="培训名称：" prop="NAME" borderBottom>
-						<u--input v-if="notify" v-model="notify.NAME" disabled disabledColor="#fff" border="none"
-							inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.NAME" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="开始时间：" prop="NAME" borderBottom>
-						<u--input v-if="notify" v-model="notify.TRAIN_START_TIME" disabled disabledColor="#fff"
-							border="none" inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.TRAIN_START_TIME" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="结束时间：" prop="NAME" borderBottom>
-						<u--input v-if="notify" v-model="notify.TRAIN_END_TIME" disabled disabledColor="#fff"
-							border="none" inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.TRAIN_END_TIME" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="培训地点：" prop="TRAIN_ADDR" borderBottom>
-						<u--input v-if="notify" v-model="notify.TRAIN_ADDR" disabled disabledColor="#fff" border="none"
-							inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.TRAIN_ADDR" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="组织部门：" prop="NAME" borderBottom>
-						<u--input v-if="notify" v-model="notify.Nav_LaunchDepartment.NAME" disabled disabledColor="#fff"
-							border="none" inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.Nav_LaunchDepartment.NAME" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
+					</u-form-item>
+					<u-form-item label="记录/考核人：" prop="NAME" borderBottom>
+						<u--input v-if="notify" v-model="notify.Nav_LaunchUser.NAME" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="培训老师：" prop="TRAIN_TEACHER" borderBottom>
-						<u--input v-if="notify" v-model="notify.TRAIN_TEACHER" disabled disabledColor="#fff"
-							border="none" inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.TRAIN_TEACHER" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="培训学时：" prop="HOURS" borderBottom>
-						<u--input v-if="notify" v-model="notify.HOURS" disabled disabledColor="#fff" border="none"
-							inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.HOURS" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
+					</u-form-item>
+					<u-form-item label="培训形式：" prop="HOURS" borderBottom>
+						<u--input v-if="notify" v-model="notify.TRAIN_MODEL_TEXT" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
+					</u-form-item>
+					<u-form-item label="考核方式：" prop="HOURS" borderBottom>
+						<u--input v-if="notify" v-model="notify.CHECKTYPE_TEXT" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="培训内容：" prop="NAME" borderBottom>
-						<u--input v-if="notify" v-model="notify.NAME" disabled disabledColor="#fff" border="none"
-							inputAlign="right"></u--input>
+						<u--input v-if="notify" v-model="notify.contentText" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
+					</u-form-item>
+					<u-form-item label="工号：" prop="score" borderBottom>
+						<u--input v-model="SelUsrCODE" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item label="考试人员：" prop="score" borderBottom>
-						<u--input v-model="SelUsrNAME" disabled disabledColor="#fff" border="none"
-							inputAlign="right"></u--input>
+						<u--input v-model="SelUsrNAME" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<u-form-item v-if="tableKey!=1" label="成绩：" prop="score" borderBottom>
-						<u--input v-model="score" disabled disabledColor="#fff" border="none"
-							inputAlign="right"></u--input>
+						<u--input v-model="score" disabled disabledColor="#fff" border="none" inputAlign="right"></u--input>
 					</u-form-item>
 					<view class="video" v-if="this.isViedo&& this.isCourEdit&&this.filepath&&this.filepath.length>1">
 						<uni-card margin="0" :is-shadow="true">
-							<u--form labelPosition="left" labelWidth="auto" labelAlign="center" ref="wForm"
-								errorType="border-bottom">
-								<video id="myVideo" @ended="onEnd" @timeupdate="onTimeUpdate" :src='this.filepath'
-									controls></video>
+							<u--form labelPosition="left" labelWidth="auto" labelAlign="center" ref="wForm" errorType="border-bottom">
+								<video id="myVideo" @ended="onEnd" @timeupdate="onTimeUpdate" :src='this.filepath' controls></video>
 							</u--form>
 						</uni-card>
 					</view>
-					<u-form-item v-if="this.isViedo==false&& this.isCourEdit&&this.filepath&&this.filepath.length>1"
-						label="课件附件：" borderBottom>
+					<u-form-item v-if="this.isViedo==false&& this.isCourEdit&&this.filepath&&this.filepath.length>1" label="课件附件：" borderBottom>
 						<full-upload v-model="this.filepathf" :isShowBtn="false"></full-upload>
 					</u-form-item>
 
@@ -64,36 +62,26 @@
 		<u-sticky offset-top="20" v-if="isVideoEnd">
 			<view class="sub-form">
 				<view class="sub-form-wrap">
-					<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom"
-						ref="sForm">
-						<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
-							v-for="(item, index) in perPaper">
+					<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm">
+						<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false" v-for="(item, index) in perPaper">
 							<!-- papers -->
 							<u-form-item>
 								<view class="uni-flex uni-column">
 									<view>{{(index+1)+'. '+ item.Nav_Test.NAME+getType(item.Nav_Test.TYPE)}}</view>
 									<view>
-										<u-radio-group v-if="item.Nav_Test.TYPE==0" v-model="item.ANSWER"
-											placement="column">
-											<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}"
-												v-for="(item1, index1) in radiolist1" :key="item1.value"
-												:label="item1.name" :name="item1.value" :disabled="readonly"
-												@change="doTrueOrFalse(index1,item)">
+										<u-radio-group v-if="item.Nav_Test.TYPE==0" v-model="item.ANSWER" placement="column">
+											<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}" v-for="(item1, index1) in radiolist1" :key="item1.value" :label="item1.name" :name="item1.value"
+												:disabled="readonly" @change="doTrueOrFalse(index1,item)">
 											</u-radio>
 										</u-radio-group>
 
-										<u-radio-group v-if="item.Nav_Test.TYPE==1" v-model="item.ANSWER"
-											placement="column">
-											<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}"
-												v-for="(item2, index2) in radiolist2[item.ID]" :key="item2.name"
-												:label="item2.name" :name="item2.value"
+										<u-radio-group v-if="item.Nav_Test.TYPE==1" v-model="item.ANSWER" placement="column">
+											<u-radio :customStyle="{marginBottom: '4px',marginTop: '4px'}" v-for="(item2, index2) in radiolist2[item.ID]" :key="item2.name" :label="item2.name" :name="item2.value"
 												@change="doOptionChange(index2,item)" :disabled="readonly" />
 										</u-radio-group>
-										<u-checkbox-group v-if="item.Nav_Test.TYPE==2" v-model="item.ANSWER3"
-											@change="checkboxChange($event,item,item.ID)" placement="column">
-											<u-checkbox :customStyle="{marginBottom: '4px',marginTop: '4px'}"
-												v-for="(item3, index3) in radiolist2[item.ID]" :key="item3.name"
-												:label="item3.name" :name="item3.value" :disabled="readonly">
+										<u-checkbox-group v-if="item.Nav_Test.TYPE==2" v-model="item.ANSWER3" @change="checkboxChange($event,item,item.ID)" placement="column">
+											<u-checkbox :customStyle="{marginBottom: '4px',marginTop: '4px'}" v-for="(item3, index3) in radiolist2[item.ID]" :key="item3.name" :label="item3.name" :name="item3.value"
+												:disabled="readonly">
 											</u-checkbox>
 										</u-checkbox-group>
 									</view>
@@ -106,8 +94,7 @@
 		</u-sticky>
 		<view class="bottom-button">
 			<button type="primary" style="width: 45%; float: left;" v-if="tableKey==1" @click="onTempSave">暂存</button>
-			<button type="primary" style="width: 45%; float: left; margin-left: 5px;" v-if="tableKey==1"
-				@click="submit">{{this.btnText}}</button>
+			<button type="primary" style="width: 45%; float: left; margin-left: 5px;" v-if="tableKey==1" @click="submit">{{this.btnText}}</button>
 		</view>
 	</view>
 </template>
@@ -129,6 +116,9 @@
 		getSelectedOptions,
 		getFileShow
 	} from '../../../../utils/common'
+	import {
+		getEnum,
+	} from '../../../../services/common';
 	import {
 		getRequest,
 	} from '../../../../services/apply/FOServices/FOServices';
@@ -168,6 +158,7 @@
 				TaskID: '',
 				EDIT_ID: '',
 				SelUsrNAME: '',
+				SelUsrCODE: '',
 				ORG_ID: uni.getStorageSync('orgId'),
 				isCourEdit: false, //是否 有课件的考试
 				isViedo: false,
@@ -190,6 +181,9 @@
 			this.model.ID = option.ID ? option.ID : '';
 			this.EDIT_ID = option.ID ? option.ID : '';
 			this.tableKey = option.tableKey ? option.tableKey : '0'
+			if (!option.tableKey) {
+				this.viewAll = true
+			}
 			this.loadData();
 		},
 		methods: {
@@ -206,12 +200,15 @@
 						this.UserList = res
 						if (this.viewAll) {
 							this.SelUsrID = res[0].ID;
+							this.SelUsrNAME = res[0].NAME
+							this.SelUsrCODE = res[0].CODE
 							this.getPapers();
 						} else {
 							let usr = res.find(it => it.ID == uni.getStorageSync('appInfo')?.User?.ID);
 							if (usr) {
 								this.SelUsrID = usr.ID
 								this.SelUsrNAME = usr.NAME
+								this.SelUsrCODE = usr.CODE
 								this.getPapers();
 							} else {
 								uni.$showMsgFunc('当前用户没有问卷!', () => {}, 'error', 1000)
@@ -265,6 +262,22 @@
 						let configE = res.Nav_Config;
 						let record = res.Nav_Papers[0].Nav_Record;
 						let notify = record ? record.Nav_Notify : null;
+						if (notify.Nav_TrainContentList && notify.Nav_TrainContentList.length > 0) {
+							notify.contentText = notify.Nav_TrainContentList.map(it => {
+								return it.Nav_Point.NAME
+							}).join('、')
+						} else {
+							notify.contentText = ''
+						}
+
+						notify.TRAIN_MODEL_TEXT = this.returnModel(notify.TRAIN_MODEL)
+						this.PlanCheckType(notify.CHECKTYPE, (name) => {
+						    notify.CHECKTYPE_TEXT = name;
+						    // 更新视图
+						    this.$forceUpdate();
+						});
+
+
 						let hasAnswered = false;
 						// for (let i = 0; i < res.Nav_Papers.length; i++) {
 						// 	if (res.Nav_Papers[i].ANSWER !== 0) {
@@ -343,6 +356,47 @@
 					}
 				})
 			},
+			PlanCheckType(id, callback) {
+				if (!id) {
+					callback('');
+					return;
+				}
+
+				var dataParm = {
+					'name': "PlanCheckType"
+				}
+
+				getEnum(dataParm).then(res => {
+					if (res && res.length > 0) {
+						const found = res.find(item => item.ID == id);
+						callback(found ? found.NAME : '');
+					} else {
+						callback('');
+					}
+				}).catch(error => {
+					console.error('获取考核类型失败:', error);
+					callback('');
+				});
+			},
+			returnModel(level) {
+				let str = '';
+				if (level == undefined) {
+					return str;
+				}
+				if (level.indexOf('1') >= 0) {
+					str += '讲授法 ';
+				}
+				if (level.indexOf('2') >= 0) {
+					str += '视听法 ';
+				}
+				if (level.indexOf('3') >= 0) {
+					str += '研讨法 ';
+				}
+				if (level.indexOf('4') >= 0) {
+					str += '演示法 ';
+				}
+				return str;
+			},
 			findSelectedOptions(num, OPTION_A, OPTION_B, OPTION_C, OPTION_D, OPTION_E) {
 				var optionVars = {
 					'A': {