diff --git a/pages/apply/subPages/FO/1preShiftMeetingEdit.vue b/pages/apply/subPages/FO/1preShiftMeetingEdit.vue
index efc2ff6..4aaa76c 100644
--- a/pages/apply/subPages/FO/1preShiftMeetingEdit.vue
+++ b/pages/apply/subPages/FO/1preShiftMeetingEdit.vue
@@ -83,9 +83,9 @@
 		</view> -->
 
 		<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">
-			<button type="default" @click="submit('Save')" :plain="true"
+			<button  @click="submit('Save')" :plain="true"
 				style="margin-right: 5px;background-color: #fff;color: #3d4b70;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">保存</button>
-			<button type="default" @click="submit('SaveAndNotify')"
+			<button  @click="submit('SaveAndNotify')"
 				style="margin-left: 5px;background-color: #3d4b70;color: #fff;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">提交</button>
 		</view>
 		<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" v-model='dateTimePickerInfo.defaultDateTime' @confirm="handleCheckDate" @close="dateTimePickerInfo.showCheckDate = false"
diff --git a/pages/apply/subPages/FO/4teamActivityEdit.vue b/pages/apply/subPages/FO/4teamActivityEdit.vue
index 9cf0e4c..7a64d73 100644
--- a/pages/apply/subPages/FO/4teamActivityEdit.vue
+++ b/pages/apply/subPages/FO/4teamActivityEdit.vue
@@ -1,627 +1,633 @@
-<template>
-	<view class="todo-page">
-		<view class="card">
-			<view class="background"></view>
-			<!-- <uni-card margin="0" :is-shadow="true"> -->
-			<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" :rules="rules" ref="wForm" errorType="border-bottom" class="demo-ruleForm">
-				<u-form-item required label="活动日期：" prop="ACTIVITY_TIME" borderBottom @click="showCheckDate = true;">
-					<u--input required v-model="model.ACTIVITY_TIME" disabled disabledColor="#fff" placeholder="请选择活动日期" border="none" inputAlign="right" fontSize="14px"></u--input>
-					<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
-				</u-form-item>
-				<u-form-item required label="活动主题：" prop="TITLE" borderBottom>
-					<u--input required v-model="model.TITLE" placeholder="请输入活动主题" border="none" inputAlign="right" fontSize="14px"></u--input>
-				</u-form-item>
-				<u-form-item required label="活动地点：" prop="ADDRESS" borderBottom>
-					<u--input required v-model="model.ADDRESS" placeholder="请输入活动地点" border="none" inputAlign="right" fontSize="14px"></u--input>
-				</u-form-item>
-				<u-form-item required label="主持人：" prop="Nav_MainUser.NAME" @click="handleChangeMainUser(model.Nav_MainUser)" borderBottom>
-					<u--input required disabledColor="#fff" v-model="model.Nav_MainUser.NAME" disabled placeholder="请选择主持人" suffixIcon="arrow-right" 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(model.Nav_User)" borderBottom>
-					<u--input required 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 required label="活动时长(小时)：" prop="DURATION" borderBottom>
-					<u--input required type="number" v-model="model.DURATION" placeholder="请输入活动时长" border="none" inputAlign="right" fontSize="14px"></u--input>
-				</u-form-item>
-				<u-form-item required label="活动内容：">
-				</u-form-item>
-				<u-form-item label="" prop="ACTIVITY_CONTENT">
-					<u--textarea required v-model="model.ACTIVITY_CONTENT" placeholder="请输入活动内容" border="surround"></u--textarea>
-				</u-form-item>
-				<view class="upload-title">附件</view>
-				<full-upload v-model="model.Nav_TeamActivityFile" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
-			</u--form>
-			<u-datetime-picker :show="showCheckDate" mode="date" v-model="activityTime" @confirm="handleCheckDate" @close="showCheckDate = false;" @cancel="showCheckDate = false;"></u-datetime-picker>
-			<!-- </uni-card> -->
-		</view>
-		<u-sticky offset-top="20">
-			<view class="sub-form" style="padding-bottom: 100px;">
-				<view class="sub-form-wrap">
+<template>
+	<view class="todo-page">
+		<view class="card">
+			<view class="background"></view>
+			<!-- <uni-card margin="0" :is-shadow="true"> -->
+			<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" :rules="rules" ref="wForm" errorType="border-bottom" class="demo-ruleForm">
+				<u-form-item required label="活动日期：" prop="ACTIVITY_TIME" borderBottom @click="showCheckDate = true;">
+					<u--input required v-model="model.ACTIVITY_TIME" disabled disabledColor="#fff" placeholder="请选择活动日期" border="none" inputAlign="right" fontSize="14px"></u--input>
+					<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
+				</u-form-item>
+				<u-form-item required label="活动主题：" prop="TITLE" borderBottom>
+					<u--input required v-model="model.TITLE" placeholder="请输入活动主题" border="none" inputAlign="right" fontSize="14px"></u--input>
+				</u-form-item>
+				<u-form-item required label="活动地点：" prop="ADDRESS" borderBottom>
+					<u--input required v-model="model.ADDRESS" placeholder="请输入活动地点" border="none" inputAlign="right" fontSize="14px"></u--input>
+				</u-form-item>
+				<u-form-item required label="主持人：" prop="Nav_MainUser.NAME" @click="handleChangeMainUser(model.Nav_MainUser)" borderBottom>
+					<u--input required disabledColor="#fff" v-model="model.Nav_MainUser.NAME" disabled placeholder="请选择主持人" suffixIcon="arrow-right" 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(model.Nav_User)" borderBottom>
+					<u--input required 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 required label="活动时长(小时)：" prop="DURATION" borderBottom>
+					<u--input required type="number" v-model="model.DURATION" placeholder="请输入活动时长" border="none" inputAlign="right" fontSize="14px"></u--input>
+				</u-form-item>
+				<u-form-item required label="活动内容：">
+				</u-form-item>
+				<u-form-item label="" prop="ACTIVITY_CONTENT">
+					<u--textarea required v-model="model.ACTIVITY_CONTENT" placeholder="请输入活动内容" border="surround"></u--textarea>
+				</u-form-item>
+				<view class="upload-title">附件</view>
+				<full-upload v-model="model.Nav_TeamActivityFile" :isShowBtn='true' :listProp='listPropUpload' :listPropVal='listPropValUpload'></full-upload>
+			</u--form>
+			<u-datetime-picker :show="showCheckDate" mode="date" v-model="activityTime" @confirm="handleCheckDate" @close="showCheckDate = false;" @cancel="showCheckDate = false;"></u-datetime-picker>
+			<!-- </uni-card> -->
+		</view>
+		<u-sticky offset-top="20">
+			<view class="sub-form" style="padding-bottom: 100px;">
+				<view class="sub-form-wrap">
 					<view class="sub-form-btns">
