From fafee4efb2c7139af8cc68c3a84443895af53967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Fri, 22 May 2026 17:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/subPages/FO/jobFireShow.vue    |  2 +-
 pages/apply/subPages/FO/jobFireTenEdit.vue |  2 +
 pages/apply/subPages/FO/jobFireTwoEdit.vue | 88 +++++++++++++++++++---
 3 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/pages/apply/subPages/FO/jobFireShow.vue b/pages/apply/subPages/FO/jobFireShow.vue
index b1531e7..8312d52 100644
--- a/pages/apply/subPages/FO/jobFireShow.vue
+++ b/pages/apply/subPages/FO/jobFireShow.vue
@@ -189,7 +189,7 @@
 					<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>
+				<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">验收情况</view>
 
 
 				<view v-if="model.STATUS==30">
diff --git a/pages/apply/subPages/FO/jobFireTenEdit.vue b/pages/apply/subPages/FO/jobFireTenEdit.vue
index 5f12ae7..eaff00a 100644
--- a/pages/apply/subPages/FO/jobFireTenEdit.vue
+++ b/pages/apply/subPages/FO/jobFireTenEdit.vue
@@ -108,6 +108,8 @@
 
 									</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>
 
 
diff --git a/pages/apply/subPages/FO/jobFireTwoEdit.vue b/pages/apply/subPages/FO/jobFireTwoEdit.vue
index ea2224e..fe8010a 100644
--- a/pages/apply/subPages/FO/jobFireTwoEdit.vue
+++ b/pages/apply/subPages/FO/jobFireTwoEdit.vue
@@ -2,7 +2,7 @@
 	<view class="todo-page">
 		<view class="background"></view>
 		<view class="allview">
-			<view class="card">
+			<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>
@@ -84,10 +84,70 @@
 					<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">
+							<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>
-			<view style="padding: 10px 16px;" class="bottom-button">
-				<u-button type="primary" @click="submit" color="#3d4b70" :loading="stepLoad">提交</u-button>
-			</view>
+			
 			<query-selector :multiple="selectorInfo.isMultiple" :show="selectorInfo.showPopup" :title="selectorInfo.title" :lists="selectorInfo.dataLists" :defaultChecked="selectorInfo.defaultChecked"
 				@search="handleSearch" @select="handleSelected" @close="selectorInfo.showPopup=false" :total="selectorInfo.totalCount" />
 			<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker" @close="comPickerInfo.showSheet=false" @cancel="comPickerInfo.showSheet=false" keyName="NAME"></u-picker>
@@ -363,7 +423,11 @@
 						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 : ''
+							})
+						}
 					})
 				}
 			},
@@ -397,10 +461,13 @@
 					itemData: item
 				}
 			},
-			onConfirmPicker(e) {
-				if (this.comPickerInfo.name == 'FOYesOrNoEnum') {
-					this.model.IS_LEAVEName = e.value[0].name
-					this.model.IS_LEAVE = e.value[0].ID
+			onConfirmPicker(e) {
+				if (this.comPickerInfo.name == 'FOYesOrNoEnum') {
+					this.model.IS_LEAVEName = e.value[0].name
+					this.model.IS_LEAVE = 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 = {
@@ -547,8 +614,9 @@
 						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 => {
+							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 : ''
 							})
 						}
 					}