-						<!-- v-if='tableKey==1' -->
-						<view class="sub-form-btn" @click="handleAdd">
-							<u-icon class="icon" name="plus-circle" color="#3c9cff" size="21"></u-icon>
-							<u--text type="primary" text="新增人员"></u--text>
-						</view>
-					</view>
-					<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm" class="card" v-if="model.Nav_TeamActivityUser.length!==0">
-						<!-- <u-collapse :border="false" accordion> -->
-							<view v-if="!item.IS_DELETED" v-for="(item, index) in model.Nav_TeamActivityUser.filter(i => !i.IS_DELETED)">
-								<u-form-item :label="(index + 1) + '. ' + item.Nav_User.NAME+' - '+item.Nav_User.CODE" prop="Nav_User.NAME" @click="handleChangeUser(item)">
-									<!-- <view slot="right-icon" class="row-action"></view> -->
-									<view slot="right" class="row-action">
-										<view class="action" @click.stop style="display: flex;flex-direction: row;">
-											参与：<u-switch v-model="item.ATTEND_STATUS" :activeValue="1" :inactiveValue="0" inactiveColor="rgb(230, 230, 230)" size="20" space="4" @change="changeswitch(item)"></u-switch>
-											<u-icon @click="handleDelRowBefore(index, item)" class="icon" name="trash" color="#ff4d4f" size="21" style="margin-left: 10px;"></u-icon>
-										</view>
-									</view>
-									<!-- <u-form-item label="人员姓名" prop="Nav_User.NAME" borderBottom
-										@click="handleChangeUser(item)">
-										<u--input disabled disabledColor="#fff" v-model="item['Nav_User'].NAME"
-											placeholder="请选择人员姓名" border="none" inputAlign="right" fontSize="14px"></u--input>
-										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
-									</u-form-item>
-									<u-form-item label="出席状态：" prop="ATTEND_STATUS_SHOW" borderBottom
-										@click="handleChange(item)">
-										<u--input v-model="item.ATTEND_STATUS_SHOW" placeholder="出席状态" border="none"
-											inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
-										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
-										</u-icon>
-									</u-form-item> -->
-								</u-form-item>
-							</view>
-						<!-- </u-collapse> -->
-					</u--form>
-				</view>
-			</view>
-		</u-sticky>
-		<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cancelDel" showCancelButton title="确认删除？"></u-modal>
-		<query-selector :show="showPopup" :lists="userLists" :defaultValue="currentOperateUser.NAME" @close="handleClosePopup" @search="handleSearchUser" @select="handleSelectedUser" />
-		<query-selector :show="showPopupMonitor" :total="curTotalMonitor" :lists="monitorLists" :defaultValue="currentOperateMonitor.NAME" @close="handleClosePopupMonitor" @search="handleSearchMonitor"
-			@select="handleSelectedMonitor" />
-		<query-selector :show="showPopupMainUser" :total="curTotalMainUser" :lists="mainUserLists" :defaultValue="currentOperateMainUser.NAME" @close="handleClosePopupMainUser" @search="handleSearchMainUser"
-			@select="handleSelectedMainUser" />
-		<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
-		<view class="bottom-button">
-			<u-button type="primary" @click="submit" v-if='tableKey==1||isAdd==1' color="#3d4b70">提交</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
-	import {
-		extendFilterGroup,
-		extendGroupRule,
-		extendInclude,
-		extendOrder,
-		extendRule,
-		guid,
-		initFilter,
-		initFilterGroup
-	} from '../../../../utils/common'
-	import {
-		getRequest,
-		getTeamUsers
-	} from '../../../../services/apply/FOServices/FOServices';
-	import {
-		getUserLists
-	} from '../../../../services/safe'
-	import config from '../../../../config/common'
-
-	export default {
-		data() {
-			return {
-				userLists: [],
-				listPropUpload: ['TEAM_ACTIVITY_ID'],
-				listPropValUpload: [],
-				curTotalMonitor: 0,
-				monitorLists: [],
-				currentOperateMonitor: {},
-				showPopupMonitor: false,
-				curTotalMainUser: 0,
-				mainUserLists: [],
-				currentOperateMainUser: {},
-				showPopupMainUser: false,
-				model: {
-					TITLE: "",
-					ADDRESS:"",
-					DURATION:"",
-					ACTIVITY_CONTENT:"",
-					ACTIVITY_TIME: '',
-					ORG_ID: "",
-					NOTE_AKER_ID: "",
-					TEAM_ID: "",
-					Nav_TeamActivityUser: [],
-					Nav_TeamActivityFile: [],
-					Nav_User: {
-						NAME: ''
-					},
-					NOTE_AKER_ID: null,
-					Nav_MainUser: {
-						NAME: ''
-					},
-					USER_ID: null,
-				},
-				activityTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
-				options: [{
-					text: '删除',
-					style: {
-						backgroundColor: '#f56c6c'
-					}
-				}],
-				rules: {
-					'TITLE': {
-						type: 'string',
-						required: true,
-						trigger: ['blur', 'change']
-					},
-					'ADDRESS': {
-						type: 'string',
-						required: true,
-						trigger: ['blur', 'change']
-					},
-					'DURATION': {
-						type: 'string',
-						required: true,
-						trigger: ['blur', 'change']
-					},
-					'ACTIVITY_CONTENT': {
-						type: 'string',
-						required: true,
-						trigger: ['blur', 'change']
-					}
-				},
-				comPickerInfo: {
-					showSheet: false,
-					columns: [],
-				},
-				currentOperateUser: {},
-				showCheckDate: false,
-				showPopup: false,
-				tableKey: '0',
-				TaskID: '',
-				isLoadOK: false,
-				showDelModalIndex: undefined,
-				isAdd: 0,
-				ORG_ID: uni.getStorageSync('orgId')
-			}
-		},
-		onLoad(option) {
-			this.TaskID = option.taskID ? option.taskID : '';
-			this.model.ID = option.ID ? option.ID : '';
-			this.tableKey = option.tableKey ? option.tableKey : '0';
-			if (option.isAdd != 1) {
-				this.loadData();
-			} else {
-				this.isAdd = 1;
-				this.model.ID = guid();
-				this.model.ACTIVITY_TIME = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd');
-				this.loadTeamUsers();
-			}
-		},
-		methods: {
-			changeswitch(item) {
-				if (item.ATTEND_STATUS == 1) {
-					item.ATTEND_STATUS_SHOW = "参与"
-				} else {
-					item.ATTEND_STATUS_SHOW = "请假"
-					item.ATTEND_STATUS = 2
-				}
-			},
-			handleAdd() {
-				this.model.Nav_TeamActivityUser.unshift({
-					ID: guid(),
-					TEAM_ACTIVITY_ID: this.model.ID,
-					ORG_ID: this.ORG_ID,
-					Nav_User: {
-						NAME: "",
-						CODE: "",
-					},
-					USER_ID: "",
-					IS_DELETED: false,
-					ATTEND_STATUS_SHOW: "参与",
-					ATTEND_STATUS: 1
-				})
-			},
-			handleDelRowBefore(index, item) {
-				if (item.USER_ID == "") {
-					this.model.Nav_TeamActivityUser.splice(index, 1)
-				} else {
-					this.showDelModalIndex = index
-				}
-			},
-			cancelDel() {
-				this.showDelModalIndex = undefined
-			},
-			confirmDel() {
-				this.model.Nav_TeamActivityUser.filter(i => !i.IS_DELETED)[this.showDelModalIndex].IS_DELETED = true;
-				//this.model.Nav_TeamActivityUser.splice(this.showDelModalIndex, 1)
-				this.showDelModalIndex = undefined
-			},
-			handleChangeMonitor(user) {
-				this.currentOperateMonitor = user
-				this.showPopupMonitor = true
-				this.handleSearchMonitor('init')
-			},
-			handleSearchMonitor(val, pageIndex) {
-				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, "", "NAME", '', pageIndex)
-				extendInclude(json, "Nav_Department")
-				extendRule(json, 'ENABLE_STATUS', 1, '0')
-				if(orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c')
-				{
-					extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID)
-				}
-				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;
-				}
-			
-				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
-					}
-				})
-			},
-			handleSelectedMonitor(val) {
-				this.showPopupMonitor = false
-				this.currentOperateMonitor = val
-				this.model.Nav_User = val
-				this.model.NOTE_AKER_ID = val.ID
-			},
-			handleClosePopupMonitor() {
-				this.showPopupMonitor = false
-			},
-			handleChangeMainUser(user) {
-				this.currentOperateMainUser = user
-				this.showPopupMainUser = true
-				this.handleSearchMainUser('init')
-			},
-			handleSearchMainUser(val, pageIndex) {
-				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, "", "NAME", '', pageIndex)
-				extendInclude(json, "Nav_Department")
-				extendRule(json, 'ENABLE_STATUS', 1, '0')
-				if(orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c')
-				{
-					extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID)
-				}
-				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;
-				}
-						
-				getUserLists(json).then(res => {
-					if (res.IsSuccessful) {
-						this.mainUserLists = res.Data.map(i => {
-							return {
-								...i,
-								name: i.NAME,
-								code: i.CODE
-							}
-						})
-						this.curTotalMainUser = res.TotalCount
-					}
-				})
-			},
-			handleSelectedMainUser(val) {
-				this.showPopupMainUser = false
-				this.currentOperateMainUser = val
-				this.model.Nav_MainUser = val
-				this.model.USER_ID = val.ID
-			},
-			handleClosePopupMainUser() {
-				this.showPopupMainUser = false
-			},
-
-			loadTeamUsers() {
-				let personid = uni.getStorageSync('appInfo').User.PERSON_ID;
-				const json = initFilter(this.ORG_ID, "", "")
-				extendRule(json, 'CHARGE_PERSON_ID', 1, personid);
-				extendRule(json, 'ENABLE_STATUS', 1, 0);
-				extendInclude(json, 'Nav_TeamPersons.Nav_Person.Nav_User');
-				getTeamUsers(json).then(res => {
-					if (res && res.length > 0) {
-						let teamPersons = res[0].Nav_TeamPersons;
-						let person = [];
-						let rowNo = 1;
-						if (teamPersons && teamPersons.length > 0) {
-							teamPersons.forEach(item => {
-								let objPerson = {
-									Nav_User: {},
-									NAME: '',
-									CODE: '',
-								}
-								objPerson.Nav_User.NAME = item.Nav_Person.NAME;
-								objPerson.Nav_User.CODE = item.Nav_Person.CODE;
-								objPerson.ID = guid();
-								objPerson.TEAM_ACTIVITY_ID = this.model.ID;
-								objPerson.USER_ID = item.Nav_Person?.Nav_User?.ID;
-								objPerson.ATTEND_STATUS = 1;
-								objPerson.ATTEND_STATUS_SHOW = "参与";
-								objPerson.SIGN_IN_STATUS = 0;
-								objPerson.ORG_ID = this.ORG_ID;
-								person.push(objPerson);
-								rowNo++;
-							})
-						}
-						this.model.Nav_TeamActivityUser = person;
-					}
-				})
-			},
-			loadData() {
-				const json = initFilter(this.ORG_ID, "", "")
-				if (this.listPropValUpload.length == 0) {
-					this.listPropValUpload.push(this.model.ID)
-				}
-				extendInclude(json, "Nav_TeamActivityFile.Nav_ImgFile")
-				extendInclude(json, "Nav_Taem")
-				extendInclude(json, "Nav_User")
-				extendInclude(json, "Nav_MainUser")
-				extendInclude(json, "Nav_TeamActivityUser")
-				extendInclude(json, "Nav_TeamActivityUser.Nav_User")
-				extendInclude(json, "Nav_TeamActivityUser.Nav_User.Nav_Person.Nav_Post")
-				extendRule(json, 'ID', 1, this.model.ID)
-
-				getRequest(json, "/FO/TeamActivity/Get").then(res => {
-					this.model = res;
-					if(res.USER_ID == null)
-					{
-						// res.USER_ID = uni.getStorageSync('appInfo').User.ID;
-						res.Nav_MainUser = {};
-					}
-					this.model.Nav_TeamActivityUser.forEach(item => {
-						if (item.ATTEND_STATUS == 1) {
-							item.ATTEND_STATUS_SHOW = "参与"
-						} else {
-							item.ATTEND_STATUS_SHOW = "请假"
-						}
-					})
-					this.model.ACTIVITY_TIME = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd');
-				})
-			},
-			handleSearchUser(val) {
-				const json = initFilter(this.ORG_ID, "", "NAME")
-				extendInclude(json, "Nav_Person.Nav_Post")
-				extendRule(json, 'ENABLE_STATUS', 1, '0')
-				// extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo').User.DEPARTMENT_ID)
-				if (val !== 'init') {
-					const tempGroup = initFilterGroup(false);
-					extendGroupRule(tempGroup, 'NAME', 9, val)
-					extendFilterGroup(json, tempGroup);
-				}
-				getUserLists(json).then(res => {
-					if (res.IsSuccessful) {
-						this.userLists = res.Data.map(i => {
-							return {
-								...i,
-								name: i.NAME,
-								code: i.CODE
-							}
-						})
-					}
-				})
-			},
-			handleSelectedUser(val) {
-				this.showPopup = false
-				this.lists = []
-				this.currentOperateUser.USER_ID = val.ID;
-				this.currentOperateUser.Nav_User.NAME = val.NAME;
-				this.currentOperateUser.Nav_User.CODE = val.CODE;
-			},
-			handleClosePopup() {
-				this.showPopup = false
-			},
-			handleChangeUser(user) {
-				if (user.Nav_User.NAME == '') {
-					this.currentOperateUser = user
-					this.showPopup = true;
-					this.handleSearchUser("init")
-				}
-
-			},
-			handleChange(item) {
-				this.currentOperate = item;
-				this.comPickerInfo.showSheet = true;
-				let column = []
-				column = [{
-						NAME: '参与',
-						ID: 1
-					},
-					{
-						NAME: '请假',
-						ID: 2
-					}
-				]
-				this.comPickerInfo = {
-					showSheet: true,
-					columns: [column]
-				}
-
-			},
-			onConfirmPicker(e) {
-				this.currentOperate.ATTEND_STATUS = e.value[0].ID
-				this.currentOperate.ATTEND_STATUS_SHOW = e.value[0].NAME
-				this.comPickerInfo.showSheet = false
-			},
-			closePicker() {
-				this.comPickerInfo = {
-					showSheet: false,
-					columns: [],
-				}
-			},
-			handleCheckDate(e) {
-				this.showCheckDate = false
-				this.model.ACTIVITY_TIME = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
-			},
-			submit() {
-				if (this.model.TITLE == "") {
-					uni.$showMsgFunc('请填写活动主题!', () => {}, 'error', 1000)
-					return;
-				}
-				if (this.model.ADDRESS == "") {
-					uni.$showMsgFunc('请填写活动地点!', () => {}, 'error', 1000)
-					return;
-				}
-				if (this.model.DURATION == "") {
-					uni.$showMsgFunc('请填写活动时长!', () => {}, 'error', 1000)
-					return;
-				}
-				if (this.model.ACTIVITY_CONTENT == "") {
-					uni.$showMsgFunc('请填写活动内容!', () => {}, 'error', 1000)
-					return;
-				}
-				if (this.model.Nav_TeamActivityFile.length == 0) {
-					uni.$showMsgFunc('请上传附件!', () => {}, 'error', 1000)
-					return;
-				}
-				if (this.TaskID != "") {
-					this.model.TaskID = this.TaskID;
-				}
-				if (this.model.ORG_ID == "") {
-					this.model.ORG_ID = this.ORG_ID;
-				}
-				if (this.model.NOTE_AKER_ID == "") {
-					this.model.NOTE_AKER_ID = uni.getStorageSync('appInfo').User.ID;
-				}
-				if (this.model.USER_ID == "") {
-					this.model.USER_ID = uni.getStorageSync('appInfo').User.ID;
-				}
-
-				this.model.Nav_TeamActivityUser.forEach(item => {
-					item.Nav_User = null;
-				});
-				this.model.Nav_TeamActivityFile.forEach(item => {
-					if (item.TEAM_ACTIVITY_ID == undefined) {
-						item.TEAM_ACTIVITY_ID = this.model.ID;
-					}
-				});
-				const ele = this.$refs
-				ele['wForm'].validate().then(res => {
-					getRequest(this.model, "/FO/FOTeamActivity/FullUpdate").then(res => {
-						if (res) {
-							uni.$showMsgFunc('操作成功!', () => {
-								uni.navigateBack()
-							}, 'success', 1000)
-						}
-					})
-				}).catch(err => {
-					uni.$showErrorInfo('请检查必填项，必填项不能为空')
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped>
-	/* @import url("../../../../style/css/editTemplate.css"); */
-
-	.todo-page {
-		/* padding: 16px 16px 70px; */
-	}
-
-	.background {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: #edf1fd;
-		z-index: -1;
-	}
-
-	.card {
-		margin: 20px 16px 20px 16px;
-		/* border: 1px solid #EBEEF5; */
-		padding: 20px 30px 40px 30px;
-		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
-		background-color: #ffffff;
-		border-radius: 10px;
-	}
-
-	.upload-title {
-		font-size: 14px;
-		color: #8e8b9c;
-		line-height: 22px;
-		padding: 8px 0px;
-	}
-
-	.demo-ruleForm>>>.u-form-item__body__left__content__label {
-		font-size: 14px;
-		color: #8e8b9c;
-		/* justify-content: flex-start; */
-	}
-
-	.demo-ruleForm>>>.u-form-item__body__left__content__ {
-		left: -11px;
-		top: 0px
-	}
-
-	.demo-ruleForm>>>.u-textarea__field {
-		font-size: 14px;
-	}
-
-	.demo-ruleForm>>>.u-cell__title-text {
-		font-size: 14px;
-	}
-
-	.bottom-button {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		padding: 10px 16px;
-		box-sizing: border-box;
-		background: #edf1fd;
-		z-index: 999;
-	}
-	.sub-form-btn {
-		display: flex;
-		flex-direction: row;
-		margin: 0px 16px;
-	}
-
-	.sub-form>>>.u-form-item__body__left__content__label {
-		font-size: 14px;
-	}
-
-	.sub-form>>>.u-cell__title-text {
-		font-size: 14px;
-	}
-
-	.sub-form>>>.uni-card--border {
-		border: none;
-	}
-
-	.sub-form>>>.uni-card {
-		border-radius: 0;
-	}
-	.sub-form>>>.u-form-item__body {
-		padding: 15px 0px;
-	}
+						<!-- v-if='tableKey==1' -->
+						<view class="sub-form-btn" @click="handleAdd">
+							<u-icon class="icon" name="plus-circle" color="#3c9cff" size="21"></u-icon>
+							<u--text type="primary" text="新增人员"></u--text>
+						</view>
+					</view>
+					<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom" ref="sForm" class="card" v-if="model.Nav_TeamActivityUser.length!==0">
+						<!-- <u-collapse :border="false" accordion> -->
+						<view v-if="!item.IS_DELETED" v-for="(item, index) in model.Nav_TeamActivityUser.filter(i => !i.IS_DELETED)">
+							<u-form-item :label="(index + 1) + '. ' + item.Nav_User.NAME+' - '+item.Nav_User.CODE" prop="Nav_User.NAME" @click="handleChangeUser(item)">
+								<!-- <view slot="right-icon" class="row-action"></view> -->
+								<view slot="right" class="row-action">
+									<view class="action" @click.stop style="display: flex;flex-direction: row;">
+										参与：<u-switch v-model="item.ATTEND_STATUS" :activeValue="1" :inactiveValue="0" inactiveColor="rgb(230, 230, 230)" size="20" space="4" @change="changeswitch(item)"></u-switch>
+										<u-icon @click="handleDelRowBefore(index, item)" class="icon" name="trash" color="#ff4d4f" size="21" style="margin-left: 10px;"></u-icon>
+									</view>
+								</view>
+								<!-- <u-form-item label="人员姓名" prop="Nav_User.NAME" borderBottom
+										@click="handleChangeUser(item)">
+										<u--input disabled disabledColor="#fff" v-model="item['Nav_User'].NAME"
+											placeholder="请选择人员姓名" border="none" inputAlign="right" fontSize="14px"></u--input>
+										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12"></u-icon>
+									</u-form-item>
+									<u-form-item label="出席状态：" prop="ATTEND_STATUS_SHOW" borderBottom
+										@click="handleChange(item)">
+										<u--input v-model="item.ATTEND_STATUS_SHOW" placeholder="出席状态" border="none"
+											inputAlign="right" disabled disabledColor="#fff" fontSize="14px"></u--input>
+										<u-icon style="margin-left: 4px;" slot="right" name="arrow-down" size="12">
+										</u-icon>
+									</u-form-item> -->
+							</u-form-item>
+						</view>
+						<!-- </u-collapse> -->
+					</u--form>
+				</view>
+			</view>
+		</u-sticky>
+		<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cancelDel" showCancelButton title="确认删除？"></u-modal>
+		<query-selector :show="showPopup" :lists="userLists" :defaultValue="currentOperateUser.NAME" @close="handleClosePopup" @search="handleSearchUser" @select="handleSelectedUser" />
+		<query-selector :show="showPopupMonitor" :total="curTotalMonitor" :lists="monitorLists" :defaultValue="currentOperateMonitor.NAME" @close="handleClosePopupMonitor" @search="handleSearchMonitor"
+			@select="handleSelectedMonitor" />
+		<query-selector :show="showPopupMainUser" :total="curTotalMainUser" :lists="mainUserLists" :defaultValue="currentOperateMainUser.NAME" @close="handleClosePopupMainUser" @search="handleSearchMainUser"
+			@select="handleSelectedMainUser" />
+		<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
+		<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button">
+			<u-button type="default" @click="submit('Save')" :plain="true" color="#3d4b70" style="margin-right: 5px;">保存</u-button>
+			<!-- <u-button type="primary" @click="submit" v-if='tableKey==1||isAdd==1' color="#3d4b70">提交</u-button> -->
+			<u-button type="default" @click="submit('SaveAndNotify')" v-if='tableKey==1||isAdd==1' color="#3d4b70" style="margin-left: 5px;">提交</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	import {
+		extendFilterGroup,
+		extendGroupRule,
+		extendInclude,
+		extendOrder,
+		extendRule,
+		guid,
+		initFilter,
+		initFilterGroup
+	} from '../../../../utils/common'
+	import {
+		getRequest,
+		getTeamUsers
+	} from '../../../../services/apply/FOServices/FOServices';
+	import {
+		getUserLists
+	} from '../../../../services/safe'
+	import config from '../../../../config/common'
+
+	export default {
+		data() {
+			return {
+				userLists: [],
+				listPropUpload: ['TEAM_ACTIVITY_ID'],
+				listPropValUpload: [],
+				curTotalMonitor: 0,
+				monitorLists: [],
+				currentOperateMonitor: {},
+				showPopupMonitor: false,
+				curTotalMainUser: 0,
+				mainUserLists: [],
+				currentOperateMainUser: {},
+				showPopupMainUser: false,
+				model: {
+					TITLE: "",
+					ADDRESS: "",
+					DURATION: "",
+					ACTIVITY_CONTENT: "",
+					ACTIVITY_TIME: '',
+					ORG_ID: "",
+					NOTE_AKER_ID: "",
+					TEAM_ID: "",
+					Nav_TeamActivityUser: [],
+					Nav_TeamActivityFile: [],
+					Nav_User: {
+						NAME: ''
+					},
+					NOTE_AKER_ID: null,
+					Nav_MainUser: {
+						NAME: ''
+					},
+					USER_ID: null,
+				},
+				activityTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'),
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#f56c6c'
+					}
+				}],
+				rules: {
+					'TITLE': {
+						type: 'string',
+						required: true,
+						trigger: ['blur', 'change']
+					},
+					'ADDRESS': {
+						type: 'string',
+						required: true,
+						trigger: ['blur', 'change']
+					},
+					'DURATION': {
+						type: 'string',
+						required: true,
+						trigger: ['blur', 'change']
+					},
+					'ACTIVITY_CONTENT': {
+						type: 'string',
+						required: true,
+						trigger: ['blur', 'change']
+					}
+				},
+				comPickerInfo: {
+					showSheet: false,
+					columns: [],
+				},
+				currentOperateUser: {},
+				showCheckDate: false,
+				showPopup: false,
+				tableKey: '0',
+				TaskID: '',
+				isLoadOK: false,
+				showDelModalIndex: undefined,
+				isAdd: 0,
+				ORG_ID: uni.getStorageSync('orgId')
+			}
+		},
+		onLoad(option) {
+			this.TaskID = option.taskID ? option.taskID : '';
+			this.model.ID = option.ID ? option.ID : '';
+			this.tableKey = option.tableKey ? option.tableKey : '0';
+			if (option.isAdd != 1) {
+				this.loadData();
+			} else {
+				this.isAdd = 1;
+				this.model.ID = guid();
+				this.model.ACTIVITY_TIME = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd');
+				this.loadTeamUsers();
+			}
+		},
+		methods: {
+			changeswitch(item) {
+				if (item.ATTEND_STATUS == 1) {
+					item.ATTEND_STATUS_SHOW = "参与"
+				} else {
+					item.ATTEND_STATUS_SHOW = "请假"
+					item.ATTEND_STATUS = 2
+				}
+			},
+			handleAdd() {
+				this.model.Nav_TeamActivityUser.unshift({
+					ID: guid(),
+					TEAM_ACTIVITY_ID: this.model.ID,
+					ORG_ID: this.ORG_ID,
+					Nav_User: {
+						NAME: "",
+						CODE: "",
+					},
+					USER_ID: "",
+					IS_DELETED: false,
+					ATTEND_STATUS_SHOW: "参与",
+					ATTEND_STATUS: 1
+				})
+			},
+			handleDelRowBefore(index, item) {
+				if (item.USER_ID == "") {
+					this.model.Nav_TeamActivityUser.splice(index, 1)
+				} else {
+					this.showDelModalIndex = index
+				}
+			},
+			cancelDel() {
+				this.showDelModalIndex = undefined
+			},
+			confirmDel() {
+				this.model.Nav_TeamActivityUser.filter(i => !i.IS_DELETED)[this.showDelModalIndex].IS_DELETED = true;
+				//this.model.Nav_TeamActivityUser.splice(this.showDelModalIndex, 1)
+				this.showDelModalIndex = undefined
+			},
+			handleChangeMonitor(user) {
+				this.currentOperateMonitor = user
+				this.showPopupMonitor = true
+				this.handleSearchMonitor('init')
+			},
+			handleSearchMonitor(val, pageIndex) {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "NAME", '', pageIndex)
+				extendInclude(json, "Nav_Department")
+				extendRule(json, 'ENABLE_STATUS', 1, '0')
+				if (orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c') {
+					extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID)
+				}
+				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;
+				}
+
+				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
+					}
+				})
+			},
+			handleSelectedMonitor(val) {
+				this.showPopupMonitor = false
+				this.currentOperateMonitor = val
+				this.model.Nav_User = val
+				this.model.NOTE_AKER_ID = val.ID
+			},
+			handleClosePopupMonitor() {
+				this.showPopupMonitor = false
+			},
+			handleChangeMainUser(user) {
+				this.currentOperateMainUser = user
+				this.showPopupMainUser = true
+				this.handleSearchMainUser('init')
+			},
+			handleSearchMainUser(val, pageIndex) {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, "", "NAME", '', pageIndex)
+				extendInclude(json, "Nav_Department")
+				extendRule(json, 'ENABLE_STATUS', 1, '0')
+				if (orgId === '8b3c41aa-51b1-7ce9-1879-248a038c1b5c') {
+					extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo')?.User?.DEPARTMENT_ID)
+				}
+				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;
+				}
+
+				getUserLists(json).then(res => {
+					if (res.IsSuccessful) {
+						this.mainUserLists = res.Data.map(i => {
+							return {
+								...i,
+								name: i.NAME,
+								code: i.CODE
+							}
+						})
+						this.curTotalMainUser = res.TotalCount
+					}
+				})
+			},
+			handleSelectedMainUser(val) {
+				this.showPopupMainUser = false
+				this.currentOperateMainUser = val
+				this.model.Nav_MainUser = val
+				this.model.USER_ID = val.ID
+			},
+			handleClosePopupMainUser() {
+				this.showPopupMainUser = false
+			},
+
+			loadTeamUsers() {
+				let personid = uni.getStorageSync('appInfo').User.PERSON_ID;
+				const json = initFilter(this.ORG_ID, "", "")
+				extendRule(json, 'CHARGE_PERSON_ID', 1, personid);
+				extendRule(json, 'ENABLE_STATUS', 1, 0);
+				extendInclude(json, 'Nav_TeamPersons.Nav_Person.Nav_User');
+				getTeamUsers(json).then(res => {
+					if (res && res.length > 0) {
+						let teamPersons = res[0].Nav_TeamPersons;
+						let person = [];
+						let rowNo = 1;
+						if (teamPersons && teamPersons.length > 0) {
+							teamPersons.forEach(item => {
+								let objPerson = {
+									Nav_User: {},
+									NAME: '',
+									CODE: '',
+								}
+								objPerson.Nav_User.NAME = item.Nav_Person.NAME;
+								objPerson.Nav_User.CODE = item.Nav_Person.CODE;
+								objPerson.ID = guid();
+								objPerson.TEAM_ACTIVITY_ID = this.model.ID;
+								objPerson.USER_ID = item.Nav_Person?.Nav_User?.ID;
+								objPerson.ATTEND_STATUS = 1;
+								objPerson.ATTEND_STATUS_SHOW = "参与";
+								objPerson.SIGN_IN_STATUS = 0;
+								objPerson.ORG_ID = this.ORG_ID;
+								person.push(objPerson);
+								rowNo++;
+							})
+						}
+						this.model.Nav_TeamActivityUser = person;
+					}
+				})
+			},
+			loadData() {
+				const json = initFilter(this.ORG_ID, "", "")
+				if (this.listPropValUpload.length == 0) {
+					this.listPropValUpload.push(this.model.ID)
+				}
+				extendInclude(json, "Nav_TeamActivityFile.Nav_ImgFile")
+				extendInclude(json, "Nav_Taem")
+				extendInclude(json, "Nav_User")
+				extendInclude(json, "Nav_MainUser")
+				extendInclude(json, "Nav_TeamActivityUser")
+				extendInclude(json, "Nav_TeamActivityUser.Nav_User")
+				extendInclude(json, "Nav_TeamActivityUser.Nav_User.Nav_Person.Nav_Post")
+				extendRule(json, 'ID', 1, this.model.ID)
+
+				getRequest(json, "/FO/TeamActivity/Get").then(res => {
+					this.model = res;
+					if (res.USER_ID == null) {
+						// res.USER_ID = uni.getStorageSync('appInfo').User.ID;
+						res.Nav_MainUser = {};
+					}
+					this.model.Nav_TeamActivityUser.forEach(item => {
+						if (item.ATTEND_STATUS == 1) {
+							item.ATTEND_STATUS_SHOW = "参与"
+						} else {
+							item.ATTEND_STATUS_SHOW = "请假"
+						}
+					})
+					this.model.ACTIVITY_TIME = uni.$u.timeFormat(new Date(), 'yyyy-mm-dd');
+				})
+			},
+			handleSearchUser(val) {
+				const json = initFilter(this.ORG_ID, "", "NAME")
+				extendInclude(json, "Nav_Person.Nav_Post")
+				extendRule(json, 'ENABLE_STATUS', 1, '0')
+				// extendRule(json, 'DEPARTMENT_ID', 1, uni.getStorageSync('appInfo').User.DEPARTMENT_ID)
+				if (val !== 'init') {
+					const tempGroup = initFilterGroup(false);
+					extendGroupRule(tempGroup, 'NAME', 9, val)
+					extendFilterGroup(json, tempGroup);
+				}
+				getUserLists(json).then(res => {
+					if (res.IsSuccessful) {
+						this.userLists = res.Data.map(i => {
+							return {
+								...i,
+								name: i.NAME,
+								code: i.CODE
+							}
+						})
+					}
+				})
+			},
+			handleSelectedUser(val) {
+				this.showPopup = false
+				this.lists = []
+				this.currentOperateUser.USER_ID = val.ID;
+				this.currentOperateUser.Nav_User.NAME = val.NAME;
+				this.currentOperateUser.Nav_User.CODE = val.CODE;
+			},
+			handleClosePopup() {
+				this.showPopup = false
+			},
+			handleChangeUser(user) {
+				if (user.Nav_User.NAME == '') {
+					this.currentOperateUser = user
+					this.showPopup = true;
+					this.handleSearchUser("init")
+				}
+
+			},
+			handleChange(item) {
+				this.currentOperate = item;
+				this.comPickerInfo.showSheet = true;
+				let column = []
+				column = [{
+						NAME: '参与',
+						ID: 1
+					},
+					{
+						NAME: '请假',
+						ID: 2
+					}
+				]
+				this.comPickerInfo = {
+					showSheet: true,
+					columns: [column]
+				}
+
+			},
+			onConfirmPicker(e) {
+				this.currentOperate.ATTEND_STATUS = e.value[0].ID
+				this.currentOperate.ATTEND_STATUS_SHOW = e.value[0].NAME
+				this.comPickerInfo.showSheet = false
+			},
+			closePicker() {
+				this.comPickerInfo = {
+					showSheet: false,
+					columns: [],
+				}
+			},
+			handleCheckDate(e) {
+				this.showCheckDate = false
+				this.model.ACTIVITY_TIME = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
+			},
+			submit(type) {
+				if (this.model.TITLE == "") {
+					uni.$showMsgFunc('请填写活动主题!', () => {}, 'error', 1000)
+					return;
+				}
+				if (this.model.ADDRESS == "") {
+					uni.$showMsgFunc('请填写活动地点!', () => {}, 'error', 1000)
+					return;
+				}
+				if (this.model.DURATION == "") {
+					uni.$showMsgFunc('请填写活动时长!', () => {}, 'error', 1000)
+					return;
+				}
+				if (this.model.ACTIVITY_CONTENT == "") {
+					uni.$showMsgFunc('请填写活动内容!', () => {}, 'error', 1000)
+					return;
+				}
+				if (this.model.Nav_TeamActivityFile.length == 0) {
+					uni.$showMsgFunc('请上传附件!', () => {}, 'error', 1000)
+					return;
+				}
+				if (this.TaskID != "") {
+					this.model.TaskID = this.TaskID;
+				}
+				if (this.model.ORG_ID == "") {
+					this.model.ORG_ID = this.ORG_ID;
+				}
+				if (this.model.NOTE_AKER_ID == "") {
+					this.model.NOTE_AKER_ID = uni.getStorageSync('appInfo').User.ID;
+				}
+				if (this.model.USER_ID == "") {
+					this.model.USER_ID = uni.getStorageSync('appInfo').User.ID;
+				}
+
+				this.model.Nav_TeamActivityUser.forEach(item => {
+					item.Nav_User = null;
+				});
+				this.model.Nav_TeamActivityFile.forEach(item => {
+					if (item.TEAM_ACTIVITY_ID == undefined) {
+						item.TEAM_ACTIVITY_ID = this.model.ID;
+					}
+				});
+				if (type == 'SaveAndNotify') {
+					this.model.OpType = 0;
+				} else {
+					this.model.OpType = 1;
+				}
+				const ele = this.$refs
+				ele['wForm'].validate().then(res => {
+					getRequest(this.model, "/FO/FOTeamActivity/FullUpdate").then(res => {
+						if (res) {
+							uni.$showMsgFunc('操作成功!', () => {
+								uni.navigateBack()
+							}, 'success', 1000)
+						}
+					})
+				}).catch(err => {
+					uni.$showErrorInfo('请检查必填项，必填项不能为空')
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	/* @import url("../../../../style/css/editTemplate.css"); */
+
+	.todo-page {
+		/* padding: 16px 16px 70px; */
+	}
+
+	.background {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: #edf1fd;
+		z-index: -1;
+	}
+
+	.card {
+		margin: 20px 16px 20px 16px;
+		/* border: 1px solid #EBEEF5; */
+		padding: 20px 30px 40px 30px;
+		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
+		background-color: #ffffff;
+		border-radius: 10px;
+	}
+
+	.upload-title {
+		font-size: 14px;
+		color: #8e8b9c;
+		line-height: 22px;
+		padding: 8px 0px;
+	}
+
+	.demo-ruleForm>>>.u-form-item__body__left__content__label {
+		font-size: 14px;
+		color: #8e8b9c;
+		/* justify-content: flex-start; */
+	}
+
+	.demo-ruleForm>>>.u-form-item__body__left__content__ {
+		left: -11px;
+		top: 0px
+	}
+
+	.demo-ruleForm>>>.u-textarea__field {
+		font-size: 14px;
+	}
+
+	.demo-ruleForm>>>.u-cell__title-text {
+		font-size: 14px;
+	}
+
+	.bottom-button {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		padding: 10px 16px;
+		box-sizing: border-box;
+		background: #edf1fd;
+		z-index: 999;
+	}
+
+	.sub-form-btn {
+		display: flex;
+		flex-direction: row;
+		margin: 0px 16px;
+	}
+
+	.sub-form>>>.u-form-item__body__left__content__label {
+		font-size: 14px;
+	}
+
+	.sub-form>>>.u-cell__title-text {
+		font-size: 14px;
+	}
+
+	.sub-form>>>.uni-card--border {
+		border: none;
+	}
+
+	.sub-form>>>.uni-card {
+		border-radius: 0;
+	}
+
+	.sub-form>>>.u-form-item__body {
+		padding: 15px 0px;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/apply/subPages/FO/FO041Edit.vue b/pages/apply/subPages/FO/FO041Edit.vue
index 6a37b31..3f09dfb 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  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  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  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  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  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  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,7 +110,7 @@
 
 									</u-form-item>
 									<u--textarea autoHeight v-model="item.MEASURE" placeholder="请输入处置措施" border="surround"></u--textarea>
-									<u-form-item  label="现场责任人：" prop="Nav_User.NAME" @click="handleShowSheet({title: '现场责任人', name: 'Nav_User',itemData:item})" borderBottom>
+									<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>
@@ -137,9 +137,12 @@
 
 			</view>
 
-			<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button">
-				<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
-				<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
+			<view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 1" class="bottom-button">
+				<u-button @click="submit('0')" :plain="true" color="#3d4b70">保存</u-button>
+				<view style="display: flex;flex-direction: row;margin-top: 10px;">
+					<u-button @click="stepReduce" :plain="true" color="#3d4b70" style="margin-right: 5px;">上一步</u-button>
+					<u-button @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px">提交</u-button>
+				</view>
 			</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" />
@@ -475,8 +478,8 @@
 			handleNewCheckArea() {
 				this.model.Nav_Details.push({
 					ID: guid(),
-					LEADER_WELL_RECORD_ID:this.model.ID,
-					ORG_ID:uni.getStorageSync('orgId'),
+					LEADER_WELL_RECORD_ID: this.model.ID,
+					ORG_ID: uni.getStorageSync('orgId'),
 					START_DATE: '',
 					END_DATE: '',
 					Nav_DetailAreas: [],
@@ -730,24 +733,24 @@
 				this.dateTimePickerInfo.showCheckDate = false
 
 			},
-			submit() {
+			submit(type) {
 				this.modelEdit = JSON.parse(JSON.stringify(this.model))
 				delete this.modelEdit.Nav_ApplyDepartment
 				delete this.modelEdit.Nav_ApplyUser
 				delete this.modelEdit.Nav_Class
 				delete this.modelEdit.Nav_ProductionUnit
-				if(this.modelEdit.Nav_Details&&this.modelEdit.Nav_Details.length>0){
+				if (this.modelEdit.Nav_Details && this.modelEdit.Nav_Details.length > 0) {
 					this.modelEdit.Nav_Details.map(item => {
-					item.PUBLISH = 'SaveAndNotify'
-					delete item.Nav_User
-					if(item.Nav_DetailAreas&&item.Nav_DetailAreas.length>0){
-						item.Nav_DetailAreas.map(item1=>{
-							delete item1.Nav_Area
-						})
-					}
-				})
+						item.PUBLISH = type
+						delete item.Nav_User
+						if (item.Nav_DetailAreas && item.Nav_DetailAreas.length > 0) {
+							item.Nav_DetailAreas.map(item1 => {
+								delete item1.Nav_Area
+							})
+						}
+					})
 				}
-				
+
 				if (this.TaskID == null || this.TaskID == '') {
 					this.modelEdit.TaskID = '00000000-0000-0000-0000-000000000000'
 				} else {
@@ -756,7 +759,7 @@
 				if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
 					this.modelEdit.ORG_ID = this.ORG_ID
 
-				this.modelEdit.PUBLISH = 'SaveAndNotify'
+				this.modelEdit.PUBLISH = type;
 				fullFOLeaderWellRecord(this.modelEdit).then(res => {
 					if (res) {
 						uni.$showMsgFunc('操作成功!', () => {
diff --git a/pages/apply/subPages/FO/jobFireEdit.vue b/pages/apply/subPages/FO/jobFireEdit.vue
index d620c1d..b516c22 100644
--- a/pages/apply/subPages/FO/jobFireEdit.vue
+++ b/pages/apply/subPages/FO/jobFireEdit.vue
@@ -191,9 +191,12 @@
 
 			</view>
 
-			<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 2" class="bottom-button">
-				<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
-				<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
+			<view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 2" class="bottom-button">
+				<u-button @click="submit('0')" :plain="true" color="#3d4b70">保存</u-button>
+				<view style="display: flex;flex-direction: row;margin-top: 10px;">
+					<u-button @click="stepReduce" :plain="true" color="#3d4b70" style="margin-right: 5px;">上一步</u-button>
+					<u-button @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px">提交</u-button>
+				</view>
 			</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" />
@@ -921,7 +924,7 @@
 				this.dateTimePickerInfo.showCheckDate = false
 
 			},
-			submit() {
+			submit(type) {
 				this.modelEdit = JSON.parse(JSON.stringify(this.model))
 				delete this.modelEdit.Nav_ApplyDepartment
 				delete this.modelEdit.Nav_ApplyUser
@@ -939,7 +942,7 @@
 				}
 				if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
 					this.modelEdit.Nav_Users.map(item => {
-						item.PUBLISH = 'SaveAndNotify'
+						item.PUBLISH = type
 						delete item.Nav_Train
 						delete item.Nav_User
 						delete item.Nav_UserType
@@ -958,8 +961,7 @@
 				}
 				if (this.modelEdit.ORG_ID == null || this.modelEdit.ORG_ID == '')
 					this.modelEdit.ORG_ID = this.ORG_ID
-
-				this.modelEdit.PUBLISH = 'SaveAndNotify'
+				this.modelEdit.PUBLISH = type;
 				fullFOFireJob(this.modelEdit).then(res => {
 					if (res) {
 						uni.$showMsgFunc('操作成功!', () => {
diff --git a/pages/apply/subPages/FO/jobFireTenEdit.vue b/pages/apply/subPages/FO/jobFireTenEdit.vue
index eaff00a..043befc 100644
--- a/pages/apply/subPages/FO/jobFireTenEdit.vue
+++ b/pages/apply/subPages/FO/jobFireTenEdit.vue
@@ -1,833 +1,844 @@
-<template>
-	<view class="todo-page">
-		<view class="background"></view>
-		<view class="allview">
-			<view class="card" v-if="stepsPageList === 0">
-				<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="Nav_User.NAME" borderBottom>
-						<u--input disabledColor="#fff" v-model="(model.Nav_OperationStep||{}).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="Product_Unit" borderBottom>
-						<u--input v-model="(model.Nav_Area||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
-						</u--input>
-					</u-form-item>
-					<u-form-item label="动火地点" prop="LOCATION" borderBottom>
-						<u--input disabled disabledColor="#ffffff" v-model="model.JOB_LOCATION" border="none" inputAlign="right" fontSize="14px"></u--input>
-					</u-form-item>
-					<u-form-item label="动火方式：" prop="Nav_Type" borderBottom>
-						<u--input v-model="(model.Nav_Type||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
-						</u--input>
-					</u-form-item>
-
-					<u-form-item label="动火计划开始时间" prop="CHECKDATETIME" borderBottom>
-						<u--input disabled disabledColor="#fff" v-model="model.JOB_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="LOCATION" borderBottom>
-						<u--input disabled disabledColor="#ffffff" v-model="model.JOB_CONTENT" 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_Risks">
-						<uni-tag class="tag" v-for="(i, k) in model.Nav_Risks.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.RISK_NAME" type="primary" />
-					</view>
-					<view class="upload-title">附件：</view>
-					<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
-					<u-form-item required label="动火作业现场条件验收情况" prop="LOCATION">
-
-					</u-form-item>
-					<u--textarea v-model="model.COMPLETED_CONDITION" placeholder="请输入动火作业现场条件验收情况" border="surround"></u--textarea>
-					<u-form-item required label="是否可以动火：" prop="Nav_User.NAME" @click="handleChange('FOYesOrNoEnum')" borderBottom>
-						<u--input disabledColor="#fff" v-model="model.IS_FIREName" 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="CHECKDATETIME" borderBottom @click="showCheckDate(1)">
-						<u--input disabled disabledColor="#fff" v-model="model.ACT_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_User.NAME" @click="handleChangeMonitor('Nav_DispatchUser')" borderBottom>
-						<u--input disabledColor="#fff" v-model="(model.Nav_DispatchUser||{}).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>
-					<view class="upload-title">现场条件验收附件：</view>
-					<full-upload v-model="model.Nav_FireFiles"></full-upload>
-				</u--form>
-			</view>
-			<view style="padding: 10px 16px;" v-if="stepsPageList === 0" class="bottom-button">
-				<u-button type="primary" @click="stepAdd" color="#3d4b70" :loading="stepLoad">下一步</u-button>
-			</view>
-			<view class="card" v-if="stepsPageList === 1">
-				<u--form labelWidth="auto" :model="model" ref="wForm" class="sub-form">
-
-
-					<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_Details.filter(i => !i.IS_DELETED)" :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.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
-										</view>
-										<view @click.stop style="display: flex;flex-direction: row;align-items: center;">
-											<u-switch v-model="item.IS_CONFIRM_NEW" @change="changeConfirm($event,item)" size="18" style="margin-right: 10px;"></u-switch>
-											<u-icon @click="handleDelRowBefore(item)" name="trash" color="#ff4d4f" size="21" style="margin-right: 10px;"></u-icon>
-										</view>
-									</view>
-								</template>
-								<view class="content" style="padding: 0px 0px 0px 10px;">
-									<u-form-item label="顺序：" prop="Nav_User.NAME" @ borderBottom>
-										<u--input disabledColor="#fff" v-model="item.NUM" placeholder="请输入顺序" type="number" 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="handleChange('FOJobStepEnum',item)" borderBottom>
-										<u--input disabledColor="#fff" v-model="item.JOB_STEPName" 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="作业流程及安全措施：">
-
-									</u-form-item>
-									<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
-								<view class="upload-title">附件：</view>
-								<full-upload v-model="item.Nav_DetailFiles"></full-upload>
-								</view>
-
-
-							</uni-collapse-item>
-						</view>
-					</uni-collapse>
-					<view style="padding: 10px 16px;display: flex;flex-direction: row;">
-						<u-button type="primary" @click="handleNewCheckArea" color="#3d4b70">新增</u-button>
-						<!-- <u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">检查清单</u-button> -->
-					</view>
-				</u--form>
-
-			</view>
-
-			<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button">
-				<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
-				<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</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,
-		transformData
-	} from '../../../../utils/common'
-	import {
-		FMProductionUnit,
-		CheckPeriods,
-		CheckLevels,
-		MineTypeIndex,
-		MineTypeName
-	} from '../../../../utils/enums.js'
-	import {
-		getUserLists,
-		getDepartmentLists,
-		getProductionUnitLists,
-		getClassLists,
-	} from '../../../../services/safe';
-	import {
-		getUser,
-		getFOFireJob,
-		fullFOFireJob,
-		getRiskArea,
-		getWorkLists,
-		getFireType,
-		getSafeUser,
-		getSKEnterpriseLibrary,
-		getRelatedUserType,
-		getRenewalTrain,
-		getAnalyzeDetail
-	} 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,
-		GetEnumAnyOrder
-	} 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_ApplyUser: {
-						NAME: ''
-					},
-					Nav_ApplyDepartment: {
-						NAME: ''
-					},
-					Nav_ProductionUnit: {
-						NAME: ''
-					},
-					Nav_OperationStep: {
-						NAME: ''
-					},
-					Nav_FireDepartment: {
-						NAME: ''
-					},
-					Nav_FireUser: {
-						NAME: ''
-					},
-					Nav_SafeUser: {
-						NAME: ''
-					},
-					Nav_Area: {
-						NAME: ''
-					},
-					Nav_Type: {
-						NAME: ''
-					},
-					Nav_DispatchUser: {
-						NAME: ''
-					},
-					IS_HOLIDAY: false,
-					IS_HOLIDAYName: '否',
-					EVALUATE_LEVEL: '',
-					EVALUATE_LEVELName: '',
-					JOB_LOCATION: '',
-					JOB_CONTENT: '',
-					JOB_DATE: '',
-					JOB_END_DATE: '',
-					Nav_Users: [],
-					Nav_Risks: [],
-					Nav_Details: [],
-					Nav_Files: []
-				},
-				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();
-			this.fetchEnums(['FOYesOrNoEnum', 'FOJobStepEnum']);
-		},
-		methods: {
-			fetchEnums(enumNames) {
-				var dataParm = {
-					'name': enumNames.join('|')
-				}
-				GetEnumAnyOrder(dataParm).then(res => {
-					let newd = transformData(res, enumNames)
-					this.enumsData = newd[0];
-					// 生成文本列表（如需要）
-					this.enumsText = newd[1]
-					this.loadData();
-				})
-
-			},
-			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.Nav_Unit');
-					extendIgnoreDataRule(json)
-					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
-					getUser(json).then(res => {
-						this.stepLoad = false
-						this.model.Nav_ApplyUser.NAME = res.NAME
-						this.model.APPLY_USER_ID = res.ID
-						this.model.Nav_ApplyDepartment.NAME = res.Nav_Department.NAME
-						this.model.APPLY_DEPARTMENT_ID = res.DEPARTMENT_ID
-						this.model.Nav_ProductionUnit.NAME = res.Nav_Department.Nav_Unit.NAME
-						this.model.PRODUCTION_UNIT_ID = res.Nav_Department.PRODUCTION_UNIT_ID
-
-					})
-				} else {
-					const orgId = uni.getStorageSync('orgId')
-					const json = initFilter(orgId, "", "")
-					extendRule(json, 'ID', 1, this.ID);
-					extendInclude(json, 'Nav_OperationStep');
-					extendInclude(json, 'Nav_Area');
-					extendInclude(json, 'Nav_Type');
-					extendInclude(json, 'Nav_Risks');
-					extendInclude(json, 'Nav_Files.Nav_ImgFile');
-					extendInclude(json, 'Nav_DispatchUser');
-					extendInclude(json, 'Nav_FireFiles.Nav_ImgFile');
-					extendInclude(json, 'Nav_Details');
-					extendInclude(json, 'Nav_Details.Nav_DetailFiles.Nav_ImgFile');
-					extendIgnoreDataRule(json)
-					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
-					getFOFireJob(json).then(res => {
-						this.stepLoad = false
-						this.model = res;
-						this.model.ID = this.ID
-						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
-							this.model.Nav_Details.map(item => {
-								item.JOB_STEPName = item.JOB_STEP !== '' && item.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item1 => item1.code === item.JOB_STEP).name : ''
-							})
-						}
-
-					})
-				}
-			},
-			changeConfirm(e, item) {
-				item.IS_CONFIRM_NEW = e
-			},
-			stepAdd() {
-
-				const isBlank = (value) => {
-					return typeof value !== 'string' || value.trim() === '';
-				};
-				if (isBlank(this.model.COMPLETED_CONDITION) ||
-					isBlank(this.model.IS_FIREName) ||
-					isBlank(this.model.ACT_DATE) ||
-					isBlank(this.model.DISPATCH_USER_ID)
-				) {
-					uni.$showErrorInfo('请检查必填项，必填项不能为空')
-				} else {
-					this.stepsPageList = this.stepsPageList + 1
-				}
-
-			},
-			stepReduce() {
-				this.stepsPageList = this.stepsPageList - 1
-			},
-			stepAddTwo() {
-				this.stepsPageList = this.stepsPageList + 1
-			},
-			handleChange(name, item) {
-				this.comPickerInfo = {
-					showSheet: true,
-					columns: [this.enumsData[name]],
-					name: name,
-					itemData: item
-				}
-			},
-			onConfirmPicker(e) {
-				if (this.comPickerInfo.name == 'FOYesOrNoEnum') {
-					this.model.IS_FIREName = e.value[0].name
-					this.model.IS_FIRE = e.value[0].ID
-				} else if (this.comPickerInfo.name == 'FOJobStepEnum') {
-					this.comPickerInfo.itemData.JOB_STEPName = e.value[0].name
-					this.comPickerInfo.itemData.JOB_STEP = e.value[0].ID
-				}
-
-				this.comPickerInfo = {
-					showSheet: false,
-					columns: [],
-					title: '',
-					formIndex: undefined
-				}
-			},
-			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_DispatchUser') {
-					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
-						}
-					})
-				}
-
-			},
-			handleSelectedMonitor(val) {
-				this.showPopupMonitor = false
-				if (this.currentOperateMonitor == 'Nav_DispatchUser') {
-					this.model.Nav_DispatchUser = val
-					this.model.DISPATCH_USER_ID = val.ID
-
-				}
-				this.currentOperateMonitor = val
-			},
-			getDetail() {
-				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, this.model.OPERATION_STEP_ID)
-				getAnalyzeDetail(json).then(res => {
-
-					if (res) {
-						this.model.Nav_Details = res.Nav_Details
-						this.model.EVALUATE_LEVEL = res.EVALUATE_LEVEL
-						this.model.AUDIT_LEVEL = res.AUDIT_LEVEL
-						this.model.EVALUATE_LEVELName = this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name
-						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
-							this.model.Nav_Details.map(item1 => {
-								item1.JOB_STEPName = this.enumsData['FOJobStepEnum'].find(item => item.code === item1.JOB_STEP).name
-							})
-						}
-					}
-
-
-				})
-			},
-			getGetSafeUser() {
-				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, this.model.FIRE_DEPARTMENT_ID)
-				getSafeUser(json).then(res => {
-
-					if (res) {
-						this.model.Nav_SafeUser = res
-						this.model.SAFE_USER_ID = res.ID
-					} else {
-						this.model.Nav_SafeUser = {
-							NAME: ''
-						}
-						this.model.SAFE_USER_ID = ''
-					}
-
-
-				})
-			},
-			handleAddUser() {
-				this.model.Nav_Users.push({
-					ID: guid(),
-					FIRE_JOB_ID: this.model.ID,
-					ORG_ID: uni.getStorageSync('orgId'),
-					Nav_UserType: {
-						NAME: ''
-					},
-					Nav_User: {
-						NAME: ''
-					},
-					Nav_Train: {
-						CERTIFICATE_NAME: ''
-					},
-					CERTIFICATE_CODE: '',
-					USER_TYPE_ID: '',
-					USER_ID: '',
-					TRAIN_ID: '',
-					Nav_UserFiles: []
-
-				})
-			},
-			handleNewCheckArea() {
-				this.model.Nav_Details.push({
-					ID: guid(),
-					FIRE_JOB_ID: this.model.ID,
-					ORG_ID: uni.getStorageSync('orgId'),
-					NUM: 1,
-					JOB_STEP: '',
-					CONTENT: '',
-
-				})
-			},
-			handleDelRowBefore(item) {
-				this.nowIndex = item
-				this.showDelModalIndex = 1
-
-			},
-			confirmDel() {
-				this.nowIndex.IS_DELETED = true
-				this.showDelModalIndex = undefined
-			},
-			cacelDel() {
-				this.showDelModalIndex = undefined
-			},
-			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 = []
-				this.selectorInfo.isMultiple = false
-
-				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
-				if (p.name == 'Nav_Risks') {
-					if (p.val) {
-						extendRule(json, 'RISK_NAME', 9, p.val);
-					}
-					json.Sort = 'RISK_NAME'
-					this.selectorInfo.isMultiple = true
-
-
-					// extendRule(json, 'DEVICE_STATUS', 1, '1');
-					if (this.model.AREA_ID !== '' && this.model.AREA_ID !== undefined) {
-						extendRule(json, 'AREA_ID', 1, this.model.AREA_ID)
-					}
-
-					dataSelect = await getSKEnterpriseLibrary(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].RISK_NAME
-							}
-						} else {
-							uni.showToast({
-								title: '暂无信息',
-								icon: 'none'
-							})
-						}
-						return res.Data
-					})
-					if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0 && this.model.Nav_Risks[0]
-						.Nav_Risk != null) {
-						// this.selectorInfo.defaultChecked = []
-						this.model.Nav_Risks.forEach(e => {
-							defaultChecked.push(e.Nav_Risk)
-						})
-					} else {
-						defaultChecked = null
-					}
-				} else if (p.name == 'Nav_UserType') {
-					dataSelect = await getRelatedUserType(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
-					})
-				} else if (p.name == 'Nav_User') {
-					extendRule(json, 'ENABLE_STATUS', 1, '0')
-					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
-					})
-				} else if (p.name == 'Nav_Train') {
-					if (p.val) {
-						extendRule(json, 'CERTIFICATE_NAME', 9, p.val);
-					}
-					json.Sort = 'CERTIFICATE_NAME'
-					if (p.itemData.USER_ID !== '' && p.itemData.USER_ID !== undefined) {
-						extendRule(json, 'USER_ID', 1, p.itemData.USER_ID)
-					}
-
-					extendInclude(json, 'Nav_Files.Nav_ImgFile')
-					dataSelect = await getRenewalTrain(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].CERTIFICATE_NAME
-							}
-						}
-						return res.Data
-					})
-				}
-				if (defaultChecked == null)
-					defaultChecked = []
-				if (dataSelect.length) {
-					this.selectorInfo = {
-						itemData: p.itemData != undefined ? p.itemData : this.selectorInfo
-							.itemData, //itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
-						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,
-					itemData: this.selectorInfo.itemData
-				}
-				this.handleShowSheet(p)
-			},
-
-			handleSelected(e) {
-				this.selectorInfo.showPopup = false
-				if (this.selectorInfo.name == 'Nav_Risks') {
-					let listArea = []
-					if (e.length > 0) {
-						e.forEach((item, i) => {
-							if (item.name != null || item.NAME != null) {
-								listArea.push({
-									ID: guid(),
-									FIRE_JOB_ID: this.model.ID,
-									ENTERPRISE_LIBRARY_ID: item.ID,
-									ORG_ID: item.ORG_ID,
-									RISK_NAME: item.RISK_NAME,
-									Nav_Risk: item
-								})
-							}
-						})
-					}
-					this.model.Nav_Risks = listArea
-					// this.model.RiskAreaNAME = areaShow
-				} else if (this.selectorInfo.name == 'Nav_UserType') {
-					this.selectorInfo.itemData.Nav_UserType = e
-					this.selectorInfo.itemData.USER_TYPE_ID = e.ID
-				} else if (this.selectorInfo.name == 'Nav_User') {
-					this.selectorInfo.itemData.Nav_User = e
-					this.selectorInfo.itemData.USER_ID = e.ID
-				} else if (this.selectorInfo.name == 'Nav_Train') {
-					this.selectorInfo.itemData.Nav_Train = e
-					this.selectorInfo.itemData.TRAIN_ID = e.ID
-					this.selectorInfo.itemData.CERTIFICATE_CODE = e.CERTIFICATE_CODE
-					if (e.Nav_Files && e.Nav_Files.length > 0) {
-						e.Nav_Files.map(item => {
-							this.selectorInfo.itemData.Nav_UserFiles.push(item)
-						})
-					}
-					// this.selectorInfo.itemData.Nav_UserFiles =this.selectorInfo.itemData.Nav_UserFiles.push(e.Nav_Files) 
-				}
-
-
-			},
-			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) {
-				if (this.dateTimePickerInfo.dataIndex == 1) {
-					this.model.ACT_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_ApplyDepartment
-				delete this.modelEdit.Nav_ApplyUser
-				delete this.modelEdit.Nav_Area
-				delete this.modelEdit.Nav_FireDepartment
-				delete this.modelEdit.Nav_FireUser
-				delete this.modelEdit.Nav_OperationStep
-				delete this.modelEdit.Nav_ProductionUnit
-				delete this.modelEdit.Nav_SafeUser
-				delete this.modelEdit.Nav_Type
-				delete this.modelEdit.Nav_DispatchUser
-				if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0) {
-					this.model.Nav_Risks.map(item => {
-						delete item.Nav_Risk
-					})
-				}
-				if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
-					this.modelEdit.Nav_Users.map(item => {
-						item.PUBLISH = 'SaveAndNotify'
-						delete item.Nav_Train
-						delete item.Nav_User
-						delete item.Nav_UserType
-						if (item.Nav_UserFiles && item.Nav_UserFiles.length > 0) {
-							item.Nav_UserFiles.map(item1 => {
-								item1.FIRE_JOB_USER_ID = item.ID
-							})
-						}
-					})
-				}
-
-				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'
-				fullFOFireJob(this.modelEdit).then(res => {
-					if (res) {
-						uni.$showMsgFunc('操作成功!', () => {
-							uni.navigateBack()
-						}, 'success', 1000)
-					}
-				})
-
-
-			}
-
-		}
-
-
-
-	}
-</script>
-
-<style scoped>
-	@import url("../../../../style/css/newTemplate.css");
+<template>
+	<view class="todo-page">
+		<view class="background"></view>
+		<view class="allview">
+			<view class="card" v-if="stepsPageList === 0">
+				<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="Nav_User.NAME" borderBottom>
+						<u--input disabledColor="#fff" v-model="(model.Nav_OperationStep||{}).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="Product_Unit" borderBottom>
+						<u--input v-model="(model.Nav_Area||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						</u--input>
+					</u-form-item>
+					<u-form-item label="动火地点" prop="LOCATION" borderBottom>
+						<u--input disabled disabledColor="#ffffff" v-model="model.JOB_LOCATION" border="none" inputAlign="right" fontSize="14px"></u--input>
+					</u-form-item>
+					<u-form-item label="动火方式：" prop="Nav_Type" borderBottom>
+						<u--input v-model="(model.Nav_Type||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						</u--input>
+					</u-form-item>
+
+					<u-form-item label="动火计划开始时间" prop="CHECKDATETIME" borderBottom>
+						<u--input disabled disabledColor="#fff" v-model="model.JOB_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="LOCATION" borderBottom>
+						<u--input disabled disabledColor="#ffffff" v-model="model.JOB_CONTENT" 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_Risks">
+						<uni-tag class="tag" v-for="(i, k) in model.Nav_Risks.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.RISK_NAME" type="primary" />
+					</view>
+					<view class="upload-title">附件：</view>
+					<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
+					<u-form-item required label="动火作业现场条件验收情况" prop="LOCATION">
+
+					</u-form-item>
+					<u--textarea v-model="model.COMPLETED_CONDITION" placeholder="请输入动火作业现场条件验收情况" border="surround"></u--textarea>
+					<u-form-item required label="是否可以动火：" prop="Nav_User.NAME" @click="handleChange('FOYesOrNoEnum')" borderBottom>
+						<u--input disabledColor="#fff" v-model="model.IS_FIREName" 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="CHECKDATETIME" borderBottom @click="showCheckDate(1)">
+						<u--input disabled disabledColor="#fff" v-model="model.ACT_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_User.NAME" @click="handleChangeMonitor('Nav_DispatchUser')" borderBottom>
+						<u--input disabledColor="#fff" v-model="(model.Nav_DispatchUser||{}).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>
+					<view class="upload-title">现场条件验收附件：</view>
+					<full-upload v-model="model.Nav_FireFiles"></full-upload>
+				</u--form>
+			</view>
+			<view style="padding: 10px 16px;" v-if="stepsPageList === 0" class="bottom-button">
+				<u-button type="primary" @click="stepAdd" color="#3d4b70" :loading="stepLoad">下一步</u-button>
+			</view>
+			<view class="card" v-if="stepsPageList === 1">
+				<u--form labelWidth="auto" :model="model" ref="wForm" class="sub-form">
+
+
+					<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_Details.filter(i => !i.IS_DELETED)" :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.CONTENT?index+1+'.'+item.JOB_STEPName+'--'+item.CONTENT:index+1+'.'}}
+										</view>
+										<view @click.stop style="display: flex;flex-direction: row;align-items: center;">
+											<u-switch v-model="item.IS_CONFIRM_NEW" @change="changeConfirm($event,item)" size="18" style="margin-right: 10px;"></u-switch>
+											<u-icon @click="handleDelRowBefore(item)" name="trash" color="#ff4d4f" size="21" style="margin-right: 10px;"></u-icon>
+										</view>
+									</view>
+								</template>
+								<view class="content" style="padding: 0px 0px 0px 10px;">
+									<u-form-item label="顺序：" prop="Nav_User.NAME" @ borderBottom>
+										<u--input disabledColor="#fff" v-model="item.NUM" placeholder="请输入顺序" type="number" 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="handleChange('FOJobStepEnum',item)" borderBottom>
+										<u--input disabledColor="#fff" v-model="item.JOB_STEPName" 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="作业流程及安全措施：">
+
+									</u-form-item>
+									<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
+									<view class="upload-title">附件：</view>
+									<full-upload v-model="item.Nav_DetailFiles"></full-upload>
+								</view>
+
+
+							</uni-collapse-item>
+						</view>
+					</uni-collapse>
+					<view style="padding: 10px 16px;display: flex;flex-direction: row;">
+						<u-button type="primary" @click="handleNewCheckArea" color="#3d4b70">新增</u-button>
+						<!-- <u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">检查清单</u-button> -->
+					</view>
+				</u--form>
+
+			</view>
+
+			<view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 1" class="bottom-button">
+				<u-button @click="submit('Save')" :plain="true" color="#3d4b70">保存</u-button>
+				<view style="display: flex;flex-direction: row;margin-top: 10px;">
+					<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
+					<u-button type="primary" @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
+				</view>
+			</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,
+		transformData
+	} from '../../../../utils/common'
+	import {
+		FMProductionUnit,
+		CheckPeriods,
+		CheckLevels,
+		MineTypeIndex,
+		MineTypeName
+	} from '../../../../utils/enums.js'
+	import {
+		getUserLists,
+		getDepartmentLists,
+		getProductionUnitLists,
+		getClassLists,
+	} from '../../../../services/safe';
+	import {
+		getUser,
+		getFOFireJob,
+		fullFOFireJob,
+		getRiskArea,
+		getWorkLists,
+		getFireType,
+		getSafeUser,
+		getSKEnterpriseLibrary,
+		getRelatedUserType,
+		getRenewalTrain,
+		getAnalyzeDetail
+	} 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,
+		GetEnumAnyOrder
+	} 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_ApplyUser: {
+						NAME: ''
+					},
+					Nav_ApplyDepartment: {
+						NAME: ''
+					},
+					Nav_ProductionUnit: {
+						NAME: ''
+					},
+					Nav_OperationStep: {
+						NAME: ''
+					},
+					Nav_FireDepartment: {
+						NAME: ''
+					},
+					Nav_FireUser: {
+						NAME: ''
+					},
+					Nav_SafeUser: {
+						NAME: ''
+					},
+					Nav_Area: {
+						NAME: ''
+					},
+					Nav_Type: {
+						NAME: ''
+					},
+					Nav_DispatchUser: {
+						NAME: ''
+					},
+					IS_HOLIDAY: false,
+					IS_HOLIDAYName: '否',
+					EVALUATE_LEVEL: '',
+					EVALUATE_LEVELName: '',
+					JOB_LOCATION: '',
+					JOB_CONTENT: '',
+					JOB_DATE: '',
+					JOB_END_DATE: '',
+					Nav_Users: [],
+					Nav_Risks: [],
+					Nav_Details: [],
+					Nav_Files: []
+				},
+				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();
+			this.fetchEnums(['FOYesOrNoEnum', 'FOJobStepEnum']);
+		},
+		methods: {
+			fetchEnums(enumNames) {
+				var dataParm = {
+					'name': enumNames.join('|')
+				}
+				GetEnumAnyOrder(dataParm).then(res => {
+					let newd = transformData(res, enumNames)
+					this.enumsData = newd[0];
+					// 生成文本列表（如需要）
+					this.enumsText = newd[1]
+					this.loadData();
+				})
+
+			},
+			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.Nav_Unit');
+					extendIgnoreDataRule(json)
+					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
+					getUser(json).then(res => {
+						this.stepLoad = false
+						this.model.Nav_ApplyUser.NAME = res.NAME
+						this.model.APPLY_USER_ID = res.ID
+						this.model.Nav_ApplyDepartment.NAME = res.Nav_Department.NAME
+						this.model.APPLY_DEPARTMENT_ID = res.DEPARTMENT_ID
+						this.model.Nav_ProductionUnit.NAME = res.Nav_Department.Nav_Unit.NAME
+						this.model.PRODUCTION_UNIT_ID = res.Nav_Department.PRODUCTION_UNIT_ID
+
+					})
+				} else {
+					const orgId = uni.getStorageSync('orgId')
+					const json = initFilter(orgId, "", "")
+					extendRule(json, 'ID', 1, this.ID);
+					extendInclude(json, 'Nav_OperationStep');
+					extendInclude(json, 'Nav_Area');
+					extendInclude(json, 'Nav_Type');
+					extendInclude(json, 'Nav_Risks');
+					extendInclude(json, 'Nav_Files.Nav_ImgFile');
+					extendInclude(json, 'Nav_DispatchUser');
+					extendInclude(json, 'Nav_FireFiles.Nav_ImgFile');
+					extendInclude(json, 'Nav_Details');
+					extendInclude(json, 'Nav_Details.Nav_DetailFiles.Nav_ImgFile');
+					extendIgnoreDataRule(json)
+					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
+					getFOFireJob(json).then(res => {
+						this.stepLoad = false
+						this.model = res;
+						this.model.ID = this.ID
+						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
+							this.model.Nav_Details.map(item => {
+								item.JOB_STEPName = item.JOB_STEP !== '' && item.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item1 => item1.code === item.JOB_STEP).name : ''
+							})
+						}
+
+					})
+				}
+			},
+			changeConfirm(e, item) {
+				item.IS_CONFIRM_NEW = e
+			},
+			stepAdd() {
+
+				const isBlank = (value) => {
+					return typeof value !== 'string' || value.trim() === '';
+				};
+				if (isBlank(this.model.COMPLETED_CONDITION) ||
+					isBlank(this.model.IS_FIREName) ||
+					isBlank(this.model.ACT_DATE) ||
+					isBlank(this.model.DISPATCH_USER_ID)
+				) {
+					uni.$showErrorInfo('请检查必填项，必填项不能为空')
+				} else {
+					this.stepsPageList = this.stepsPageList + 1
+				}
+
+			},
+			stepReduce() {
+				this.stepsPageList = this.stepsPageList - 1
+			},
+			stepAddTwo() {
+				this.stepsPageList = this.stepsPageList + 1
+			},
+			handleChange(name, item) {
+				this.comPickerInfo = {
+					showSheet: true,
+					columns: [this.enumsData[name]],
+					name: name,
+					itemData: item
+				}
+			},
+			onConfirmPicker(e) {
+				if (this.comPickerInfo.name == 'FOYesOrNoEnum') {
+					this.model.IS_FIREName = e.value[0].name
+					this.model.IS_FIRE = e.value[0].ID
+				} else if (this.comPickerInfo.name == 'FOJobStepEnum') {
+					this.comPickerInfo.itemData.JOB_STEPName = e.value[0].name
+					this.comPickerInfo.itemData.JOB_STEP = e.value[0].ID
+				}
+
+				this.comPickerInfo = {
+					showSheet: false,
+					columns: [],
+					title: '',
+					formIndex: undefined
+				}
+			},
+			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_DispatchUser') {
+					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
+						}
+					})
+				}
+
+			},
+			handleSelectedMonitor(val) {
+				this.showPopupMonitor = false
+				if (this.currentOperateMonitor == 'Nav_DispatchUser') {
+					this.model.Nav_DispatchUser = val
+					this.model.DISPATCH_USER_ID = val.ID
+
+				}
+				this.currentOperateMonitor = val
+			},
+			getDetail() {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, this.model.OPERATION_STEP_ID)
+				getAnalyzeDetail(json).then(res => {
+
+					if (res) {
+						this.model.Nav_Details = res.Nav_Details
+						this.model.EVALUATE_LEVEL = res.EVALUATE_LEVEL
+						this.model.AUDIT_LEVEL = res.AUDIT_LEVEL
+						this.model.EVALUATE_LEVELName = this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name
+						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
+							this.model.Nav_Details.map(item1 => {
+								item1.JOB_STEPName = this.enumsData['FOJobStepEnum'].find(item => item.code === item1.JOB_STEP).name
+							})
+						}
+					}
+
+
+				})
+			},
+			getGetSafeUser() {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, this.model.FIRE_DEPARTMENT_ID)
+				getSafeUser(json).then(res => {
+
+					if (res) {
+						this.model.Nav_SafeUser = res
+						this.model.SAFE_USER_ID = res.ID
+					} else {
+						this.model.Nav_SafeUser = {
+							NAME: ''
+						}
+						this.model.SAFE_USER_ID = ''
+					}
+
+
+				})
+			},
+			handleAddUser() {
+				this.model.Nav_Users.push({
+					ID: guid(),
+					FIRE_JOB_ID: this.model.ID,
+					ORG_ID: uni.getStorageSync('orgId'),
+					Nav_UserType: {
+						NAME: ''
+					},
+					Nav_User: {
+						NAME: ''
+					},
+					Nav_Train: {
+						CERTIFICATE_NAME: ''
+					},
+					CERTIFICATE_CODE: '',
+					USER_TYPE_ID: '',
+					USER_ID: '',
+					TRAIN_ID: '',
+					Nav_UserFiles: []
+
+				})
+			},
+			handleNewCheckArea() {
+				this.model.Nav_Details.push({
+					ID: guid(),
+					FIRE_JOB_ID: this.model.ID,
+					ORG_ID: uni.getStorageSync('orgId'),
+					NUM: 1,
+					JOB_STEP: '',
+					CONTENT: '',
+
+				})
+			},
+			handleDelRowBefore(item) {
+				this.nowIndex = item
+				this.showDelModalIndex = 1
+
+			},
+			confirmDel() {
+				this.nowIndex.IS_DELETED = true
+				this.showDelModalIndex = undefined
+			},
+			cacelDel() {
+				this.showDelModalIndex = undefined
+			},
+			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 = []
+				this.selectorInfo.isMultiple = false
+
+				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
+				if (p.name == 'Nav_Risks') {
+					if (p.val) {
+						extendRule(json, 'RISK_NAME', 9, p.val);
+					}
+					json.Sort = 'RISK_NAME'
+					this.selectorInfo.isMultiple = true
+
+
+					// extendRule(json, 'DEVICE_STATUS', 1, '1');
+					if (this.model.AREA_ID !== '' && this.model.AREA_ID !== undefined) {
+						extendRule(json, 'AREA_ID', 1, this.model.AREA_ID)
+					}
+
+					dataSelect = await getSKEnterpriseLibrary(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].RISK_NAME
+							}
+						} else {
+							uni.showToast({
+								title: '暂无信息',
+								icon: 'none'
+							})
+						}
+						return res.Data
+					})
+					if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0 && this.model.Nav_Risks[0]
+						.Nav_Risk != null) {
+						// this.selectorInfo.defaultChecked = []
+						this.model.Nav_Risks.forEach(e => {
+							defaultChecked.push(e.Nav_Risk)
+						})
+					} else {
+						defaultChecked = null
+					}
+				} else if (p.name == 'Nav_UserType') {
+					dataSelect = await getRelatedUserType(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
+					})
+				} else if (p.name == 'Nav_User') {
+					extendRule(json, 'ENABLE_STATUS', 1, '0')
+					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
+					})
+				} else if (p.name == 'Nav_Train') {
+					if (p.val) {
+						extendRule(json, 'CERTIFICATE_NAME', 9, p.val);
+					}
+					json.Sort = 'CERTIFICATE_NAME'
+					if (p.itemData.USER_ID !== '' && p.itemData.USER_ID !== undefined) {
+						extendRule(json, 'USER_ID', 1, p.itemData.USER_ID)
+					}
+
+					extendInclude(json, 'Nav_Files.Nav_ImgFile')
+					dataSelect = await getRenewalTrain(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].CERTIFICATE_NAME
+							}
+						}
+						return res.Data
+					})
+				}
+				if (defaultChecked == null)
+					defaultChecked = []
+				if (dataSelect.length) {
+					this.selectorInfo = {
+						itemData: p.itemData != undefined ? p.itemData : this.selectorInfo
+							.itemData, //itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
+						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,
+					itemData: this.selectorInfo.itemData
+				}
+				this.handleShowSheet(p)
+			},
+
+			handleSelected(e) {
+				this.selectorInfo.showPopup = false
+				if (this.selectorInfo.name == 'Nav_Risks') {
+					let listArea = []
+					if (e.length > 0) {
+						e.forEach((item, i) => {
+							if (item.name != null || item.NAME != null) {
+								listArea.push({
+									ID: guid(),
+									FIRE_JOB_ID: this.model.ID,
+									ENTERPRISE_LIBRARY_ID: item.ID,
+									ORG_ID: item.ORG_ID,
+									RISK_NAME: item.RISK_NAME,
+									Nav_Risk: item
+								})
+							}
+						})
+					}
+					this.model.Nav_Risks = listArea
+					// this.model.RiskAreaNAME = areaShow
+				} else if (this.selectorInfo.name == 'Nav_UserType') {
+					this.selectorInfo.itemData.Nav_UserType = e
+					this.selectorInfo.itemData.USER_TYPE_ID = e.ID
+				} else if (this.selectorInfo.name == 'Nav_User') {
+					this.selectorInfo.itemData.Nav_User = e
+					this.selectorInfo.itemData.USER_ID = e.ID
+				} else if (this.selectorInfo.name == 'Nav_Train') {
+					this.selectorInfo.itemData.Nav_Train = e
+					this.selectorInfo.itemData.TRAIN_ID = e.ID
+					this.selectorInfo.itemData.CERTIFICATE_CODE = e.CERTIFICATE_CODE
+					if (e.Nav_Files && e.Nav_Files.length > 0) {
+						e.Nav_Files.map(item => {
+							this.selectorInfo.itemData.Nav_UserFiles.push(item)
+						})
+					}
+					// this.selectorInfo.itemData.Nav_UserFiles =this.selectorInfo.itemData.Nav_UserFiles.push(e.Nav_Files) 
+				}
+
+
+			},
+			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) {
+				if (this.dateTimePickerInfo.dataIndex == 1) {
+					this.model.ACT_DATE = uni.$u.timeFormat(e.value,
+						'yyyy-mm-dd hh:MM:ss')
+				}
+				this.dateTimePickerInfo.showCheckDate = false
+
+			},
+			submit(type) {
+				this.modelEdit = JSON.parse(JSON.stringify(this.model))
+				delete this.modelEdit.Nav_ApplyDepartment
+				delete this.modelEdit.Nav_ApplyUser
+				delete this.modelEdit.Nav_Area
+				delete this.modelEdit.Nav_FireDepartment
+				delete this.modelEdit.Nav_FireUser
+				delete this.modelEdit.Nav_OperationStep
+				delete this.modelEdit.Nav_ProductionUnit
+				delete this.modelEdit.Nav_SafeUser
+				delete this.modelEdit.Nav_Type
+				delete this.modelEdit.Nav_DispatchUser
+				if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0) {
+					this.model.Nav_Risks.map(item => {
+						delete item.Nav_Risk
+					})
+				}
+				if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
+					this.modelEdit.Nav_Users.map(item => {
+						if (type == 'SaveAndNotify') {
+							item.PUBLISH = 'SaveAndNotify'
+						} else {
+							item.PUBLISH = null
+						}
+						delete item.Nav_Train
+						delete item.Nav_User
+						delete item.Nav_UserType
+						if (item.Nav_UserFiles && item.Nav_UserFiles.length > 0) {
+							item.Nav_UserFiles.map(item1 => {
+								item1.FIRE_JOB_USER_ID = item.ID
+							})
+						}
+					})
+				}
+
+				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
+
+				if (type == 'SaveAndNotify') {
+					this.modelEdit.PUBLISH = "SaveAndNotify";
+				} else {
+					this.modelEdit.PUBLISH = null;
+				}
+				fullFOFireJob(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/jobFireTwoEdit.vue b/pages/apply/subPages/FO/jobFireTwoEdit.vue
index fe8010a..5b2d986 100644
--- a/pages/apply/subPages/FO/jobFireTwoEdit.vue
+++ b/pages/apply/subPages/FO/jobFireTwoEdit.vue
@@ -1,102 +1,102 @@
-<template>
-	<view class="todo-page">
-		<view class="background"></view>
-		<view class="allview">
-			<view class="card" v-if="stepsPageList === 0">
-				<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="Nav_User.NAME" borderBottom>
-						<u--input disabledColor="#fff" v-model="model.CODE" 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_OperationStep||{}).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-switch v-model="model.IS_HOLIDAY" disabled slot="right"></u-switch>
-					</u-form-item>
-					<u-form-item label="作业风险等级：" prop="Nav_User.NAME" borderBottom>
-						<u--input disabledColor="#fff" v-model="model.EVALUATE_LEVELName" 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_FireUser||{}).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_SafeUser||{}).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="Product_Unit" borderBottom>
-						<u--input v-model="(model.Nav_Area||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
-						</u--input>
-
-					</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_Type" borderBottom>
-						<u--input v-model="(model.Nav_Type||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
-						</u--input>
-
-					</u-form-item>
-					<u-form-item label="动火具体事项" prop="LOCATION" borderBottom>
-						<u--input disabledColor="#ffffff" disabled v-model="model.JOB_CONTENT" border="none" inputAlign="right" fontSize="14px"></u--input>
-					</u-form-item>
-					<u-form-item label="动火计划开始时间" prop="CHECKDATETIME" borderBottom>
-						<u--input disabled disabledColor="#fff" v-model="model.JOB_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="存在的风险">
-					</u-form-item>
-					<view class="tag-view" v-if="model.Nav_Risks">
-						<uni-tag class="tag" v-for="(i, k) in model.Nav_Risks.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.RISK_NAME" type="primary" />
-					</view>
-					<view class="upload-title">附件：</view>
-					<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
-					<u-form-item required label="动火作业完工验收情况" prop="LOCATION">
-
-					</u-form-item>
-					<u--textarea v-model="model.COMPLETED_CONTENT" placeholder="请输入动火作业完工验收情况" border="surround"></u--textarea>
-					<u-form-item label="是否可以撤离：" prop="Nav_User.NAME" @click="handleChange('FOYesOrNoEnum')" borderBottom>
-						<u--input disabledColor="#fff" v-model="model.IS_LEAVEName" 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="CHECKDATETIME" borderBottom @click="showCheckDate(1)">
-						<u--input disabled disabledColor="#fff" v-model="model.ACT_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="CHECKDATETIME" borderBottom @click="showCheckDate(2)">
-						<u--input disabled disabledColor="#fff" v-model="model.LEAVE_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>
-					<view class="upload-title">完工验收附件：</view>
-					<full-upload v-model="model.Nav_MonitorFiles"></full-upload>
-
-				</u--form>
+<template>
+	<view class="todo-page">
+		<view class="background"></view>
+		<view class="allview">
+			<view class="card" v-if="stepsPageList === 0">
+				<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="Nav_User.NAME" borderBottom>
+						<u--input disabledColor="#fff" v-model="model.CODE" 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_OperationStep||{}).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-switch v-model="model.IS_HOLIDAY" disabled slot="right"></u-switch>
+					</u-form-item>
+					<u-form-item label="作业风险等级：" prop="Nav_User.NAME" borderBottom>
+						<u--input disabledColor="#fff" v-model="model.EVALUATE_LEVELName" 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_FireUser||{}).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_SafeUser||{}).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="Product_Unit" borderBottom>
+						<u--input v-model="(model.Nav_Area||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						</u--input>
+
+					</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_Type" borderBottom>
+						<u--input v-model="(model.Nav_Type||{}).NAME" disabled disabledColor="#ffffff" border="none" inputAlign="right" fontSize="14px">
+						</u--input>
+
+					</u-form-item>
+					<u-form-item label="动火具体事项" prop="LOCATION" borderBottom>
+						<u--input disabledColor="#ffffff" disabled v-model="model.JOB_CONTENT" border="none" inputAlign="right" fontSize="14px"></u--input>
+					</u-form-item>
+					<u-form-item label="动火计划开始时间" prop="CHECKDATETIME" borderBottom>
+						<u--input disabled disabledColor="#fff" v-model="model.JOB_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="存在的风险">
+					</u-form-item>
+					<view class="tag-view" v-if="model.Nav_Risks">
+						<uni-tag class="tag" v-for="(i, k) in model.Nav_Risks.filter(i => !i.IS_DELETED)" :key="k" :inverted="true" :text="i.RISK_NAME" type="primary" />
+					</view>
+					<view class="upload-title">附件：</view>
+					<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
+					<u-form-item required label="动火作业完工验收情况" prop="LOCATION">
+
+					</u-form-item>
+					<u--textarea v-model="model.COMPLETED_CONTENT" placeholder="请输入动火作业完工验收情况" border="surround"></u--textarea>
+					<u-form-item label="是否可以撤离：" prop="Nav_User.NAME" @click="handleChange('FOYesOrNoEnum')" borderBottom>
+						<u--input disabledColor="#fff" v-model="model.IS_LEAVEName" 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="CHECKDATETIME" borderBottom @click="showCheckDate(1)">
+						<u--input disabled disabledColor="#fff" v-model="model.ACT_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="CHECKDATETIME" borderBottom @click="showCheckDate(2)">
+						<u--input disabled disabledColor="#fff" v-model="model.LEAVE_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>
+					<view class="upload-title">完工验收附件：</view>
+					<full-upload v-model="model.Nav_MonitorFiles"></full-upload>
+
+				</u--form>
 			</view>
 			<view style="padding: 10px 16px;" v-if="stepsPageList === 0" class="bottom-button">
 				<u-button type="primary" @click="stepAdd" color="#3d4b70" :loading="stepLoad">下一步</u-button>
 			</view>
 			<view class="card" v-if="stepsPageList === 1">
 				<u--form labelWidth="auto" :model="model" ref="wForm" class="sub-form">
-			
-			
+
+
 					<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_Details.filter(i => !i.IS_DELETED)" :key="index">
@@ -124,14 +124,14 @@
 										</u--input>
 									</u-form-item>
 									<u-form-item label="作业流程及安全措施：">
-			
+
 									</u-form-item>
 									<u--textarea v-model="item.CONTENT" placeholder="请输入作业流程及安全措施" border="surround"></u--textarea>
-								<view class="upload-title">附件：</view>
-								<full-upload v-model="item.Nav_DetailFiles"></full-upload>
+									<view class="upload-title">附件：</view>
+									<full-upload v-model="item.Nav_DetailFiles"></full-upload>
 								</view>
-			
-			
+
+
 							</uni-collapse-item>
 						</view>
 					</uni-collapse>
@@ -140,327 +140,330 @@
 						<!-- <u-button type="primary" @click="handleNewCheckList" color="#3d4b70" style="margin-left: 5px;">检查清单</u-button> -->
 					</view>
 				</u--form>
-			
+
 			</view>
-			
-			<view style="padding: 10px 16px;display: flex;flex-direction: row;" v-if="stepsPageList === 1" class="bottom-button">
-				<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
-				<u-button type="primary" @click="submit" color="#3d4b70" style="margin-left: 5px;">提交</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,
-		transformData
-	} from '../../../../utils/common'
-	import {
-		FMProductionUnit,
-		CheckPeriods,
-		CheckLevels,
-		MineTypeIndex,
-		MineTypeName
-	} from '../../../../utils/enums.js'
-	import {
-		getUserLists,
-		getDepartmentLists,
-		getProductionUnitLists,
-		getClassLists,
-	} from '../../../../services/safe';
-	import {
-		getUser,
-		getFOFireJob,
-		fullFOFireJob,
-		getRiskArea,
-		getWorkLists,
-		getFireType,
-		getSafeUser,
-		getSKEnterpriseLibrary,
-		getRelatedUserType,
-		getRenewalTrain,
-		getAnalyzeDetail
-	} 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,
-		GetEnumAnyOrder
-	} 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_ApplyUser: {
-						NAME: ''
-					},
-					Nav_ApplyDepartment: {
-						NAME: ''
-					},
-					Nav_ProductionUnit: {
-						NAME: ''
-					},
-					Nav_OperationStep: {
-						NAME: ''
-					},
-					Nav_FireDepartment: {
-						NAME: ''
-					},
-					Nav_FireUser: {
-						NAME: ''
-					},
-					Nav_SafeUser: {
-						NAME: ''
-					},
-					Nav_Area: {
-						NAME: ''
-					},
-					Nav_Type: {
-						NAME: ''
-					},
-					IS_HOLIDAY: false,
-					IS_HOLIDAYName: '否',
-					EVALUATE_LEVEL: '',
-					EVALUATE_LEVELName: '',
-					JOB_LOCATION: '',
-					JOB_CONTENT: '',
-					JOB_DATE: '',
-					JOB_END_DATE: '',
-					Nav_Users: [],
-					Nav_Risks: [],
-					Nav_Details: [],
-					Nav_Files: []
-				},
-				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();
-			this.fetchEnums(['SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
-		},
-		methods: {
-			fetchEnums(enumNames) {
-				var dataParm = {
-					'name': enumNames.join('|')
-				}
-				GetEnumAnyOrder(dataParm).then(res => {
-					let newd = transformData(res, enumNames)
-					this.enumsData = newd[0];
-					// 生成文本列表（如需要）
-					this.enumsText = newd[1]
-					this.loadData();
-				})
-			},
-			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.Nav_Unit');
-					extendIgnoreDataRule(json)
-					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
-					getUser(json).then(res => {
-						this.stepLoad = false
-						this.model.Nav_ApplyUser.NAME = res.NAME
-						this.model.APPLY_USER_ID = res.ID
-						this.model.Nav_ApplyDepartment.NAME = res.Nav_Department.NAME
-						this.model.APPLY_DEPARTMENT_ID = res.DEPARTMENT_ID
-						this.model.Nav_ProductionUnit.NAME = res.Nav_Department.Nav_Unit.NAME
-						this.model.PRODUCTION_UNIT_ID = res.Nav_Department.PRODUCTION_UNIT_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');
-					getFOFireJob(json).then(res => {
-						this.stepLoad = false
-						this.model = res;
-						this.model.ID = this.ID
-						this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== '' && res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : ''
-						this.model.ACT_END_DATE = uni.$u.timeFormat(this.model.ACT_END_DATE,
-							'yyyy-mm-dd hh:MM:ss')
-						this.model.LEAVE_DATE = uni.$u.timeFormat(this.model.LEAVE_DATE,
-							'yyyy-mm-dd hh:MM:ss')
-						this.model.IS_LEAVEName = res.IS_LEAVE !== '' && res.IS_LEAVE !== undefined ? this.enumsData['FOYesOrNoEnum'].find(item => item.code === res.IS_LEAVE).name : ''
-						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
-							this.model.Nav_Details.map(item => {
-								item.JOB_STEPName = item.JOB_STEP !== '' && item.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item1 => item1.code === item.JOB_STEP).name : ''
-							})
-						}
-					})
-				}
-			},
-			stepAdd() {
-				const isBlank = (value) => {
-					return typeof value !== 'string' || value.trim() === '';
-				};
-				if (isBlank(this.model.Nav_OperationStep.NAME) ||
-					isBlank(this.model.Nav_FireDepartment.NAME) ||
-					isBlank(this.model.Nav_FireUser.NAME) ||
-					isBlank(this.model.Nav_SafeUser.NAME) ||
-					isBlank(this.model.JOB_DATE) ||
-					isBlank(this.model.JOB_END_DATE)) {
-					uni.$showErrorInfo('请检查必填项，必填项不能为空')
-				} else {
-					this.stepsPageList = this.stepsPageList + 1
-				}
-
-			},
-			stepReduce() {
-				this.stepsPageList = this.stepsPageList - 1
-			},
-			stepAddTwo() {
-				this.stepsPageList = this.stepsPageList + 1
-			},
-			handleChange(name, item) {
-				this.comPickerInfo = {
-					showSheet: true,
-					columns: [this.enumsData[name]],
-					name: name,
-					itemData: item
-				}
-			},
+
+			<view style="padding: 10px 16px;display: flex;flex-direction: column;" v-if="stepsPageList === 1" class="bottom-button">
+				<u-button @click="submit('Save')" :plain="true" color="#3d4b70">保存</u-button>
+				<view style="display: flex;flex-direction: row;margin-top: 10px;">
+					<u-button type="primary" @click="stepReduce" color="#3d4b70" :plain="true" style="margin-right: 5px;">上一步</u-button>
+					<u-button type="primary" @click="submit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px;">提交</u-button>
+				</view>
+			</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,
+		transformData
+	} from '../../../../utils/common'
+	import {
+		FMProductionUnit,
+		CheckPeriods,
+		CheckLevels,
+		MineTypeIndex,
+		MineTypeName
+	} from '../../../../utils/enums.js'
+	import {
+		getUserLists,
+		getDepartmentLists,
+		getProductionUnitLists,
+		getClassLists,
+	} from '../../../../services/safe';
+	import {
+		getUser,
+		getFOFireJob,
+		fullFOFireJob,
+		getRiskArea,
+		getWorkLists,
+		getFireType,
+		getSafeUser,
+		getSKEnterpriseLibrary,
+		getRelatedUserType,
+		getRenewalTrain,
+		getAnalyzeDetail
+	} 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,
+		GetEnumAnyOrder
+	} 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_ApplyUser: {
+						NAME: ''
+					},
+					Nav_ApplyDepartment: {
+						NAME: ''
+					},
+					Nav_ProductionUnit: {
+						NAME: ''
+					},
+					Nav_OperationStep: {
+						NAME: ''
+					},
+					Nav_FireDepartment: {
+						NAME: ''
+					},
+					Nav_FireUser: {
+						NAME: ''
+					},
+					Nav_SafeUser: {
+						NAME: ''
+					},
+					Nav_Area: {
+						NAME: ''
+					},
+					Nav_Type: {
+						NAME: ''
+					},
+					IS_HOLIDAY: false,
+					IS_HOLIDAYName: '否',
+					EVALUATE_LEVEL: '',
+					EVALUATE_LEVELName: '',
+					JOB_LOCATION: '',
+					JOB_CONTENT: '',
+					JOB_DATE: '',
+					JOB_END_DATE: '',
+					Nav_Users: [],
+					Nav_Risks: [],
+					Nav_Details: [],
+					Nav_Files: []
+				},
+				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();
+			this.fetchEnums(['SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
+		},
+		methods: {
+			fetchEnums(enumNames) {
+				var dataParm = {
+					'name': enumNames.join('|')
+				}
+				GetEnumAnyOrder(dataParm).then(res => {
+					let newd = transformData(res, enumNames)
+					this.enumsData = newd[0];
+					// 生成文本列表（如需要）
+					this.enumsText = newd[1]
+					this.loadData();
+				})
+			},
+			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.Nav_Unit');
+					extendIgnoreDataRule(json)
+					// extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Question');
+					getUser(json).then(res => {
+						this.stepLoad = false
+						this.model.Nav_ApplyUser.NAME = res.NAME
+						this.model.APPLY_USER_ID = res.ID
+						this.model.Nav_ApplyDepartment.NAME = res.Nav_Department.NAME
+						this.model.APPLY_DEPARTMENT_ID = res.DEPARTMENT_ID
+						this.model.Nav_ProductionUnit.NAME = res.Nav_Department.Nav_Unit.NAME
+						this.model.PRODUCTION_UNIT_ID = res.Nav_Department.PRODUCTION_UNIT_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');
+					getFOFireJob(json).then(res => {
+						this.stepLoad = false
+						this.model = res;
+						this.model.ID = this.ID
+						this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== '' && res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : ''
+						this.model.ACT_END_DATE = uni.$u.timeFormat(this.model.ACT_END_DATE,
+							'yyyy-mm-dd hh:MM:ss')
+						this.model.LEAVE_DATE = uni.$u.timeFormat(this.model.LEAVE_DATE,
+							'yyyy-mm-dd hh:MM:ss')
+						this.model.IS_LEAVEName = res.IS_LEAVE !== '' && res.IS_LEAVE !== undefined ? this.enumsData['FOYesOrNoEnum'].find(item => item.code === res.IS_LEAVE).name : ''
+						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
+							this.model.Nav_Details.map(item => {
+								item.JOB_STEPName = item.JOB_STEP !== '' && item.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item1 => item1.code === item.JOB_STEP).name : ''
+							})
+						}
+					})
+				}
+			},
+			stepAdd() {
+				const isBlank = (value) => {
+					return typeof value !== 'string' || value.trim() === '';
+				};
+				if (isBlank(this.model.Nav_OperationStep.NAME) ||
+					isBlank(this.model.Nav_FireDepartment.NAME) ||
+					isBlank(this.model.Nav_FireUser.NAME) ||
+					isBlank(this.model.Nav_SafeUser.NAME) ||
+					isBlank(this.model.JOB_DATE) ||
+					isBlank(this.model.JOB_END_DATE)) {
+					uni.$showErrorInfo('请检查必填项，必填项不能为空')
+				} else {
+					this.stepsPageList = this.stepsPageList + 1
+				}
+
+			},
+			stepReduce() {
+				this.stepsPageList = this.stepsPageList - 1
+			},
+			stepAddTwo() {
+				this.stepsPageList = this.stepsPageList + 1
+			},
+			handleChange(name, item) {
+				this.comPickerInfo = {
+					showSheet: true,
+					columns: [this.enumsData[name]],
+					name: name,
+					itemData: item
+				}
+			},
 			onConfirmPicker(e) {
 				if (this.comPickerInfo.name == 'FOYesOrNoEnum') {
 					this.model.IS_LEAVEName = e.value[0].name
@@ -468,485 +471,493 @@
 				} else if (this.comPickerInfo.name == 'FOJobStepEnum') {
 					this.comPickerInfo.itemData.JOB_STEPName = e.value[0].name
 					this.comPickerInfo.itemData.JOB_STEP = e.value[0].ID
-				}
-
-				this.comPickerInfo = {
-					showSheet: false,
-					columns: [],
-					title: '',
-					formIndex: undefined
-				}
-			},
-			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_OperationStep') {
-					extendRule(json, 'TASK_LEVEL', 2, '1')
-					extendInclude(json, 'Nav_OperationStep');
-					getWorkLists(json).then(res => {
-						if (res.IsSuccessful) {
-							this.monitorLists = res.Data.map(i => {
-								return {
-									...i,
-									name: i.Nav_OperationStep.NAME,
-									// code: i.CODE
-								}
-							})
-							this.curTotalMonitor = res.TotalCount
-						}
-					})
-				} else if (this.currentOperateMonitor == 'Nav_FireUser' || this.currentOperateMonitor == 'Nav_SafeUser') {
-					extendRule(json, 'ENABLE_STATUS', 1, '0')
-					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_FireDepartment') {
-					extendRule(json, 'ENABLE_STATUS', 1, '0')
-					extendInclude(json, 'Nav_User');
-					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
-						}
-					})
-				} else if (this.currentOperateMonitor == 'Nav_Type') {
-					getFireType(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_Area') {
-					getRiskArea(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_OperationStep') {
-					this.model.Nav_OperationStep = val.Nav_OperationStep
-					this.model.OPERATION_STEP_ID = val.Nav_OperationStep.ID
-
-					this.getDetail()
-					// this.enumsData.filter
-				} else if (this.currentOperateMonitor == 'Nav_FireDepartment') {
-					this.model.Nav_FireDepartment = val
-					this.model.FIRE_DEPARTMENT_ID = val.ID
-					this.model.Nav_FireUser = val.Nav_User
-					this.model.FIRE_USER_ID = val.Nav_User.ID
-					this.getGetSafeUser()
-
-				} else if (this.currentOperateMonitor == 'Nav_FireUser') {
-					this.model.Nav_FireUser = val
-					this.model.FIRE_USER_ID = val.ID
-
-				} else if (this.currentOperateMonitor == 'Nav_SafeUser') {
-					this.model.Nav_SafeUser = val
-					this.model.SAFE_USER_ID = val.ID
-				} else if (this.currentOperateMonitor == 'Nav_Area') {
-					this.model.Nav_Area = val
-					this.model.AREA_ID = val.ID
-				} else if (this.currentOperateMonitor == 'Nav_Type') {
-					this.model.Nav_Type = val
-					this.model.TYPE_ID = val.ID
-				}
-				this.currentOperateMonitor = val
-			},
-			getDetail() {
-				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, this.model.OPERATION_STEP_ID)
-				getAnalyzeDetail(json).then(res => {
-
-					if (res) {
-						this.model.Nav_Details = res.Nav_Details
-						this.model.EVALUATE_LEVEL = res.EVALUATE_LEVEL
-						this.model.AUDIT_LEVEL = res.AUDIT_LEVEL
-						this.model.EVALUATE_LEVELName = this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name
-						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
+				}
+
+				this.comPickerInfo = {
+					showSheet: false,
+					columns: [],
+					title: '',
+					formIndex: undefined
+				}
+			},
+			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_OperationStep') {
+					extendRule(json, 'TASK_LEVEL', 2, '1')
+					extendInclude(json, 'Nav_OperationStep');
+					getWorkLists(json).then(res => {
+						if (res.IsSuccessful) {
+							this.monitorLists = res.Data.map(i => {
+								return {
+									...i,
+									name: i.Nav_OperationStep.NAME,
+									// code: i.CODE
+								}
+							})
+							this.curTotalMonitor = res.TotalCount
+						}
+					})
+				} else if (this.currentOperateMonitor == 'Nav_FireUser' || this.currentOperateMonitor == 'Nav_SafeUser') {
+					extendRule(json, 'ENABLE_STATUS', 1, '0')
+					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_FireDepartment') {
+					extendRule(json, 'ENABLE_STATUS', 1, '0')
+					extendInclude(json, 'Nav_User');
+					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
+						}
+					})
+				} else if (this.currentOperateMonitor == 'Nav_Type') {
+					getFireType(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_Area') {
+					getRiskArea(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_OperationStep') {
+					this.model.Nav_OperationStep = val.Nav_OperationStep
+					this.model.OPERATION_STEP_ID = val.Nav_OperationStep.ID
+
+					this.getDetail()
+					// this.enumsData.filter
+				} else if (this.currentOperateMonitor == 'Nav_FireDepartment') {
+					this.model.Nav_FireDepartment = val
+					this.model.FIRE_DEPARTMENT_ID = val.ID
+					this.model.Nav_FireUser = val.Nav_User
+					this.model.FIRE_USER_ID = val.Nav_User.ID
+					this.getGetSafeUser()
+
+				} else if (this.currentOperateMonitor == 'Nav_FireUser') {
+					this.model.Nav_FireUser = val
+					this.model.FIRE_USER_ID = val.ID
+
+				} else if (this.currentOperateMonitor == 'Nav_SafeUser') {
+					this.model.Nav_SafeUser = val
+					this.model.SAFE_USER_ID = val.ID
+				} else if (this.currentOperateMonitor == 'Nav_Area') {
+					this.model.Nav_Area = val
+					this.model.AREA_ID = val.ID
+				} else if (this.currentOperateMonitor == 'Nav_Type') {
+					this.model.Nav_Type = val
+					this.model.TYPE_ID = val.ID
+				}
+				this.currentOperateMonitor = val
+			},
+			getDetail() {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, this.model.OPERATION_STEP_ID)
+				getAnalyzeDetail(json).then(res => {
+
+					if (res) {
+						this.model.Nav_Details = res.Nav_Details
+						this.model.EVALUATE_LEVEL = res.EVALUATE_LEVEL
+						this.model.AUDIT_LEVEL = res.AUDIT_LEVEL
+						this.model.EVALUATE_LEVELName = this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name
+						if (this.model.Nav_Details && this.model.Nav_Details.length > 0) {
 							this.model.Nav_Details.map(item1 => {
-								item1.JOB_STEPName = this.enumsData['FOJobStepEnum'].find(item => item.code === item1.JOB_STEP).name
-								// item1.JOB_STEPName = item1.JOB_STEP !== '' && item1.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item2 => item2.code === item1.JOB_STEP).name : ''
-							})
-						}
-					}
-
-
-				})
-			},
-			getGetSafeUser() {
-				const orgId = uni.getStorageSync('orgId')
-				const json = initFilter(orgId, this.model.FIRE_DEPARTMENT_ID)
-				getSafeUser(json).then(res => {
-
-					if (res) {
-						this.model.Nav_SafeUser = res
-						this.model.SAFE_USER_ID = res.ID
-					} else {
-						this.model.Nav_SafeUser = {
-							NAME: ''
-						}
-						this.model.SAFE_USER_ID = ''
-					}
-
-
-				})
-			},
-			handleAddUser() {
-				this.model.Nav_Users.push({
-					ID: guid(),
-					FIRE_JOB_ID: this.model.ID,
-					ORG_ID: uni.getStorageSync('orgId'),
-					Nav_UserType: {
-						NAME: ''
-					},
-					Nav_User: {
-						NAME: ''
-					},
-					Nav_Train: {
-						CERTIFICATE_NAME: ''
-					},
-					CERTIFICATE_CODE: '',
-					USER_TYPE_ID: '',
-					USER_ID: '',
-					TRAIN_ID: '',
-					Nav_UserFiles: []
-
-				})
-			},
-			handleNewCheckArea() {
-				this.model.Nav_Details.push({
-					ID: guid(),
-					FIRE_JOB_ID: this.model.ID,
-					ORG_ID: uni.getStorageSync('orgId'),
-					NUM: 1,
-					JOB_STEP: '',
-					CONTENT: '',
-
-				})
-			},
-			handleDelRowBefore(item) {
-				this.nowIndex = item
-				this.showDelModalIndex = 1
-
-			},
-			confirmDel() {
-				this.nowIndex.IS_DELETED = true
-				this.showDelModalIndex = undefined
-			},
-			cacelDel() {
-				this.showDelModalIndex = undefined
-			},
-			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 = []
-				this.selectorInfo.isMultiple = false
-
-				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
-				if (p.name == 'Nav_Risks') {
-					if (p.val) {
-						extendRule(json, 'RISK_NAME', 9, p.val);
-					}
-					json.Sort = 'RISK_NAME'
-					this.selectorInfo.isMultiple = true
-
-
-					// extendRule(json, 'DEVICE_STATUS', 1, '1');
-					if (this.model.AREA_ID !== '' && this.model.AREA_ID !== undefined) {
-						extendRule(json, 'AREA_ID', 1, this.model.AREA_ID)
-					}
-
-					dataSelect = await getSKEnterpriseLibrary(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].RISK_NAME
-							}
-						} else {
-							uni.showToast({
-								title: '暂无信息',
-								icon: 'none'
-							})
-						}
-						return res.Data
-					})
-					if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0 && this.model.Nav_Risks[0]
-						.Nav_Risk != null) {
-						// this.selectorInfo.defaultChecked = []
-						this.model.Nav_Risks.forEach(e => {
-							defaultChecked.push({
-								ID: e.ENTERPRISE_LIBRARY_ID,
-								NAME: e.RISK_NAME
-							})
-						})
-					} else {
-						defaultChecked = null
-					}
-				} else if (p.name == 'Nav_UserType') {
-					dataSelect = await getRelatedUserType(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
-					})
-				} else if (p.name == 'Nav_User') {
-					extendRule(json, 'ENABLE_STATUS', 1, '0')
-					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
-					})
-				} else if (p.name == 'Nav_Train') {
-					if (p.val) {
-						extendRule(json, 'CERTIFICATE_NAME', 9, p.val);
-					}
-					json.Sort = 'CERTIFICATE_NAME'
-					if (p.itemData.USER_ID !== '' && p.itemData.USER_ID !== undefined) {
-						extendRule(json, 'USER_ID', 1, p.itemData.USER_ID)
-					}
-
-					extendInclude(json, 'Nav_Files.Nav_ImgFile')
-					dataSelect = await getRenewalTrain(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].CERTIFICATE_NAME
-							}
-						}
-						return res.Data
-					})
-				}
-				if (defaultChecked == null)
-					defaultChecked = []
-				if (dataSelect.length) {
-					this.selectorInfo = {
-						itemData: p.itemData != undefined ? p.itemData : this.selectorInfo
-							.itemData, //itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
-						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,
-					itemData: this.selectorInfo.itemData
-				}
-				this.handleShowSheet(p)
-			},
-
-			handleSelected(e) {
-				this.selectorInfo.showPopup = false
-				if (this.selectorInfo.name == 'Nav_Risks') {
-					let listArea = []
-					if (e.length > 0) {
-						e.forEach((item, i) => {
-							if (item.name != null || item.NAME != null) {
-								listArea.push({
-									ID: guid(),
-									FIRE_JOB_ID: this.model.ID,
-									ENTERPRISE_LIBRARY_ID: item.ID,
-									ORG_ID: item.ORG_ID,
-									RISK_NAME: item.RISK_NAME,
-									Nav_Risk: item
-								})
-							}
-						})
-					}
-					this.model.Nav_Risks = listArea
-					// this.model.RiskAreaNAME = areaShow
-				} else if (this.selectorInfo.name == 'Nav_UserType') {
-					this.selectorInfo.itemData.Nav_UserType = e
-					this.selectorInfo.itemData.USER_TYPE_ID = e.ID
-				} else if (this.selectorInfo.name == 'Nav_User') {
-					this.selectorInfo.itemData.Nav_User = e
-					this.selectorInfo.itemData.USER_ID = e.ID
-				} else if (this.selectorInfo.name == 'Nav_Train') {
-					this.selectorInfo.itemData.Nav_Train = e
-					this.selectorInfo.itemData.TRAIN_ID = e.ID
-					this.selectorInfo.itemData.CERTIFICATE_CODE = e.CERTIFICATE_CODE
-					if (e.Nav_Files && e.Nav_Files.length > 0) {
-						e.Nav_Files.map(item => {
-							this.selectorInfo.itemData.Nav_UserFiles.push(item)
-						})
-					}
-					// this.selectorInfo.itemData.Nav_UserFiles =this.selectorInfo.itemData.Nav_UserFiles.push(e.Nav_Files) 
-				}
-
-
-			},
-			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) {
-				if (this.dateTimePickerInfo.dataIndex == 1) {
-					this.model.ACT_END_DATE = uni.$u.timeFormat(e.value,
-						'yyyy-mm-dd hh:MM:ss')
-				} else if (this.dateTimePickerInfo.dataIndex == 2) {
-					this.model.LEAVE_DATE = uni.$u.timeFormat(e.value,
-						'yyyy-mm-dd hh:MM:ss')
-				}
-				this.dateTimePickerInfo.showCheckDate = false
-
-			},
-			submit() {
-				const isBlank = (value) => {
-					return typeof value !== 'string' || value.trim() === '';
-				};
-				if (isBlank(this.model.COMPLETED_CONTENT) ||
-					isBlank(this.model.ACT_END_DATE) ||
-					isBlank(this.model.LEAVE_DATE)) {
-					uni.$showErrorInfo('请检查必填项，必填项不能为空')
-				} else {
-					this.modelEdit = JSON.parse(JSON.stringify(this.model))
-					delete this.modelEdit.Nav_ApplyDepartment
-					delete this.modelEdit.Nav_ApplyUser
-					delete this.modelEdit.Nav_Area
-					delete this.modelEdit.Nav_FireDepartment
-					delete this.modelEdit.Nav_FireUser
-					delete this.modelEdit.Nav_OperationStep
-					delete this.modelEdit.Nav_ProductionUnit
-					delete this.modelEdit.Nav_SafeUser
-					delete this.modelEdit.Nav_Type
-					if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0) {
-						this.model.Nav_Risks.map(item => {
-							delete item.Nav_Risk
-						})
-					}
-					if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
-						this.modelEdit.Nav_Users.map(item => {
-							item.PUBLISH = 'SaveAndNotify'
-							delete item.Nav_Train
-							delete item.Nav_User
-							delete item.Nav_UserType
-							if (item.Nav_UserFiles && item.Nav_UserFiles.length > 0) {
-								item.Nav_UserFiles.map(item1 => {
-									item1.FIRE_JOB_USER_ID = item.ID
-								})
-							}
-						})
-					}
-
-					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'
-					fullFOFireJob(this.modelEdit).then(res => {
-						if (res) {
-							uni.$showMsgFunc('操作成功!', () => {
-								uni.navigateBack()
-							}, 'success', 1000)
-						}
-					})
-				}
-
-
-
-			}
-
-		}
-
-
-
-	}
-</script>
-
-<style scoped>
-	@import url("../../../../style/css/newTemplate.css");
+								item1.JOB_STEPName = this.enumsData['FOJobStepEnum'].find(item => item.code === item1.JOB_STEP).name
+								// item1.JOB_STEPName = item1.JOB_STEP !== '' && item1.JOB_STEP !== undefined ? this.enumsData['FOJobStepEnum'].find(item2 => item2.code === item1.JOB_STEP).name : ''
+							})
+						}
+					}
+
+
+				})
+			},
+			getGetSafeUser() {
+				const orgId = uni.getStorageSync('orgId')
+				const json = initFilter(orgId, this.model.FIRE_DEPARTMENT_ID)
+				getSafeUser(json).then(res => {
+
+					if (res) {
+						this.model.Nav_SafeUser = res
+						this.model.SAFE_USER_ID = res.ID
+					} else {
+						this.model.Nav_SafeUser = {
+							NAME: ''
+						}
+						this.model.SAFE_USER_ID = ''
+					}
+
+
+				})
+			},
+			handleAddUser() {
+				this.model.Nav_Users.push({
+					ID: guid(),
+					FIRE_JOB_ID: this.model.ID,
+					ORG_ID: uni.getStorageSync('orgId'),
+					Nav_UserType: {
+						NAME: ''
+					},
+					Nav_User: {
+						NAME: ''
+					},
+					Nav_Train: {
+						CERTIFICATE_NAME: ''
+					},
+					CERTIFICATE_CODE: '',
+					USER_TYPE_ID: '',
+					USER_ID: '',
+					TRAIN_ID: '',
+					Nav_UserFiles: []
+
+				})
+			},
+			handleNewCheckArea() {
+				this.model.Nav_Details.push({
+					ID: guid(),
+					FIRE_JOB_ID: this.model.ID,
+					ORG_ID: uni.getStorageSync('orgId'),
+					NUM: 1,
+					JOB_STEP: '',
+					CONTENT: '',
+
+				})
+			},
+			handleDelRowBefore(item) {
+				this.nowIndex = item
+				this.showDelModalIndex = 1
+
+			},
+			confirmDel() {
+				this.nowIndex.IS_DELETED = true
+				this.showDelModalIndex = undefined
+			},
+			cacelDel() {
+				this.showDelModalIndex = undefined
+			},
+			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 = []
+				this.selectorInfo.isMultiple = false
+
+				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
+				if (p.name == 'Nav_Risks') {
+					if (p.val) {
+						extendRule(json, 'RISK_NAME', 9, p.val);
+					}
+					json.Sort = 'RISK_NAME'
+					this.selectorInfo.isMultiple = true
+
+
+					// extendRule(json, 'DEVICE_STATUS', 1, '1');
+					if (this.model.AREA_ID !== '' && this.model.AREA_ID !== undefined) {
+						extendRule(json, 'AREA_ID', 1, this.model.AREA_ID)
+					}
+
+					dataSelect = await getSKEnterpriseLibrary(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].RISK_NAME
+							}
+						} else {
+							uni.showToast({
+								title: '暂无信息',
+								icon: 'none'
+							})
+						}
+						return res.Data
+					})
+					if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0 && this.model.Nav_Risks[0]
+						.Nav_Risk != null) {
+						// this.selectorInfo.defaultChecked = []
+						this.model.Nav_Risks.forEach(e => {
+							defaultChecked.push({
+								ID: e.ENTERPRISE_LIBRARY_ID,
+								NAME: e.RISK_NAME
+							})
+						})
+					} else {
+						defaultChecked = null
+					}
+				} else if (p.name == 'Nav_UserType') {
+					dataSelect = await getRelatedUserType(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
+					})
+				} else if (p.name == 'Nav_User') {
+					extendRule(json, 'ENABLE_STATUS', 1, '0')
+					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
+					})
+				} else if (p.name == 'Nav_Train') {
+					if (p.val) {
+						extendRule(json, 'CERTIFICATE_NAME', 9, p.val);
+					}
+					json.Sort = 'CERTIFICATE_NAME'
+					if (p.itemData.USER_ID !== '' && p.itemData.USER_ID !== undefined) {
+						extendRule(json, 'USER_ID', 1, p.itemData.USER_ID)
+					}
+
+					extendInclude(json, 'Nav_Files.Nav_ImgFile')
+					dataSelect = await getRenewalTrain(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].CERTIFICATE_NAME
+							}
+						}
+						return res.Data
+					})
+				}
+				if (defaultChecked == null)
+					defaultChecked = []
+				if (dataSelect.length) {
+					this.selectorInfo = {
+						itemData: p.itemData != undefined ? p.itemData : this.selectorInfo
+							.itemData, //itemData: p.itemData,  搜索的时候  p.itemData为空  赋值修改 为 她自己本身 this.selectorInfo.itemData
+						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,
+					itemData: this.selectorInfo.itemData
+				}
+				this.handleShowSheet(p)
+			},
+
+			handleSelected(e) {
+				this.selectorInfo.showPopup = false
+				if (this.selectorInfo.name == 'Nav_Risks') {
+					let listArea = []
+					if (e.length > 0) {
+						e.forEach((item, i) => {
+							if (item.name != null || item.NAME != null) {
+								listArea.push({
+									ID: guid(),
+									FIRE_JOB_ID: this.model.ID,
+									ENTERPRISE_LIBRARY_ID: item.ID,
+									ORG_ID: item.ORG_ID,
+									RISK_NAME: item.RISK_NAME,
+									Nav_Risk: item
+								})
+							}
+						})
+					}
+					this.model.Nav_Risks = listArea
+					// this.model.RiskAreaNAME = areaShow
+				} else if (this.selectorInfo.name == 'Nav_UserType') {
+					this.selectorInfo.itemData.Nav_UserType = e
+					this.selectorInfo.itemData.USER_TYPE_ID = e.ID
+				} else if (this.selectorInfo.name == 'Nav_User') {
+					this.selectorInfo.itemData.Nav_User = e
+					this.selectorInfo.itemData.USER_ID = e.ID
+				} else if (this.selectorInfo.name == 'Nav_Train') {
+					this.selectorInfo.itemData.Nav_Train = e
+					this.selectorInfo.itemData.TRAIN_ID = e.ID
+					this.selectorInfo.itemData.CERTIFICATE_CODE = e.CERTIFICATE_CODE
+					if (e.Nav_Files && e.Nav_Files.length > 0) {
+						e.Nav_Files.map(item => {
+							this.selectorInfo.itemData.Nav_UserFiles.push(item)
+						})
+					}
+					// this.selectorInfo.itemData.Nav_UserFiles =this.selectorInfo.itemData.Nav_UserFiles.push(e.Nav_Files) 
+				}
+
+
+			},
+			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) {
+				if (this.dateTimePickerInfo.dataIndex == 1) {
+					this.model.ACT_END_DATE = uni.$u.timeFormat(e.value,
+						'yyyy-mm-dd hh:MM:ss')
+				} else if (this.dateTimePickerInfo.dataIndex == 2) {
+					this.model.LEAVE_DATE = uni.$u.timeFormat(e.value,
+						'yyyy-mm-dd hh:MM:ss')
+				}
+				this.dateTimePickerInfo.showCheckDate = false
+
+			},
+			submit(type) {
+				const isBlank = (value) => {
+					return typeof value !== 'string' || value.trim() === '';
+				};
+				if (isBlank(this.model.COMPLETED_CONTENT) ||
+					isBlank(this.model.ACT_END_DATE) ||
+					isBlank(this.model.LEAVE_DATE)) {
+					uni.$showErrorInfo('请检查必填项，必填项不能为空')
+				} else {
+					this.modelEdit = JSON.parse(JSON.stringify(this.model))
+					delete this.modelEdit.Nav_ApplyDepartment
+					delete this.modelEdit.Nav_ApplyUser
+					delete this.modelEdit.Nav_Area
+					delete this.modelEdit.Nav_FireDepartment
+					delete this.modelEdit.Nav_FireUser
+					delete this.modelEdit.Nav_OperationStep
+					delete this.modelEdit.Nav_ProductionUnit
+					delete this.modelEdit.Nav_SafeUser
+					delete this.modelEdit.Nav_Type
+					if (this.model.Nav_Risks && this.model.Nav_Risks.length > 0) {
+						this.model.Nav_Risks.map(item => {
+							delete item.Nav_Risk
+						})
+					}
+					if (this.modelEdit.Nav_Users && this.modelEdit.Nav_Users.length > 0) {
+						this.modelEdit.Nav_Users.map(item => {
+							if (type == 'SaveAndNotify') {
+								item.PUBLISH = 'SaveAndNotify'
+							} else {
+								item.PUBLISH = null
+							}
+							delete item.Nav_Train
+							delete item.Nav_User
+							delete item.Nav_UserType
+							if (item.Nav_UserFiles && item.Nav_UserFiles.length > 0) {
+								item.Nav_UserFiles.map(item1 => {
+									item1.FIRE_JOB_USER_ID = item.ID
+								})
+							}
+						})
+					}
+
+					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
+
+					if (type == 'SaveAndNotify') {
+						this.modelEdit.PUBLISH = "SaveAndNotify";
+					} else {
+						this.modelEdit.PUBLISH = null;
+					}
+					fullFOFireJob(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/FO2/jobEdit.vue b/pages/apply/subPages/FO2/jobEdit.vue
index 9426d5d..f037e99 100644
--- a/pages/apply/subPages/FO2/jobEdit.vue
+++ b/pages/apply/subPages/FO2/jobEdit.vue
@@ -270,11 +270,13 @@
 					</u--form>
 				</view>
 			</view>
-			<view style="padding: 10px 16px;display: flex;flex-direction: row;" class="bottom-button" v-if="stepsPage === 4">
-				<button type="default" @click="stepReduceTwo" :plain="true"
-					style="margin-right: 5px;background-color: #fff;color: #3d4b70;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">上一步</button>
-				<button type="default" @click="stepSubmit"
-					style="margin-left: 5px;background-color: #3d4b70;color: #fff;width: 50%;height: 40px;display: flex;align-items: center;justify-content: center;font-size: 14px;">提交</button>
+			<view style="padding: 10px 16px;display: flex;flex-direction: column;" class="bottom-button" v-if="stepsPage === 4">
+				<u-button @click="stepSubmit('Save')" :plain="true" color="#3d4b70">保存</u-button>
+				<view style="display: flex;flex-direction: row;margin-top: 10px;">
+					<u-button @click="stepReduceTwo" :plain="true" color="#3d4b70" style="margin-right: 5px;">上一步</u-button>
+					<u-button @click="stepSubmit('SaveAndNotify')" color="#3d4b70" style="margin-left: 5px">提交</u-button>
+				</view>
+
 			</view>
 			<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" @cancel="cacelDel" :showCancelButton="true" title="确认删除？"></u-modal>
 			<u-modal :show="showDelModalDetail >= 0" @confirm="confirmDelDetail" @cancel="cacelDelDetail" :showCancelButton="true" title="确认删除？"></u-modal>
@@ -364,7 +366,7 @@
 					Nav_Department: {
 						NAME: ''
 					},
-					Nav_Area:{
+					Nav_Area: {
 						NAME: ''
 					},
 					// Nav_ApplyUser: {
@@ -1272,7 +1274,7 @@
 					formIndex: undefined
 				}
 			},
-			stepSubmit() {
+			stepSubmit(type) {
 				this.numC = 0;
 				this.dataModel.Nav_DealMeasures.map((item) => {
 					if (item.NAME == '') {
@@ -1285,7 +1287,7 @@
 					uni.$showErrorInfo('添加作业后处理措施信息不能为空')
 				} else {
 					this.modelEdit = JSON.parse(JSON.stringify(this.dataModel))
-					this.modelEdit.PUBLISH = "SaveAndNotify";
+
 					if (this.TaskID !== null) {
 						this.modelEdit.TaskID = this.TaskID;
 					}
@@ -1300,7 +1302,12 @@
 						}
 					}
 					delete this.modelEdit.Nav_Department
-						delete this.modelEdit.Nav_Area
+					delete this.modelEdit.Nav_Area
+					if (type == 'SaveAndNotify') {
+						this.modelEdit.PUBLISH = "SaveAndNotify";
+					} else {
+						this.modelEdit.PUBLISH = null;
+					}
 					saveJobRecord(this.modelEdit).then(res => {
 						uni.$showMsgFunc('操作成功!', () => {
 							// if (this.tableKey == null || this.tableKey == 0) {