From 476b9f79cb21a5d1372c32a956c5d6f300015cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C002001lixiaobang=E2=80=9D?= <2547956374@qq.com>
Date: Thu, 29 Jan 2026 10:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |    5 +-
 src/api/modules/user.js                       |    6 +-
 src/api/modules/workTicket.js                 |  199 +++
 src/api/request.js                            |  165 ++-
 src/manifest.json                             |    8 +-
 src/pages/WorkOrderApproval/index.vue         |  234 +++-
 src/pages/WorkOrderDetails/index.vue          | 1021 ++++++++++++++-
 .../compoents/ApplyForMachine.vue             |  124 +-
 .../WorkOrderEdit/compoents/BasicsInfo.vue    |  104 +-
 .../WorkOrderEdit/compoents/GatePassInfo.vue  |  513 ++++++--
 .../WorkOrderEdit/compoents/RiskControl.vue   |  327 ++++-
 .../WorkOrderEdit/compoents/WorkNote.vue      |  451 ++++++-
 src/pages/WorkOrderEdit/index.vue             | 1166 ++++++++++++++++-
 src/pages/login/index.vue                     |   47 +-
 vite.config.js                                |   12 +
 15 files changed, 4069 insertions(+), 313 deletions(-)
 create mode 100644 src/api/modules/workTicket.js

diff --git a/src/api/index.js b/src/api/index.js
index 74f0b02..dd76417 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,2 +1,3 @@
-export * from './auth'
-export * from './user'
+export * from './modules/auth'
+export * from './modules/user'
+export * from './modules/workTicket'
\ No newline at end of file
diff --git a/src/api/modules/user.js b/src/api/modules/user.js
index 4ba51dd..c125904 100644
--- a/src/api/modules/user.js
+++ b/src/api/modules/user.js
@@ -17,9 +17,13 @@ export function bindPhone(phone, smsCode) {
 }
 
 export function getUserList(params) {
-  return get('/user/list', params)
+  return get('/system/user/list', params)
 }
 
 export function getUserDetail(id) {
   return get(`/user/detail/${id}`)
 }
+
+export function getUserInfo() {
+  return get('/system/user/getInfo')
+}
diff --git a/src/api/modules/workTicket.js b/src/api/modules/workTicket.js
new file mode 100644
index 0000000..910b19b
--- /dev/null
+++ b/src/api/modules/workTicket.js
@@ -0,0 +1,199 @@
+import { post, get, del, put, uploadFile } from '../request'
+
+/**
+ * 新增工作票申请
+ * @param {Object} data - 工作票数据
+ * @param {Number} data.projectId - 所属项目ID（必填）
+ * @param {String} data.workLocation - 作业地点
+ * @param {Number} data.supervisorId - 作业负责人ID
+ * @param {String} data.supervisorName - 作业负责人姓名
+ * @param {String} data.supervisorPosition - 作业负责人职位
+ * @param {String} data.workContent - 作业内容
+ * @param {String} data.riskType - 风险类型（如：高风险、中风险、低风险）
+ * @param {String} data.workStartTime - 作业开始时间（格式：yyyy-MM-dd HH:mm:ss）
+ * @param {String} data.workEndTime - 作业结束时间（格式：yyyy-MM-dd HH:mm:ss）
+ * @param {Array<String>} data.safetyMeasuresList - 安全措施列表
+ * @param {Array<Object>} data.qualificationList - 作业班成员资质列表
+ * @param {String} data.needMonitoringCamera - 是否需申领移动监控球机（"0"否，"1"是）
+ * @param {Number} data.cameraApplicationId - 监控球机申请ID（如果需要监控球机时填写）
+ * @param {String} data.remark - 备注
+ * @returns {Promise} 返回工作票ID
+ */
+export function createWorkTicket(data) {
+  return post('/manage/contractor/workTicket', data)
+}
+
+/**
+ * 出入证申请
+ * @param {Object} data - 出入证申请数据
+ * @returns {Promise}
+ */
+export function applyAccessPermit(data) {
+  return post('/manage/contractor/accessPermit', data)
+}
+
+/**
+ * 新增工作计划
+ * @param {Object} data - 工作计划数据
+ * @returns {Promise}
+ */
+export function createWorkPlan(data) {
+  return post('/manage/contractor/workPlan', data)
+}
+
+/**
+ * 球机申领新增接口
+ * @param {Object} data - 球机申领数据
+ * @param {Number} data.projectId - 项目ID（必填）
+ * @param {Number} data.needCameraCnt - 申领数量（必填，必须大于0）
+ * @param {String} data.installationLocation - 安装位置（必填）
+ * @param {String} data.contactPerson - 联系人（必填）
+ * @param {String} data.contactPhone - 联系方式（必填）
+ * @param {String} data.remark - 备注（可选）
+ * @returns {Promise} 返回申领单ID
+ */
+export function createCameraApplication(data) {
+  return post('/manage/project/cameraApplication', data)
+}
+
+/**
+ * 查询工作计划列表
+ * @param {Object} params - 查询参数
+ * @param {Number} params.pageNum - 页码（可选）
+ * @param {Number} params.pageSize - 每页数量（可选）
+ * @param {String} params.status - 状态（可选）
+ * @param {Number} params.projectId - 项目ID（可选）
+ * @returns {Promise} 返回工作计划列表 { total: number, rows: array }
+ */
+export function getWorkPlanList(params) {
+  return get('/manage/contractor/workPlan/list', params)
+}
+
+/**
+ * 删除工作计划
+ * @param {Number|String|Array<Number>|Array<String>} projectIds - 项目ID，可以是单个ID、ID数组或逗号分隔的字符串
+ * @returns {Promise}
+ */
+export function deleteWorkPlan(projectIds) {
+  // 处理不同的输入格式
+  let ids = projectIds
+  if (Array.isArray(projectIds)) {
+    ids = projectIds.join(',')
+  }
+  return del(`/manage/contractor/workPlan/${ids}`)
+}
+
+/**
+ * 提交工作计划
+ * @param {Number|String} projectId - 项目ID（必填）
+ * @returns {Promise}
+ */
+export function submitWorkPlan(projectId) {
+  return put(`/manage/contractor/workPlan/submit/${projectId}`)
+}
+
+/**
+ * 上传文件
+ * @param {String} filePath - 文件路径（本地临时文件路径）
+ * @param {String} name - 文件对应的 key，默认为 'file'
+ * @param {Object} formData - 额外的表单数据
+ * @param {Object} options - 其他配置选项
+ * @returns {Promise<{name: string, url: string}>} 返回上传后的文件信息，包含 name（文件名）和 url（文件访问地址）
+ */
+export function uploadFileApi(filePath, name = 'file', formData = {}, options = {}) {
+  return uploadFile('/file/upload', filePath, name, formData, options)
+}
+
+/**
+ * 查询风险管控卡模板列表
+ * @param {Object} params - 查询参数（可选）
+ * @returns {Promise} 返回风险管控卡模板列表
+ */
+export function getRiskCardTemplateList(params = {}) {
+  return get('/manage/logistics/riskCard/template/list', params)
+}
+
+/**
+ * 获取风险管控卡模板详细信息
+ * @param {Number|String} templateId - 模板ID（必填）
+ * @returns {Promise} 返回风险管控卡模板详细信息
+ */
+export function getRiskCardTemplateDetail(templateId) {
+  return get(`/manage/logistics/riskCard/template/${templateId}`)
+}
+
+/**
+ * 获取工作计划详细信息
+ * @param {Number|String} projectId - 项目ID（必填）
+ * @returns {Promise} 返回工作计划详细信息
+ */
+export function getWorkPlanDetail(projectId) {
+  return get(`/manage/contractor/workPlan/${projectId}`)
+}
+
+/**
+ * 获取工作票详细信息
+ * @param {Number|String} ticketId - 工作票ID（必填）
+ * @returns {Promise} 返回工作票详细信息
+ */
+export function getWorkTicketDetail(ticketId) {
+  return get(`/manage/contractor/workTicket/${ticketId}`)
+}
+
+/**
+ * 提交风险管控卡监理审核
+ * @param {Object} data - 风险管控卡数据
+ * @param {Number} data.ticketId - 工作票ID（必填）
+ * @param {Number} data.templateId - 模板ID（必填）
+ * @param {String} data.ticketNumber - 票证编号（必填）
+ * @param {String} data.operatingUnit - 所属单位（必填）
+ * @param {String} data.workContent - 工作内容（必填）
+ * @param {String} data.supervisorName - 工作负责人姓名（必填）
+ * @param {String} data.supervisorPosition - 工作负责人职位
+ * @param {String} data.contactMethod - 联系方式
+ * @param {String} data.inspectionTime - 检查时间（格式：yyyy-MM-ddTHH:mm）
+ * @param {Array<Object>} data.checkItems - 检查项列表
+ * @param {Number} data.checkItems[].templateItemId - 模板项ID
+ * @param {String} data.checkItems[].itemDescription - 检查项描述
+ * @param {String} data.checkItems[].checkResult - 检查结果
+ * @param {Number} data.checkItems[].sortOrder - 排序顺序
+ * @param {Array<String>} data.attachmentList - 附件URL列表
+ * @returns {Promise} 返回风险管控卡ID（cardId）
+ */
+export function submitRiskControlCard(data) {
+  return post('/manage/contractor/riskControlCard', data)
+}
+
+/**
+ * 提交工作票
+ * @param {Number|String} ticketId - 工作票ID（必填）
+ * @param {Number|String} cardId - 风险管控卡ID（可选，高等风险时必填）
+ * @returns {Promise}
+ */
+export function submitWorkTicket(ticketId, cardId = null) {
+  let url = `/manage/contractor/workTicket/submit/${ticketId}`;
+  if (cardId) {
+    url += `?cardId=${cardId}`;
+  }
+  return put(url)
+}
+
+/**
+ * 提交工作票（承包商接口）
+ * @param {Number|String} ticketId - 工作票ID（必填）
+ * @returns {Promise}
+ */
+export function submitWorkTicketForContractor(ticketId) {
+  return put(`/manage/contractor/workTicket/submit/${ticketId}`)
+}
+
+/**
+ * 提交实施
+ * @param {Number|String} projectId - 项目ID（必填）
+ * @returns {Promise}
+ */
+export function submitImplementation(projectId) {
+  return put(`/manage/contractor/projectImplementation/submitImplementation?projectId=${projectId}`)
+}
+
+
diff --git a/src/api/request.js b/src/api/request.js
index 6ad81e1..41adc73 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -1,21 +1,28 @@
 import { useUserStore } from '@/store/user'
 
-const BASE_URL = 'https://api.example.com'
+// 根据平台配置不同的基础URL
+// H5 开发环境使用代理路径 /api，通过 vite 代理解决跨域问题
+// H5 生产环境和小程序、App 使用完整URL
+let BASE_URL = '/api'
+
+// #ifdef H5
+
+// #endif
 
 const requestInterceptor = (config) => {
   const userStore = useUserStore()
-  
-  if (config.header) {
-    config.header = {
-      ...config.header,
-      'Content-Type': 'application/json',
-      'Authorization': userStore.token ? `Bearer ${userStore.token}` : ''
-    }
-  } else {
-    config.header = {
-      'Content-Type': 'application/json',
-      'Authorization': userStore.token ? `Bearer ${userStore.token}` : ''
-    }
+
+  // 初始化 header 对象
+  if (!config.header) {
+    config.header = {}
+  }
+
+  // 设置 Content-Type
+  config.header['Content-Type'] = config.header['Content-Type'] || 'application/json'
+
+  // 如果有 token，添加 authorization header
+  if (userStore.token) {
+    config.header['authorization'] = `Bearer ${userStore.token}`
   }
 
   return config
@@ -25,11 +32,11 @@ const responseInterceptor = (response) => {
   const { statusCode, data } = response
 
   if (statusCode === 200) {
-    if (data.code === 0 || data.success) {
-      return data.data || data.result
+    if (data.code === 0 || data.code === 200 || data.success) {
+      return data.data || data.result || data
     } else {
       uni.showToast({
-        title: data.message || '请求失败',
+        title: data.msg || data.message || '请求失败',
         icon: 'none'
       })
       return Promise.reject(data)
@@ -81,10 +88,13 @@ function request(options) {
     url: url.startsWith('http') ? url : `${BASE_URL}${url}`,
     method,
     data,
-    header: requestInterceptor({ header }),
+    header,
     timeout: 15000
   }
 
+  // 通过拦截器处理 header
+  requestInterceptor(config)
+
   return new Promise((resolve, reject) => {
     if (loading) {
       uni.showLoading({
@@ -96,8 +106,17 @@ function request(options) {
     uni.request({
       ...config,
       success: (res) => {
-        const result = responseInterceptor(res)
-        resolve(result)
+        try {
+          const result = responseInterceptor(res)
+          // 如果 result 是 Promise，需要正确处理
+          if (result instanceof Promise) {
+            result.then(resolve).catch(reject)
+          } else {
+            resolve(result)
+          }
+        } catch (error) {
+          reject(error)
+        }
       },
       fail: (err) => {
         uni.showToast({
@@ -160,4 +179,112 @@ export function patch(url, data, options) {
   })
 }
 
+/**
+ * 文件上传
+ * @param {String} url - 上传接口地址
+ * @param {String} filePath - 文件路径（本地临时文件路径）
+ * @param {String} name - 文件对应的 key，开发者在服务端可以通过这个 key 获取文件的二进制内容
+ * @param {Object} formData - HTTP 请求中其他额外的 form data
+ * @param {Object} options - 其他配置选项
+ * @param {Boolean} options.loading - 是否显示加载提示，默认 true
+ * @param {String} options.loadingText - 加载提示文字，默认 '上传中...'
+ * @returns {Promise}
+ */
+export function uploadFile(url, filePath, name = 'file', formData = {}, options = {}) {
+  const { loading = true, loadingText = '上传中...' } = options
+  const userStore = useUserStore()
+
+  // 构建完整的 URL
+  const fullUrl = url.startsWith('http') ? url : `${BASE_URL}${url}`
+
+  // 构建请求头
+  const header = {}
+  if (userStore.token) {
+    header['authorization'] = `Bearer ${userStore.token}`
+  }
+
+  return new Promise((resolve, reject) => {
+    if (loading) {
+      uni.showLoading({
+        title: loadingText,
+        mask: true
+      })
+    }
+
+    uni.uploadFile({
+      url: fullUrl,
+      filePath: filePath,
+      name: name,
+      formData: formData,
+      header: header,
+      success: (res) => {
+        try {
+          // uni.uploadFile 返回的是字符串，需要解析
+          const data = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
+
+          if (res.statusCode === 200) {
+            if (data.code === 0 || data.code === 200 || data.success) {
+              resolve(data.data || data.result || data)
+            } else {
+              uni.showToast({
+                title: data.msg || data.message || '上传失败',
+                icon: 'none'
+              })
+              reject(data)
+            }
+          } else if (res.statusCode === 401) {
+            uni.showToast({
+              title: '登录已过期，请重新登录',
+              icon: 'none'
+            })
+            userStore.clearUser()
+            setTimeout(() => {
+              uni.reLaunch({
+                url: '/pages/login/index'
+              })
+            }, 1500)
+            reject(res)
+          } else if (res.statusCode === 403) {
+            uni.showToast({
+              title: '没有权限访问',
+              icon: 'none'
+            })
+            reject(res)
+          } else if (res.statusCode >= 500) {
+            uni.showToast({
+              title: '服务器错误，请稍后重试',
+              icon: 'none'
+            })
+            reject(res)
+          } else {
+            uni.showToast({
+              title: '上传失败',
+              icon: 'none'
+            })
+            reject(res)
+          }
+        } catch (error) {
+          uni.showToast({
+            title: '上传响应解析失败',
+            icon: 'none'
+          })
+          reject(error)
+        }
+      },
+      fail: (err) => {
+        uni.showToast({
+          title: '上传失败，请检查网络',
+          icon: 'none'
+        })
+        reject(err)
+      },
+      complete: () => {
+        if (loading) {
+          uni.hideLoading()
+        }
+      }
+    })
+  })
+}
+
 export default request
diff --git a/src/manifest.json b/src/manifest.json
index db4b2a5..ed20d46 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -43,7 +43,13 @@
       "minified": true,
       "postcss": true
     },
-    "usingComponents": true
+    "usingComponents": true,
+    "requiredPrivateInfos": [],
+    "permission": {
+      "scope.userLocation": {
+        "desc": "您的位置信息将用于小程序位置接口的效果展示"
+      }
+    }
   },
   "mp-alipay": {
     "usingComponents": true
diff --git a/src/pages/WorkOrderApproval/index.vue b/src/pages/WorkOrderApproval/index.vue
index 4d42264..57ad791 100644
--- a/src/pages/WorkOrderApproval/index.vue
+++ b/src/pages/WorkOrderApproval/index.vue
@@ -4,7 +4,7 @@
         <view class="FlexBox TopBox">
             <view class="SelectBox">
                 <u-select :current="TypeValue" :options="TypeList" placeholder="请选择工单类型" size="large" showOptionsLabel
-                    @update:current="TypeValue = $event"></u-select>
+                    @update:current="handleTypeChange($event)"></u-select>
             </view>
             <view class="BtnBox">
                 <u-button type="primary" text="查询" @click="HandleNewAdd">新建工单</u-button>
@@ -12,31 +12,32 @@
 
 
         </view>
-        <view class="ListBox">
-            <u-virtual-list :list-data="dataSource" :item-height="200" height="100%">
-                <template #default="{ item, index }">
-                    <view class="CardBox">
-                        <view class="FlexBox">
-                            <view class="Title">{{ item.name }}</view>
-                            <view class="DetailBtn">详情</view>
-                        </view>
-                        <view class="CodeTxt">项目编号：{{ item.projectCode }}</view>
-                        <view class="TagBox">
-                            <u-tag text="代填工作票"  shape="circle"></u-tag>
-                        </view>
-                        <view class="BtnList">
-                            <u-button text="修改" plain color="#2979ff" size="small"></u-button>
-                            <u-button text="撤回" plain color="#ff9900" size="small"></u-button>
-                            <u-button text="删除" plain color="#fa3534" size="small"></u-button>
-                        </view>
-                    </view>
-                </template>
-            </u-virtual-list>
-        </view>
+        <scroll-view class="ListBox" scroll-y>
+            <view class="CardBox" v-for="(item, index) in dataSource" :key="index">
+                <view class="FlexBox">
+                    <view class="Title">{{ item.projectName || '未命名项目' }}</view>
+                    <view class="DetailBtn" @click="handleDetail(item)">详情</view>
+                </view>
+                <view class="CodeTxt">项目编号：{{ item.projectCode }}</view>
+                <!-- <view class="CodeTxt">作业地点：{{ item.workLocation }}</view>
+                <view class="CodeTxt">作业负责人：{{ item.supervisorName || '未设置' }}</view> -->
+                <view class="TagBox">
+                    <!-- <u-tag :text="getStatusText(item.projectStatus)" shape="circle"></u-tag> -->
+                    <u-tag :text="item.draftStatusText" shape="circle"></u-tag>
+                </view>
+                <view class="BtnList">
+                    <u-button text="修改" plain color="#2979ff" size="small"></u-button>
+                    <u-button text="撤回" plain color="#ff9900" size="small"></u-button>
+                    <u-button text="删除" plain color="#fa3534" size="small" @click="handleDelete(item, index)"></u-button>
+                </view>
+            </view>
+        </scroll-view>
     </view>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
+import { getWorkPlanList, deleteWorkPlan } from '@/api/modules/workTicket'
+
 const TypeValue = ref('1') // 工单类型
 // 类型列表
 const TypeList = ref([
@@ -47,15 +48,92 @@ const TypeList = ref([
     { name: '已撤回', id: '5' },
 ])
 
-const dataSource = ref([
-    { id: 1, name: '工单1', projectCode: '123456' },
-    { id: 2, name: '工单2', projectCode: '123457' },
-    { id: 3, name: '工单3', projectCode: '123458' },
-    { id: 4, name: '工单4', projectCode: '123459' },
-    { id: 5, name: '工单5', projectCode: '123460' },
-    { id: 6, name: '工单6', projectCode: '123461' },
-    { id: 7, name: '工单7', projectCode: '123462' },
-])
+const dataSource = ref([])
+const total = ref(0) // 总条数
+
+// 获取状态文本
+// 项目状态：0草稿，1已提交，2进行中，3已完成，4已取消
+const getStatusText = (status) => {
+    const statusMap = {
+        '0': '草稿',
+        '1': '已提交',
+        '2': '进行中',
+        '3': '已完成',
+        '4': '已取消'
+    }
+    return statusMap[status] || '未知状态'
+}
+
+// 判断是否显示修改按钮
+// 待填写工作票、已驳回：显示修改按钮
+const shouldShowEditButton = (item) => {
+    const status = item.draftStatusText || ''
+    return status === '待填写工作票' || status === '已驳回'
+}
+
+// 判断是否显示撤回按钮
+// 待申领监控球机、待审核：只显示撤回按钮
+const shouldShowWithdrawButton = (item) => {
+    const status = item.draftStatusText || ''
+    return status === '待申领监控球机' || status === '待审核'
+}
+
+// 判断是否显示删除按钮
+// 待填写工作票、已驳回：显示删除按钮
+const shouldShowDeleteButton = (item) => {
+    const status = item.draftStatusText || ''
+    return status === '待填写工作票' || status === '已驳回'
+}
+
+// 查询工作计划列表
+const fetchWorkPlanList = async () => {
+    try {
+        const params = {
+            pageNum: 1,
+            pageSize: 1000
+        }
+        // 根据选择的类型添加筛选条件
+        if (TypeValue.value === '3') {
+            params.draftStatusText = '草稿' // 草稿
+        } else if (TypeValue.value === '4') {
+            params.draftStatusText = '待审核' // 待审核
+        } else if (TypeValue.value === '5') {
+            params.draftStatusText = '已撤回' // 已撤回
+        }
+        
+        const result = await getWorkPlanList(params)
+        // 根据返回的数据结构处理：{ total, rows }
+        if (result && result.rows) {
+            dataSource.value = result.rows
+            total.value = result.total || 0
+        } else if (Array.isArray(result)) {
+            dataSource.value = result
+            total.value = result.length
+        } else if (result && result.list) {
+            dataSource.value = result.list
+            total.value = result.total || result.list.length
+        } else if (result && result.records) {
+            dataSource.value = result.records
+            total.value = result.total || result.records.length
+        } else if (result && result.data) {
+            dataSource.value = result.data
+            total.value = result.total || result.data.length
+        } else {
+            dataSource.value = []
+            total.value = 0
+        }
+    } catch (error) {
+        console.error('查询工作计划列表失败:', error)
+        dataSource.value = []
+        total.value = 0
+    }
+}
+
+// 监听类型变化，重新查询
+const handleTypeChange = (value) => {
+    TypeValue.value = value
+    fetchWorkPlanList()
+}
 
 // 跳转新建工单
 const HandleNewAdd = () => {
@@ -64,6 +142,85 @@ const HandleNewAdd = () => {
     })
 }
 
+// 跳转到详情页
+const handleDetail = (item) => {
+    const projectId = item.projectId || item.id
+    if (!projectId) {
+        uni.showToast({
+            title: '项目ID不存在',
+            icon: 'none'
+        })
+        return
+    }
+    // 获取工作票ID，支持 ticketIds 或 ticketId 字段
+    const ticketId = item.ticketIds || item.ticketId
+    // 构建跳转URL
+    let url = `/pages/WorkOrderDetails/index?projectId=${projectId}`
+    if (ticketId) {
+        // 如果 ticketIds 是数组，取第一个；如果是单个值，直接使用
+        const ticketIdValue = Array.isArray(ticketId) ? ticketId[0] : ticketId
+        url += `&workTicketId=${ticketIdValue}`
+    }
+    uni.navigateTo({
+        url: url
+    })
+}
+
+// 删除工作计划
+const handleDelete = async (item, index) => {
+    try {
+        // 确认删除
+        const res = await new Promise((resolve) => {
+            uni.showModal({
+                title: '提示',
+                content: `确定要删除项目"${item.projectName || '未命名项目'}"吗？`,
+                confirmText: '删除',
+                confirmColor: '#fa3534',
+                success: (result) => {
+                    resolve(result.confirm)
+                },
+                fail: () => {
+                    resolve(false)
+                }
+            })
+        })
+
+        if (!res) {
+            return
+        }
+
+        // 获取项目ID，优先使用 projectId，如果没有则使用 id
+        const projectId = item.projectId || item.id
+        if (!projectId) {
+            uni.showToast({
+                title: '项目ID不存在',
+                icon: 'none'
+            })
+            return
+        }
+
+        // 调用删除接口
+        await deleteWorkPlan(projectId)
+        
+        uni.showToast({
+            title: '删除成功',
+            icon: 'success'
+        })
+
+        // 删除成功后，从列表中移除该项
+        dataSource.value.splice(index, 1)
+        total.value = total.value - 1
+    } catch (error) {
+        console.error('删除失败:', error)
+        // 错误提示已在 request.js 的拦截器中处理
+    }
+}
+
+// 页面加载时获取数据
+onMounted(() => {
+    fetchWorkPlanList()
+})
+
 </script>
 <style lang="scss" scoped>
 .FlexBox {
@@ -105,17 +262,15 @@ const HandleNewAdd = () => {
         padding: 20rpx 0px;
         margin-top: 20rpx;
         height: calc(100vh - 300rpx);
-        overflow: hidden;
         .CardBox {
             width: calc(100% - 30rpx);
-            height: calc(100% - 30rpx);
+            min-height: 200rpx;
             margin: 0 auto;
             padding: 20rpx;
             box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08), 0 2rpx 4rpx rgba(0, 0, 0, 0.04);
             margin-bottom: 20rpx;
             background-color: #fff;
             border-radius: 10rpx;
-            overflow: auto;
             .Title {
                 font-size: 32rpx;
                 font-weight: bold;
@@ -137,8 +292,15 @@ const HandleNewAdd = () => {
                 margin-top: 20rpx;
                 display: flex;
                 align-items: center;
-                justify-content: space-between;
+                justify-content: flex-start;
                 gap: 20rpx;
+                
+                :deep(.u-button) {
+                    width: 80px !important;
+                    min-width: 60px !important;
+                    margin-left: 0 !important;
+                    margin-right: auto !important;
+                }
             }
         }
     }
diff --git a/src/pages/WorkOrderDetails/index.vue b/src/pages/WorkOrderDetails/index.vue
index b1d1b7f..26c4703 100644
--- a/src/pages/WorkOrderDetails/index.vue
+++ b/src/pages/WorkOrderDetails/index.vue
@@ -2,26 +2,645 @@
 <template>
     <view class="PageBox">
         <view class="TopBox FlexBox">
-            <view class="iconBox FlexBox">
+            <view class="iconBox FlexBox" @click="goBack">
                 <!-- 返回上一页 -->
                 <u-icon name="arrow-leftward" size="24"></u-icon>
+                <text class="BackText">返回</text>
             </view>
-            <view class="Title">工单详情</view>
+            <view class="Title">{{ workPlanDetail?.projectName ? `${workPlanDetail.projectName}工单详情` : '工单详情' }}</view>
             <view class="informBox">
                 <u-icon name="bell-fill" size="24"></u-icon>
-                <view class="MsgTxt"></view>
+                <view class="MsgTxt" v-if="unreadCount > 0">{{ unreadCount }}</view>
             </view>
         </view>
-        <view class="ContentBox">
-            展示内容
-        </view>
-        <view class="FootBox">
-            <u-button text="撤回"  type="info"></u-button>
-            <u-button text="提交实施"  color="#2979ff"></u-button>
+        <scroll-view class="ContentBox" scroll-y>
+            <!-- 进度指示器 -->
+            <view class="ProgressBox">
+                <view class="ProgressItem" v-for="(step, index) in progressSteps" :key="index">
+                    <view class="ProgressCircle" :class="step.status">
+                        <u-icon v-if="step.status === 'completed'" name="checkmark" size="16" color="#fff"></u-icon>
+                        <view v-else class="ProgressDot"></view>
+                    </view>
+                    <view class="ProgressLabel" :class="step.status">{{ step.label }}</view>
+                    <view v-if="index < progressSteps.length - 1" class="ProgressLine" :class="getProgressLineClass(step.status, progressSteps[index + 1]?.status)"></view>
+                </view>
+            </view>
 
+            <!-- 项目工单详情 -->
+            <view class="SectionBox">
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">申请人：</view>
+                    <view class="InfoValue">{{ workPlanDetail.supervisorName || '未设置' }}</view>
+                </view>
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">联系电话：</view>
+                    <view class="InfoValue">{{ workPlanDetail.contactPhone || '未设置' }}</view>
+                </view>
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">申请日期：</view>
+                    <view class="InfoValue">{{ formatDate(workPlanDetail.createTime) || '未设置' }}</view>
+                </view>
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">预计进场时间：</view>
+                    <view class="InfoValue">{{ formatDateTime(workPlanDetail.workStartTime) || '未设置' }}</view>
+                </view>
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">预计离场时间：</view>
+                    <view class="InfoValue">{{ formatDateTime(workPlanDetail.workEndTime) || '未设置' }}</view>
+                </view>
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">施工人数：</view>
+                    <view class="InfoValue">{{ workPlanDetail.sysUserIds?.length || 0 }}人</view>
+                </view>
+                <view class="InfoItem" v-if="workPlanDetail">
+                    <view class="InfoLabel">施工区域：</view>
+                    <view class="InfoValue">{{ workPlanDetail.workLocation || '未设置' }}</view>
+                </view>
+                <!-- 附件预览 -->
+                <view class="InfoItem" v-if="workPlanDetail?.attachmentList && workPlanDetail.attachmentList.length > 0">
+                    <view class="InfoLabel">附件预览：</view>
+                    <view class="AttachmentBox">
+                        <view class="AttachmentItem" v-for="(file, index) in workPlanDetail.attachmentList" :key="index" @click="previewFile(file)">
+                            <image v-if="isImage(file)" :src="file" mode="aspectFill" class="AttachmentImg"></image>
+                            <view v-else class="AttachmentFile">
+                                <image src="@/static/icon/file-icon.png" class="FileIcon"></image>
+                                <text class="FileName">{{ getFileName(file) }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 审核记录（初始申请） -->
+            <view class="SectionBox" v-if="workPlanApprovalRecords && workPlanApprovalRecords.length > 0">
+                <view class="SectionTitle">审核记录</view>
+                <view class="ApprovalItem" v-for="(record, index) in workPlanApprovalRecords" :key="index">
+                    <view class="ApprovalHeader">
+                        <view class="ApprovalName">{{ record.approverName || '审核人' }}</view>
+                        <view class="ApprovalTime">{{ formatDateTimeFull(record.approvalTime) }}</view>
+                    </view>
+                    <view class="ApprovalContent">{{ record.approvalComment || '无审核意见' }}</view>
+                </view>
+            </view>
+
+            <!-- 工作票填写详情 -->
+            <view class="SectionBox" v-if="workTicketDetail">
+                <view class="SectionTitle">工作票填写详情</view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">工作内容：</view>
+                    <view class="InfoValue">{{ workTicketDetail.workContent || '未填写' }}</view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">风险等级：</view>
+                    <view class="InfoValue">
+                        <view class="RiskTag" :class="getRiskLevelClass(workTicketDetail.riskType)">
+                            {{ getRiskLevelText(workTicketDetail.riskType) }}
+                        </view>
+                    </view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">负责人：</view>
+                    <view class="InfoValue">{{ workTicketDetail.supervisorName || '未设置' }}</view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">安全员：</view>
+                    <view class="InfoValue">{{ workTicketDetail.safetyOfficerName || '未设置' }}</view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">开始时间：</view>
+                    <view class="InfoValue">{{ formatWorkTicketTime(workTicketDetail.workStartTime) || '未设置' }}</view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">结束时间：</view>
+                    <view class="InfoValue">{{ formatWorkTicketTime(workTicketDetail.workEndTime) || '未设置' }}</view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">工具清单：</view>
+                    <view class="InfoValue">{{ workTicketDetail.toolList || '未填写' }}</view>
+                </view>
+                <view class="InfoItem">
+                    <view class="InfoLabel">应急预案：</view>
+                    <view class="InfoValue">{{ workTicketDetail.emergencyPlan || '未填写' }}</view>
+                </view>
+                <!-- 附件预览 -->
+                <view class="InfoItem" v-if="workTicketDetail?.attachmentList && workTicketDetail.attachmentList.length > 0">
+                    <view class="InfoLabel">附件预览：</view>
+                    <view class="AttachmentBox">
+                        <view class="AttachmentItem" v-for="(file, index) in workTicketDetail.attachmentList" :key="index" @click="previewFile(file)">
+                            <image v-if="isImage(file)" :src="file" mode="aspectFill" class="AttachmentImg"></image>
+                            <view v-else class="AttachmentFile">
+                                <image src="@/static/icon/file-icon.png" class="FileIcon"></image>
+                                <text class="FileName">{{ getFileName(file) }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 审核记录（工作票） -->
+            <view class="SectionBox" v-if="workTicketApprovalRecords && workTicketApprovalRecords.length > 0">
+                <view class="SectionTitle">审核记录</view>
+                <view class="ApprovalItem" v-for="(record, index) in workTicketApprovalRecords" :key="index">
+                    <view class="ApprovalHeader">
+                        <view class="ApprovalName">{{ record.approverName || '审核人' }}</view>
+                        <view class="ApprovalTime">{{ formatDateTimeFull(record.approvalTime) }}</view>
+                    </view>
+                    <view class="ApprovalContent">{{ record.approvalComment || '无审核意见' }}</view>
+                </view>
+            </view>
+
+            <!-- 高风险票 -->
+            <view class="SectionBox" 
+                  v-if="workTicketDetail && isHighRiskType" 
+                  :class="{ 'clickable-card': !workTicketDetail.riskControlCardId }"
+                  @click="handleRiskControlCardClick">
+                <view class="SectionTitle">
+                    高风险票 
+                    <text class="StatusTag" :class="workTicketDetail.riskControlCardId ? 'status-filled' : 'status-pending'">
+                        {{ workTicketDetail.riskControlCardId ? '已填写' : '待填写' }}
+                    </text>
+                </view>
+                <view v-if="!workTicketDetail.riskControlCardId" class="EmptyBox">
+                    <text class="EmptyText">点击此处填写高风险票</text>
+                </view>
+                <view v-else-if="riskControlCardDetail" class="InfoItem">
+                    <!-- TODO: 显示风险管控卡详情内容 -->
+                    <view class="InfoLabel">风险管控卡ID：</view>
+                    <view class="InfoValue">{{ workTicketDetail.riskControlCardId }}</view>
+                </view>
+            </view>
+
+            <!-- 监控球机申领 -->
+            <view class="SectionBox" 
+                  v-if="workTicketDetail && isHighRiskType" 
+                  :class="{ 'clickable-card': !workTicketDetail.cameraApplicationId }"
+                  @click="handleCameraApplicationClick">
+                <view class="SectionTitle">
+                    监控球机申领 
+                    <text class="StatusTag" :class="workTicketDetail.cameraApplicationId ? 'status-filled' : 'status-pending'">
+                        {{ workTicketDetail.cameraApplicationId ? '已填写' : '待填写' }}
+                    </text>
+                </view>
+                <view v-if="!workTicketDetail.cameraApplicationId" class="EmptyBox">
+                    <text class="EmptyText">点击此处填写监控球机申领</text>
+                </view>
+                <view v-else-if="cameraApplicationDetail" class="InfoItem">
+                    <!-- TODO: 显示监控球机申领详情内容 -->
+                    <view class="InfoLabel">监控球机申领ID：</view>
+                    <view class="InfoValue">{{ workTicketDetail.cameraApplicationId }}</view>
+                </view>
+            </view>
+        </scroll-view>
+        <view class="FootBox">
+            <view class="FootButton withdraw-btn" @click="handleWithdraw">撤回</view>
+            <view class="FootButton submit-btn" @click="handleSubmit">提交实施</view>
         </view>
     </view>
 </template>
+<script setup>
+import { ref, onMounted, computed } from 'vue'
+import { getWorkPlanDetail, getWorkTicketDetail, submitImplementation } from '@/api/modules/workTicket'
+
+// 路由参数
+const projectId = ref(null)
+const workTicketId = ref(null)
+
+// 数据
+const workPlanDetail = ref(null)
+const workTicketDetail = ref(null)
+const workPlanApprovalRecords = ref([])
+const workTicketApprovalRecords = ref([])
+const riskControlCardDetail = ref(null)
+const cameraApplicationDetail = ref(null)
+const unreadCount = ref(2) // 未读消息数量
+
+// 进度步骤
+const progressSteps = computed(() => {
+    // 判断是否为高等风险
+    const isHighRisk = isHighRiskType.value
+    
+    // 基础步骤（所有工单都有）
+    const baseSteps = [
+        { label: '新建工作计划', status: 'pending' },
+        { label: '申请出入证', status: 'pending' },
+        { label: '填写工作票', status: 'pending' }
+    ]
+    
+    // 高等风险才有的步骤
+    const highRiskSteps = [
+        { label: '填写高风险卡', status: 'pending' },
+        { label: '申领监控球机', status: 'pending' }
+    ]
+    
+    // 最终步骤（所有工单都有）
+    const finalStep = { label: '审核通过', status: 'pending' }
+    
+    // 根据风险等级组合步骤
+    const steps = isHighRisk 
+        ? [...baseSteps, ...highRiskSteps, finalStep]
+        : [...baseSteps, finalStep]
+
+    // 根据数据状态更新进度
+    let stepIndex = 0
+    
+    // 步骤0: 新建工作计划
+    if (workPlanDetail.value) {
+        steps[stepIndex].status = 'completed'
+    }
+    stepIndex++
+    
+    // 步骤1: 申请出入证
+    if (workPlanDetail.value?.accessPermitId) {
+        steps[stepIndex].status = 'completed'
+    }
+    stepIndex++
+    
+    // 步骤2: 填写工作票
+    if (workTicketDetail.value) {
+        steps[stepIndex].status = 'completed'
+        stepIndex++
+        
+        // 如果是高等风险，处理高风险卡和监控球机申领步骤
+        if (isHighRisk) {
+            // 步骤3: 填写高风险卡
+            if (workTicketDetail.value.riskControlCardId) {
+                steps[stepIndex].status = 'completed'
+            } else {
+                steps[stepIndex].status = 'active'
+            }
+            stepIndex++
+            
+            // 步骤4: 申领监控球机
+            if (workTicketDetail.value.cameraApplicationId) {
+                steps[stepIndex].status = 'completed'
+            } else if (steps[stepIndex - 1].status === 'completed') {
+                steps[stepIndex].status = 'active'
+            }
+            stepIndex++
+        }
+    } else {
+        // 工作票未填写，直接跳到下一步
+        stepIndex++
+    }
+    
+    // 最后一步: 审核通过（索引为 steps.length - 1）
+    const finalStepIndex = steps.length - 1
+    if (workPlanDetail.value?.projectStatus === '3') {
+        steps[finalStepIndex].status = 'completed'
+    }
+
+    // 如果某个步骤激活或完成，前面的步骤都应该完成
+    for (let i = 0; i < steps.length; i++) {
+        if (steps[i].status === 'active' || steps[i].status === 'completed') {
+            // 将前面的所有步骤设为 completed
+            for (let j = 0; j < i; j++) {
+                if (steps[j].status === 'pending') {
+                    steps[j].status = 'completed'
+                }
+            }
+        }
+    }
+
+    return steps
+})
+
+// 获取工作计划详情
+const fetchWorkPlanDetail = async () => {
+    if (!projectId.value) return
+    
+    try {
+        const result = await getWorkPlanDetail(projectId.value)
+        workPlanDetail.value = result
+        
+        // 如果有工作票ID，获取工作票详情
+        // 优先使用路由参数中的 workTicketId，如果没有则使用工作计划详情中的 workTicketId
+        const ticketId = workTicketId.value || result.workTicketId
+        if (ticketId) {
+            await fetchWorkTicketDetail(ticketId)
+        }
+        
+        // 获取审核记录（如果有）
+        if (result.approvalRecords) {
+            workPlanApprovalRecords.value = result.approvalRecords
+        }
+    } catch (error) {
+        console.error('获取工作计划详情失败:', error)
+        uni.showToast({
+            title: error.message || '获取详情失败',
+            icon: 'none'
+        })
+    }
+}
+
+// 获取工作票详情
+const fetchWorkTicketDetail = async (ticketId) => {
+    if (!ticketId) return
+    
+    try {
+        const result = await getWorkTicketDetail(ticketId)
+        workTicketDetail.value = result
+        
+        // 从工作票详情中获取风险管控卡ID和监控球机申领ID
+        if (result.riskControlCardId) {
+            // TODO: 获取风险管控卡详情
+            // riskControlCardDetail.value = await getRiskControlCardDetail(result.riskControlCardId)
+        }
+        
+        if (result.cameraApplicationId) {
+            // TODO: 获取监控球机申领详情
+            // cameraApplicationDetail.value = await getCameraApplicationDetail(result.cameraApplicationId)
+        }
+        
+        // 获取审核记录（如果有）
+        if (result.approvalRecords) {
+            workTicketApprovalRecords.value = result.approvalRecords
+        }
+    } catch (error) {
+        console.error('获取工作票详情失败:', error)
+        uni.showToast({
+            title: error.message || '获取工作票详情失败',
+            icon: 'none'
+        })
+    }
+}
+
+// 格式化日期
+const formatDate = (dateStr) => {
+    if (!dateStr) return ''
+    const date = new Date(dateStr)
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    return `${year}-${month}-${day}`
+}
+
+// 格式化日期时间（用于预计时间，显示日期+上午/下午）
+const formatDateTime = (dateStr) => {
+    if (!dateStr) return ''
+    const date = new Date(dateStr)
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    
+    // 判断上午/下午
+    const period = parseInt(hours) < 12 ? '上午' : '下午'
+    
+    return `${year}-${month}-${day} ${period}`
+}
+
+// 格式化日期时间（用于审核记录，显示完整时间）
+const formatDateTimeFull = (dateStr) => {
+    if (!dateStr) return ''
+    const date = new Date(dateStr)
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    
+    return `${year}-${month}-${day} ${hours}:${minutes}`
+}
+
+// 格式化工作票时间（显示完整日期时间）
+const formatWorkTicketTime = (dateStr) => {
+    if (!dateStr) return ''
+    const date = new Date(dateStr)
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    
+    return `${year}-${month}-${day} ${hours}:${minutes}`
+}
+
+// 获取风险等级文本
+const getRiskLevelText = (riskType) => {
+    if (!riskType) return '未设置'
+    if (riskType.includes('低风险') || riskType.includes('低')) return '低风险'
+    if (riskType.includes('中风险') || riskType.includes('中')) return '中风险'
+    if (riskType.includes('高风险') || riskType.includes('高')) return '高风险'
+    return riskType
+}
+
+// 获取风险等级类型
+const getRiskLevelType = (riskType) => {
+    if (!riskType) return 'info'
+    if (riskType.includes('低风险') || riskType.includes('低')) return 'success'
+    if (riskType.includes('中风险') || riskType.includes('中')) return 'warning'
+    if (riskType.includes('高风险') || riskType.includes('高')) return 'error'
+    return 'info'
+}
+
+// 获取风险等级样式类
+const getRiskLevelClass = (riskType) => {
+    if (!riskType) return 'risk-low'
+    if (riskType.includes('低风险') || riskType.includes('低')) return 'risk-low'
+    if (riskType.includes('中风险') || riskType.includes('中')) return 'risk-medium'
+    if (riskType.includes('高风险') || riskType.includes('高')) return 'risk-high'
+    return 'risk-low'
+}
+
+// 判断是否为高等风险类型
+const isHighRiskType = computed(() => {
+    if (!workTicketDetail.value || !workTicketDetail.value.riskType) return false
+    return workTicketDetail.value.riskType.includes('高等风险')
+})
+
+// 获取进度线样式类
+const getProgressLineClass = (status, nextStatus) => {
+    // 如果当前步骤已完成，连接线应该是绿色
+    if (status === 'completed') return 'completed'
+    return ''
+}
+
+// 判断是否为图片
+const isImage = (url) => {
+    if (!url) return false
+    const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
+    const lowerUrl = url.toLowerCase()
+    return imageExtensions.some(ext => lowerUrl.includes(ext))
+}
+
+// 获取文件名
+const getFileName = (url) => {
+    if (!url) return '未知文件'
+    const parts = url.split('/')
+    return parts[parts.length - 1] || '未知文件'
+}
+
+// 预览文件
+const previewFile = (url) => {
+    if (isImage(url)) {
+        uni.previewImage({
+            urls: [url],
+            current: url
+        })
+    } else {
+        // 下载文件
+        uni.downloadFile({
+            url: url,
+            success: (res) => {
+                if (res.statusCode === 200) {
+                    uni.openDocument({
+                        filePath: res.tempFilePath,
+                        success: () => {
+                            console.log('打开文档成功')
+                        }
+                    })
+                }
+            }
+        })
+    }
+}
+
+// 返回上一页
+const goBack = () => {
+    // 返回到工单审批查询页（tabBar页面）
+    uni.switchTab({
+        url: '/pages/WorkOrderApproval/index'
+    })
+}
+
+// 撤回
+const handleWithdraw = () => {
+    uni.showModal({
+        title: '提示',
+        content: '确定要撤回该工单吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // TODO: 调用撤回接口
+                uni.showToast({
+                    title: '撤回成功',
+                    icon: 'success'
+                })
+            }
+        }
+    })
+}
+
+// 提交实施
+const handleSubmit = async () => {
+    if (!projectId.value) {
+        uni.showToast({
+            title: '缺少项目ID',
+            icon: 'none'
+        })
+        return
+    }
+    
+    uni.showModal({
+        title: '提示',
+        content: '确定要提交实施吗？',
+        success: async (res) => {
+            if (res.confirm) {
+                try {
+                    await submitImplementation(projectId.value)
+                    uni.showToast({
+                        title: '提交成功',
+                        icon: 'success'
+                    })
+                    // 提交成功后跳转到工单审批查询页
+                    setTimeout(() => {
+                        uni.switchTab({
+                            url: '/pages/WorkOrderApproval/index'
+                        })
+                    }, 1500)
+                } catch (error) {
+                    console.error('提交实施失败:', error)
+                    uni.showToast({
+                        title: error.message || '提交失败',
+                        icon: 'none'
+                    })
+                }
+            }
+        }
+    })
+}
+
+// 点击高风险票卡片
+const handleRiskControlCardClick = () => {
+    // 只有当状态为"待填写"时才跳转
+    if (!workTicketDetail.value || workTicketDetail.value.riskControlCardId) {
+        return
+    }
+    
+    // 获取工作票ID（优先使用详情中的ID，其次使用路由参数中的ID）
+    const ticketId = workTicketDetail.value.id || workTicketDetail.value.ticketId || workTicketId.value
+    
+    // 检查必要参数
+    if (!projectId.value || !ticketId) {
+        uni.showToast({
+            title: '缺少必要参数',
+            icon: 'none'
+        })
+        return
+    }
+    
+    // 构建跳转参数：待填写时统一跳转到“填写工作票”步骤
+    const params = {
+        projectId: projectId.value,
+        workTicketId: ticketId,
+        step: 3 // 填写工作票步骤
+    }
+    
+    // 跳转到工单编辑页面
+    uni.navigateTo({
+        url: `/pages/WorkOrderEdit/index?${Object.keys(params).map(key => `${key}=${params[key]}`).join('&')}`
+    })
+}
+
+// 点击监控球机申领卡片
+const handleCameraApplicationClick = () => {
+    // 只有当状态为"待填写"时才跳转
+    if (!workTicketDetail.value || workTicketDetail.value.cameraApplicationId) {
+        return
+    }
+    
+    // 获取工作票ID（优先使用详情中的ID，其次使用路由参数中的ID）
+    const ticketId = workTicketDetail.value.id || workTicketDetail.value.ticketId || workTicketId.value
+    
+    // 检查必要参数
+    if (!projectId.value || !ticketId) {
+        uni.showToast({
+            title: '缺少必要参数',
+            icon: 'none'
+        })
+        return
+    }
+    
+    // 构建跳转参数：待填写时统一跳转到“填写工作票”步骤
+    const params = {
+        projectId: projectId.value,
+        workTicketId: ticketId,
+        step: 3 // 填写工作票步骤
+    }
+    
+    // 跳转到工单编辑页面
+    uni.navigateTo({
+        url: `/pages/WorkOrderEdit/index?${Object.keys(params).map(key => `${key}=${params[key]}`).join('&')}`
+    })
+}
+
+// 页面加载
+onMounted(() => {
+    const pages = getCurrentPages()
+    const currentPage = pages[pages.length - 1]
+    if (currentPage && currentPage.options) {
+        projectId.value = currentPage.options.projectId
+        workTicketId.value = currentPage.options.workTicketId || currentPage.options.ticketId
+        
+        // 如果只有工作票ID，直接获取工作票详情
+        if (workTicketId.value && !projectId.value) {
+            fetchWorkTicketDetail(workTicketId.value)
+        } else if (projectId.value) {
+            // 获取工作计划详情，如果工作计划详情中包含工作票ID，会自动调用 fetchWorkTicketDetail
+            fetchWorkPlanDetail()
+        }
+    }
+})
+</script>
 <style lang="scss" scoped>
 .FlexBox {
     display: flex;
@@ -31,50 +650,396 @@
 }
 
 .PageBox {
-    background-color: #ff9900;
+    background-color: #f5f5f5;
     height: 100vh;
     overflow: hidden;
+    display: flex;
+    flex-direction: column;
 
     .TopBox {
-        height: 100rpx;
-        padding: 20rpx;
+        height: 88rpx;
+        padding: 0 24rpx;
         background-color: #fff;
+        border-bottom: 1rpx solid #eee;
+        position: relative;
+        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+        
         .iconBox {
-           font-size: 32rpx;
+            font-size: 32rpx;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            
+            .BackText {
+                margin-left: 8rpx;
+                font-size: 28rpx;
+                color: #333;
+            }
         }
-        .Title{
+        
+        .Title {
             font-size: 32rpx;
             font-weight: bold;
             color: #333;
-        }
-        .informBox {
-          .MsgTxt{
-            padding: 8rpx;
-            background-color: hsla(17, 100%, 50%, 0.849);
-            color: #fff;
+            flex: 1;
+            text-align: center;
             position: absolute;
-            top: 16rpx;
-            right: 16rpx;
-            border-radius: 50%;
-          }
+            left: 50%;
+            transform: translateX(-50%);
+        }
+        
+        .informBox {
+            position: relative;
+            z-index: 1;
+            
+            .MsgTxt {
+                position: absolute;
+                top: -10rpx;
+                right: -10rpx;
+                min-width: 32rpx;
+                height: 32rpx;
+                padding: 0 8rpx;
+                background-color: #fa3534;
+                color: #fff;
+                border-radius: 16rpx;
+                font-size: 20rpx;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-weight: 500;
+            }
         }
     }
 
     .ContentBox {
+        flex: 1;
+        overflow-y: auto;
         padding: 20rpx;
-        background-color: #c5d5d6;
-        height: calc(100vh - 200rpx);
-        overflow: hidden;
+        background-color: #f5f5f5;
     }
 
     .FootBox {
-        height: 100rpx;
+        height: 120rpx;
         display: flex;
         align-items: center;
         justify-content: space-between;
         gap: 20rpx;
         padding: 20rpx;
         background-color: #fff;
+        border-top: 1rpx solid #eee;
+        box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
+    }
+    
+    .FootButton {
+        flex: 1;
+        height: 80rpx;
+        line-height: 80rpx;
+        text-align: center;
+        border-radius: 8rpx;
+        font-size: 28rpx;
+        font-weight: 500;
+        
+        &.withdraw-btn {
+            background-color: #f5f5f5;
+            color: #666;
+        }
+        
+        &.submit-btn {
+            background-color: #2979ff;
+            color: #fff;
+        }
+    }
+}
+
+// 进度指示器
+.ProgressBox {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    padding: 40rpx 30rpx;
+    background-color: #fff;
+    border-radius: 16rpx;
+    margin-bottom: 20rpx;
+    position: relative;
+}
+
+.ProgressItem {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    min-width: 0;
+}
+
+.ProgressCircle {
+    width: 64rpx;
+    height: 64rpx;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    z-index: 2;
+    flex-shrink: 0;
+    
+    &.completed {
+        background-color: #19be6b;
+    }
+    
+    &.active {
+        background-color: #2979ff;
+    }
+    
+    &.pending {
+        background-color: #c0c4cc;
+    }
+}
+
+.ProgressDot {
+    width: 16rpx;
+    height: 16rpx;
+    border-radius: 50%;
+    background-color: #fff;
+}
+
+.ProgressLabel {
+    margin-top: 20rpx;
+    font-size: 22rpx;
+    text-align: center;
+    line-height: 1.4;
+    word-break: break-all;
+    
+    &.completed,
+    &.active {
+        color: #333;
+        font-weight: 500;
+    }
+    
+    &.pending {
+        color: #999;
+    }
+}
+
+.ProgressLine {
+    position: absolute;
+    top: 32rpx;
+    left: calc(50% + 32rpx);
+    width: calc(100% - 64rpx);
+    height: 2rpx;
+    background-color: #e4e7ed;
+    z-index: 1;
+    
+    &.completed {
+        background-color: #19be6b;
+    }
+}
+
+// 区块样式
+.SectionBox {
+    background-color: #fff;
+    border-radius: 16rpx;
+    padding: 32rpx;
+    margin-bottom: 20rpx;
+    
+    // 可点击的卡片样式
+    &.clickable-card {
+        cursor: pointer;
+        transition: all 0.3s;
+        
+        &:active {
+            opacity: 0.8;
+            transform: scale(0.98);
+        }
+        
+        .EmptyBox {
+            cursor: pointer;
+            
+            .EmptyText {
+                color: #2979ff;
+                text-decoration: underline;
+            }
+        }
+    }
+}
+
+.SectionTitle {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 32rpx;
+    padding-bottom: 24rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+}
+
+// 信息项
+.InfoItem {
+    display: flex;
+    margin-bottom: 28rpx;
+    align-items: flex-start;
+    
+    &:last-child {
+        margin-bottom: 0;
+    }
+}
+
+.InfoLabel {
+    width: 200rpx;
+    font-size: 28rpx;
+    color: #666;
+    flex-shrink: 0;
+    line-height: 1.6;
+}
+
+.InfoValue {
+    flex: 1;
+    font-size: 28rpx;
+    color: #333;
+    word-break: break-all;
+    line-height: 1.6;
+}
+
+// 风险等级标签
+.RiskTag {
+    display: inline-block;
+    padding: 8rpx 24rpx;
+    border-radius: 40rpx;
+    font-size: 24rpx;
+    font-weight: 500;
+    
+    &.risk-low {
+        background-color: #e8f5e9;
+        color: #4caf50;
+    }
+    
+    &.risk-medium {
+        background-color: #fff3e0;
+        color: #ff9800;
+    }
+    
+    &.risk-high {
+        background-color: #ffebee;
+        color: #f44336;
+    }
+}
+
+// 附件预览
+.AttachmentBox {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    margin-top: 10rpx;
+}
+
+.AttachmentItem {
+    width: 160rpx;
+    height: 160rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+    background-color: #f5f5f5;
+    border: 1rpx solid #e0e0e0;
+}
+
+.AttachmentImg {
+    width: 100%;
+    height: 100%;
+}
+
+.AttachmentFile {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 20rpx;
+}
+
+.FileIcon {
+    width: 60rpx;
+    height: 60rpx;
+    margin-bottom: 10rpx;
+}
+
+.FileName {
+    font-size: 20rpx;
+    color: #666;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 100%;
+}
+
+// 审核记录
+.ApprovalItem {
+    padding: 24rpx 0;
+    border-bottom: 1rpx solid #f0f0f0;
+    
+    &:last-child {
+        border-bottom: none;
+        padding-bottom: 0;
+    }
+    
+    &:first-child {
+        padding-top: 0;
+    }
+}
+
+.ApprovalHeader {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16rpx;
+}
+
+.ApprovalName {
+    font-size: 28rpx;
+    font-weight: 500;
+    color: #333;
+}
+
+.ApprovalTime {
+    font-size: 24rpx;
+    color: #999;
+}
+
+.ApprovalContent {
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.8;
+}
+
+// 空状态
+.EmptyBox {
+    padding: 60rpx 0;
+    text-align: center;
+    background-color: #f9f9f9;
+    border-radius: 8rpx;
+}
+
+.EmptyText {
+    font-size: 28rpx;
+    color: #999;
+}
+
+// 状态标签
+.StatusTag {
+    display: inline-block;
+    margin-left: 16rpx;
+    padding: 4rpx 16rpx;
+    border-radius: 20rpx;
+    font-size: 22rpx;
+    font-weight: 500;
+    
+    &.status-filled {
+        background-color: #e8f5e9;
+        color: #4caf50;
+    }
+    
+    &.status-pending {
+        background-color: #fff3e0;
+        color: #ff9800;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/WorkOrderEdit/compoents/ApplyForMachine.vue b/src/pages/WorkOrderEdit/compoents/ApplyForMachine.vue
index 7c888da..021e38b 100644
--- a/src/pages/WorkOrderEdit/compoents/ApplyForMachine.vue
+++ b/src/pages/WorkOrderEdit/compoents/ApplyForMachine.vue
@@ -5,7 +5,7 @@
             <view class="FormItem">
                 <view class="FormLableBox mustBox">作业地点</view>
                 <view class="FormValueBox">
-                    <u-input v-model="allData.workLocation" placeholder="请输入作业地点" readonly></u-input>
+                    <u-input v-model="displayData.workLocation" placeholder="请输入作业地点" readonly></u-input>
                 </view>
             </view>
             <view class="FormItem">
@@ -13,11 +13,11 @@
                 <view class="FormValueBox">
                     <view class="date-range-box">
                         <view class="date-item">
-                            <u-input v-model="allData.startTime" placeholder="开始时间" readonly></u-input>
+                            <u-input v-model="displayData.startTime" placeholder="开始时间" readonly></u-input>
                         </view>
                         <view class="date-separator">至</view>
                         <view class="date-item">
-                            <u-input v-model="allData.endTime" placeholder="结束时间" readonly></u-input>
+                            <u-input v-model="displayData.endTime" placeholder="结束时间" readonly></u-input>
                         </view>
                     </view>
                 </view>
@@ -35,9 +35,21 @@
                 </view>
             </view>
             <view class="FormItem">
-                <view class="FormLableBox mustBox">联系人+联系方式</view>
+                <view class="FormLableBox mustBox">联系人</view>
                 <view class="FormValueBox">
-                    <u-input v-model="formData.linkman" placeholder="请输入联系人+联系方式"></u-input>
+                    <u-input v-model="formData.contactPerson" placeholder="请输入联系人"></u-input>
+                </view>
+            </view>
+            <view class="FormItem">
+                <view class="FormLableBox mustBox">联系方式</view>
+                <view class="FormValueBox">
+                    <u-input v-model="formData.contactPhone" placeholder="请输入联系方式"></u-input>
+                </view>
+            </view>
+            <view class="FormItem">
+                <view class="FormLableBox">备注</view>
+                <view class="FormValueBox">
+                    <u-textarea v-model="formData.remark" placeholder="请输入备注（可选）"></u-textarea>
                 </view>
             </view>
         </view>
@@ -46,7 +58,7 @@
 <script setup>
 import { generateGuid } from '@/utils/index.js';
 import dayjs from 'dayjs';
-import { ref, defineExpose } from 'vue'
+import { ref, onMounted, watch, defineExpose } from 'vue'
 
 const props = defineProps({
     allData: {
@@ -55,18 +67,110 @@ const props = defineProps({
     },
 })
 
-const formData = ref({
-    applyQuantity: '', // 申领数量
-    installationSite: '', // 安装位置
-    linkman: '', // 联系人+联系方式
+// 显示数据（作业地点和作业周期）
+const displayData = ref({
+    workLocation: '', // 作业地点
+    startTime: '', // 开始时间
+    endTime: '', // 结束时间
 })
 
+const formData = ref({
+    applyQuantity: 1, // 申领数量
+    installationSite: '', // 安装位置
+    contactPerson: '', // 联系人
+    contactPhone: '', // 联系方式
+    remark: '', // 备注
+})
+
+// 从 allData 中获取作业地点和作业周期
+const updateDisplayData = () => {
+    // 优先从工作票（WorkNote）中获取
+    const workNote = props.allData?.WorkNote;
+    const basicsInfo = props.allData?.BasicsInfo;
+    
+    // 获取作业地点：优先从 WorkNote.workLocation，其次从 BasicsInfo.SpecificAddress
+    if (workNote?.workLocation) {
+        displayData.value.workLocation = workNote.workLocation;
+    } else if (basicsInfo?.SpecificAddress) {
+        displayData.value.workLocation = basicsInfo.SpecificAddress;
+    } else {
+        displayData.value.workLocation = '';
+    }
+    
+    // 获取作业周期：优先从 WorkNote.period，其次从 BasicsInfo.period
+    let period = null;
+    if (workNote?.period && Array.isArray(workNote.period) && workNote.period.length >= 2) {
+        period = workNote.period;
+    } else if (basicsInfo?.period && Array.isArray(basicsInfo.period) && basicsInfo.period.length >= 2) {
+        period = basicsInfo.period;
+    }
+    
+    if (period) {
+        displayData.value.startTime = period[0] || '';
+        displayData.value.endTime = period[1] || '';
+    } else {
+        displayData.value.startTime = '';
+        displayData.value.endTime = '';
+    }
+}
+
+// 从 allData 中恢复之前填写的数据
+const restoreFormData = (data) => {
+    if (!data || Object.keys(data).length === 0) return;
+    
+    if (data.applyQuantity !== undefined) formData.value.applyQuantity = data.applyQuantity;
+    if (data.installationSite) formData.value.installationSite = data.installationSite;
+    if (data.contactPerson) formData.value.contactPerson = data.contactPerson;
+    if (data.contactPhone) formData.value.contactPhone = data.contactPhone;
+    if (data.remark) formData.value.remark = data.remark;
+    // 兼容旧数据格式（linkman字段）
+    if (data.linkman && !data.contactPerson) {
+        // 尝试解析旧格式：如果包含电话号码，尝试拆分
+        const phoneMatch = data.linkman.match(/(\d{11}|\d{3,4}-\d{7,8})/);
+        if (phoneMatch) {
+            const phone = phoneMatch[0];
+            formData.value.contactPerson = data.linkman.replace(phone, '').trim();
+            formData.value.contactPhone = phone;
+        } else {
+            formData.value.contactPerson = data.linkman;
+        }
+    }
+};
+
+// 监听 allData.ApplyForMachine 的变化，恢复表单数据
+watch(() => props.allData?.ApplyForMachine, (newData) => {
+    if (newData && Object.keys(newData).length > 0) {
+        restoreFormData(newData);
+    }
+}, { immediate: true, deep: true });
+
+// 监听 allData.WorkNote 和 allData.BasicsInfo 的变化，更新显示数据
+watch(() => [props.allData?.WorkNote, props.allData?.BasicsInfo], () => {
+    updateDisplayData();
+}, { immediate: true, deep: true });
+
+// 数量变化事件
+const valChange = (val) => {
+    console.log('申领数量变化：', val);
+}
+
 defineExpose({
     getFormData() {
         return formData.value;
     }
 })
 
+// 生命周期钩子函数
+onMounted(() => {
+    // 更新显示数据（作业地点和作业周期）
+    updateDisplayData();
+    
+    // 组件挂载后，从 allData 中恢复数据
+    if (props.allData?.ApplyForMachine && Object.keys(props.allData.ApplyForMachine).length > 0) {
+        restoreFormData(props.allData.ApplyForMachine);
+    }
+});
+
 </script>
 <style lang="scss" scoped>
 .BlueTxt {
diff --git a/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue b/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue
index d8320a3..0a55fe8 100644
--- a/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue
+++ b/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue
@@ -71,8 +71,16 @@
     </view>
 </template>
 <script setup>
-import { ref, computed, onMounted, defineExpose } from "vue";
+import { ref, computed, onMounted, watch, defineExpose } from "vue";
 import dayjs from 'dayjs';
+import { getUserList } from '@/api';
+
+const props = defineProps({
+    allData: {
+        type: Object,
+        default: () => ({})
+    }
+})
 
 // 地图实例
 let mapEntity = null;
@@ -97,18 +105,7 @@ const endDateMinTimestamp = computed(() => {
 
 const showMemberPicker = ref(false); // 是否显示成员选择器
 //成员列表信息
-const MemberArr = ref([
-    {
-        id: "123456", // 成员ID
-        name: "张三", // 成员姓名
-        phone: "13800000000", // 成员手机号
-    },
-    {
-        id: "654321", // 成员ID
-        name: "李四", // 成员姓名
-        phone: "13900000000", // 成员手机号
-    }
-]); // 作业班成员列表
+const MemberArr = ref([]); // 作业班成员列表
 
 
 
@@ -127,9 +124,90 @@ defineExpose({
     getFormData: () => formData.value,
 });
 
+// 从 allData 中恢复之前填写的数据
+const restoreFormData = (data) => {
+    if (!data || Object.keys(data).length === 0) return;
+    
+    if (data.ProjectName) formData.value.ProjectName = data.ProjectName;
+    if (data.Location) formData.value.Location = data.Location;
+    if (data.SpecificAddress) formData.value.SpecificAddress = data.SpecificAddress;
+    if (data.ResponsiblePerson) formData.value.ResponsiblePerson = data.ResponsiblePerson;
+    if (data.MemberList && Array.isArray(data.MemberList)) {
+        formData.value.MemberList = [...data.MemberList];
+    }
+    if (data.period && Array.isArray(data.period) && data.period.length >= 2) {
+        if (data.period[0]) {
+            startDateText.value = data.period[0];
+            startDate.value = dayjs(data.period[0]).valueOf();
+        }
+        if (data.period[1]) {
+            endDateText.value = data.period[1];
+            endDate.value = dayjs(data.period[1]).valueOf();
+        }
+    }
+};
+
+// 监听 allData.BasicsInfo 的变化，恢复表单数据
+watch(() => props.allData?.BasicsInfo, (newData) => {
+    if (newData && Object.keys(newData).length > 0) {
+        restoreFormData(newData);
+    }
+}, { immediate: true, deep: true });
+
+// 获取作业班成员列表
+const fetchUserList = async () => {
+    try {
+        const res = await getUserList();
+        console.log('获取用户列表成功：', res);
+        // 接口返回的数据结构为 { total: number, rows: [...], code: 200, msg: "查询成功" }
+        if (res && res.rows && Array.isArray(res.rows)) {
+            // 将用户数据转换为组件需要的格式 { id: userId, name: nickName || userName }
+            MemberArr.value = res.rows.map(user => ({
+                id: user.userId,
+                name: user.nickName || user.userName || ''
+            }));
+            console.log('转换后的成员列表：', MemberArr.value);
+        } else if (res && res.data && Array.isArray(res.data)) {
+            // 兼容其他可能的数据结构
+            MemberArr.value = res.data.map(user => ({
+                id: user.userId || user.id,
+                name: user.nickName || user.userName || user.name || ''
+            }));
+        } else if (Array.isArray(res)) {
+            // 兼容直接返回数组的情况
+            MemberArr.value = res.map(user => ({
+                id: user.userId || user.id,
+                name: user.nickName || user.userName || user.name || ''
+            }));
+        } else {
+            console.warn('用户列表数据格式不正确：', res);
+            uni.showToast({
+                title: '获取用户列表失败',
+                icon: 'none',
+                duration: 2000
+            });
+        }
+    } catch (error) {
+        console.error('获取用户列表失败：', error);
+        uni.showToast({
+            title: error.message || '获取用户列表失败',
+            icon: 'none',
+            duration: 2000
+        });
+    }
+};
+
 // 生命周期钩子函数
 onMounted(() => {
     initTiandituMap();
+    
+    // 获取作业班成员列表
+    fetchUserList();
+    
+    // 组件挂载后，从 allData 中恢复数据
+    if (props.allData?.BasicsInfo && Object.keys(props.allData.BasicsInfo).length > 0) {
+        restoreFormData(props.allData.BasicsInfo);
+    }
 });
 
 
diff --git a/src/pages/WorkOrderEdit/compoents/GatePassInfo.vue b/src/pages/WorkOrderEdit/compoents/GatePassInfo.vue
index b8aae4e..a9a8e60 100644
--- a/src/pages/WorkOrderEdit/compoents/GatePassInfo.vue
+++ b/src/pages/WorkOrderEdit/compoents/GatePassInfo.vue
@@ -17,33 +17,54 @@
             <view class="FormItem">
                 <view class="FormLableBox">作业班成员</view>
                 <view class="FormValueBox">
-                    <u-input v-model="allData.BasicsInfo.JobClassMembers" placeholder="请输入作业班成员" readonly></u-input>
+                    <view class="MemberBox">
+                        <u-tag v-for="(member, index) in memberList" :key="member.id" shape="circle">
+                            {{ member.name }}
+                        </u-tag>
+                        <view v-if="!memberList || memberList.length === 0" class="empty-tip">暂无作业班成员</view>
+                    </view>
                 </view>
             </view>
             <view class="FormItem">
                 <view class="FormLableBox mustBox">出入证有效日期</view>
                 <view class="FormValueBox">
-                    <u-input v-model="formData.validTime" placeholder="请输入出入证有效日期" readonly>
-                        <template #suffix>
-                            <u-button text="选择日期" type="primary" size="small"
-                                @click="showValidTimePicker = true"></u-button>
-                        </template>
-                    </u-input>
+                    <view class="date-range-box">
+                        <view class="date-item">
+                            <u-input v-model="startValidTimeText" placeholder="开始日期" readonly>
+                                <template #suffix>
+                                    <u-button type="primary" size="small"
+                                        @click="showStartValidTimePicker = true">选择日期</u-button>
+                                </template>
+                            </u-input>
+                            <up-datetime-picker :show="showStartValidTimePicker" v-model="startValidTime" mode="date"
+                                :minDate="minTimestamp" @confirm="HandleStartValidTimeConfirm"
+                                @cancel="showStartValidTimePicker = false" format="YYYY-MM-DD"></up-datetime-picker>
+                        </view>
+                        <view class="date-separator">至</view>
+                        <view class="date-item">
+                            <u-input v-model="endValidTimeText" placeholder="结束日期" readonly>
+                                <template #suffix>
+                                    <u-button type="primary" size="small"
+                                        @click="showEndValidTimePicker = true">选择日期</u-button>
+                                </template>
+                            </u-input>
+                            <up-datetime-picker :show="showEndValidTimePicker" v-model="endValidTime" mode="date"
+                                :minDate="endValidTimeMinTimestamp" @confirm="HandleEndValidTimeConfirm"
+                                @cancel="showEndValidTimePicker = false" format="YYYY-MM-DD"></up-datetime-picker>
+                        </view>
+                    </view>
                 </view>
-                <up-datetime-picker :show="showValidTimePicker" v-model="formData.validTime" mode="date"
-                    :minDate="minTimestamp" @confirm="HandleValidTimeConfirm" @cancel="showValidTimePicker = false"
-                    format="YYYY-MM-DD"></up-datetime-picker>
             </view>
             <view class="FormItem">
                 <view class="FormLableBox FlexBox">
                     <view class="mustBox">随行车辆信息</view>
-                    <view class="addBtn" @click="showCarPicker = true">添加</view>
+                    <view class="addBtn" @click="showCarInputPopup = true">添加</view>
                 </view>
                 <view class="FormValueBox">
                     <view class="CarListBox">
                         <view v-for="item in formData.CarList" :key="item.id" class="CarItem">
                             <view class="CarInfoBox">
-                                <view class="CarTitleBox">{{ item.name }} （{{ item.code }}）</view>
+                                <view class="CarTitleBox">{{ item.code }}</view>
                                 <view class="CartypeBox">{{ item.type }}</view>
                             </view>
                             <view>
@@ -53,8 +74,26 @@
                         </view>
                     </view>
                 </view>
-                <u-picker :show="showCarPicker" :columns="[CarArr]" keyName="name" @confirm="HandleCarConfirm"
-                    @cancel="showCarPicker = false"></u-picker>
+                <!-- 车辆信息输入弹窗 -->
+                <u-popup :show="showCarInputPopup" mode="center" :round="10" @close="showCarInputPopup = false">
+                    <view class="car-input-popup">
+                        <view class="popup-title">添加车辆信息</view>
+                        <view class="popup-form">
+                            <view class="form-item">
+                                <view class="form-label">车辆类型</view>
+                                <u-input v-model="carInputForm.type" placeholder="请输入车辆类型" :maxlength="50"></u-input>
+                            </view>
+                            <view class="form-item">
+                                <view class="form-label">车牌号</view>
+                                <u-input v-model="carInputForm.code" placeholder="请输入车牌号" :maxlength="20"></u-input>
+                            </view>
+                        </view>
+                        <view class="popup-buttons">
+                            <u-button text="取消" type="info" @click="showCarInputPopup = false"></u-button>
+                            <u-button text="确定" type="primary" @click="HandleCarInputConfirm"></u-button>
+                        </view>
+                    </view>
+                </u-popup>
             </view>
             <view class="FormItem">
                 <view class="FormLableBox">附件上传</view>
@@ -70,23 +109,34 @@
                     </up-upload>
                 </view>
                 <view class="UpFileListBox">
-                    <view v-for="item in fileList1" :key="item.url" class="UpFileItem">
+                    <view v-for="item in fileList1" :key="item.fid || item.url" class="UpFileItem">
                         <view>
                             <view class="UpFileName">{{ item.name }}</view>
                             <view class="UpFileSize">{{ item.size }}</view>
+                            <view v-if="item.uploading" class="UpFileStatus">上传中...</view>
                         </view>
 
-                        <u-button text="删除" type="primary" size="small" @click="deletePic(item.fid)"></u-button>
+                        <u-button text="删除" type="primary" size="small" :disabled="item.uploading"
+                            @click="deletePic(item.fid)">
+                        </u-button>
                     </view>
                 </view>
             </view>
+            <view class="FormItem">
+                <view class="FormLableBox">备注</view>
+                <view class="FormValueBox">
+                    <u-input v-model="formData.remark" type="textarea" :maxlength="500" placeholder="请输入备注信息"
+                        :autoHeight="true"></u-input>
+                </view>
+            </view>
         </view>
     </view>
 </template>
 <script setup>
 import { generateGuid } from '@/utils/index.js';
 import dayjs from "dayjs";
-import { ref, defineExpose } from "vue";
+import { ref, computed, onMounted, watch, defineExpose } from "vue";
+import { uploadFileApi } from '@/api/modules/workTicket';
 
 const props = defineProps({
     allData: {
@@ -95,36 +145,45 @@ const props = defineProps({
     }
 })
 
-const showValidTimePicker = ref(false); // 出入证有效日期选择器是否显示
+const showStartValidTimePicker = ref(false); // 出入证开始有效日期选择器是否显示
+const showEndValidTimePicker = ref(false); // 出入证结束有效日期选择器是否显示
+const startValidTime = ref(null); // 开始有效日期时间戳
+const endValidTime = ref(null); // 结束有效日期时间戳
+const startValidTimeText = ref(''); // 开始有效日期显示文本
+const endValidTimeText = ref(''); // 结束有效日期显示文本
 const minTimestamp = ref(dayjs('2020-01-01').valueOf()); // 最小可选日期时间戳
-const showCarPicker = ref(false); // 随行车辆选择器是否显示
+const showCarInputPopup = ref(false); // 车辆信息输入弹窗是否显示
 
-// 车辆选项列表
-const CarArr = ref([
-    {
-        id: 1,
-        name: '车辆1',
-        type: '皮卡车',
-        code: '京A123456',
-    },
-    {
-        id: 2,
-        name: '车辆2',
-        type: '轿车',
-        code: '京B123456',
-    },
-]);
+// 结束有效日期的最小时间戳（不能小于开始日期）
+const endValidTimeMinTimestamp = computed(() => {
+    if (startValidTime.value) {
+        return startValidTime.value;
+    }
+    return minTimestamp.value;
+});
+
+// 车辆信息输入表单
+const carInputForm = ref({
+    type: '', // 车辆类型
+    code: '', // 车牌号
+});
 
 // 组件数据
 const formData = ref({
-    validTime: '', // 出入证有效日期
+    validTime: '', // 出入证有效日期（格式：YYYY-MM-DD 或 YYYY-MM-DD 至 YYYY-MM-DD）
     CarList: [], // 随行车辆数组
+    remark: '', // 备注
 })
 
 const fileList1 = ref([]); // 上传的文件列表
 
+// 从基础信息中获取作业班成员列表
+const memberList = computed(() => {
+    return props.allData?.BasicsInfo?.MemberList || [];
+});
+
 // 处理上传文件事件
-const afterRead = (e) => {
+const afterRead = async (e) => {
     console.log('上传的文件：', e);
     let fileInfo = e.file[0];
     // 判断文件大小
@@ -144,14 +203,62 @@ const afterRead = (e) => {
         return;
     }
 
-    let arr = [...fileList1.value];
-    arr.push({
-        fid: generateGuid(),
+    // 生成临时文件ID，用于标识上传中的文件
+    const tempFid = generateGuid();
+    const tempFile = {
+        fid: tempFid,
         name: fileInfo.name,
         size: (fileInfo.size / 1024 / 1024).toFixed(2) + 'MB',
         url: fileInfo.url,
-    });
-    fileList1.value = arr;
+        uploading: true // 标记为上传中
+    };
+
+    // 先添加到列表，显示上传状态
+    fileList1.value.push(tempFile);
+
+    try {
+        // 调用上传接口
+        const uploadResult = await uploadFileApi(
+            fileInfo.url, // 文件路径
+            'file', // 文件字段名
+            {}, // 额外的表单数据
+            { loading: true, loadingText: '上传中...' }
+        );
+
+        // 上传成功，更新文件信息
+        // 接口返回的数据结构: { name: "文件名", url: "文件URL" }
+        const serverUrl = uploadResult?.url || fileInfo.url;
+        const serverFileName = uploadResult?.name || fileInfo.name;
+        // 使用服务器返回的文件名作为唯一标识，如果没有则使用临时ID
+        const fileId = uploadResult?.name || tempFid;
+
+        // 更新文件列表中的对应项
+        const fileIndex = fileList1.value.findIndex(item => item.fid === tempFid);
+        if (fileIndex !== -1) {
+            fileList1.value[fileIndex] = {
+                fid: fileId,
+                name: serverFileName, // 使用服务器返回的文件名
+                size: (fileInfo.size / 1024 / 1024).toFixed(2) + 'MB',
+                url: serverUrl, // 使用服务器返回的URL
+                uploading: false
+            };
+        }
+
+        uni.showToast({
+            title: '上传成功',
+            icon: 'success',
+            duration: 1500
+        });
+    } catch (error) {
+        console.error('文件上传失败：', error);
+        // 上传失败，从列表中移除
+        fileList1.value = fileList1.value.filter(item => item.fid !== tempFid);
+        uni.showToast({
+            title: '上传失败，请重试',
+            icon: 'none',
+            duration: 2000
+        });
+    }
 }
 
 // 删除上传的文件
@@ -162,71 +269,211 @@ const deletePic = (fid) => {
     fileList1.value = arr;
 }
 
+// 从 allData 中恢复之前填写的数据
+const restoreFormData = (data) => {
+    if (!data || Object.keys(data).length === 0) return;
+
+    if (data.validTime) {
+        formData.value.validTime = data.validTime;
+        // 解析有效日期，恢复开始和结束日期
+        const timeStr = data.validTime.trim();
+        if (timeStr.includes('至')) {
+            const parts = timeStr.split('至').map(s => s.trim());
+            if (parts[0]) {
+                startValidTimeText.value = parts[0];
+                startValidTime.value = dayjs(parts[0]).valueOf();
+            }
+            if (parts[1]) {
+                endValidTimeText.value = parts[1];
+                endValidTime.value = dayjs(parts[1]).valueOf();
+            }
+        } else {
+            startValidTimeText.value = timeStr;
+            startValidTime.value = dayjs(timeStr).valueOf();
+        }
+    }
+    if (data.CarList && Array.isArray(data.CarList)) {
+        formData.value.CarList = [...data.CarList];
+    }
+    if (data.remark) formData.value.remark = data.remark;
+    // 恢复文件列表（如果需要的话，可以从 data 中恢复）
+    // if (data.fileList && Array.isArray(data.fileList)) {
+    //     fileList1.value = [...data.fileList];
+    // }
+};
+
+// 监听 allData.GatePassInfo 的变化，恢复表单数据
+watch(() => props.allData?.GatePassInfo, (newData) => {
+    if (newData && Object.keys(newData).length > 0) {
+        restoreFormData(newData);
+    }
+}, { immediate: true, deep: true });
+
 // 组件暴露方法
 defineExpose({
     getFormData() {
-        return formData.value;
+        // 解析有效日期，支持 "YYYY-MM-DD" 或 "YYYY-MM-DD 至 YYYY-MM-DD" 格式
+        let validityStartTime = '';
+        let validityEndTime = '';
+
+        if (formData.value.validTime) {
+            const timeStr = formData.value.validTime.trim();
+            if (timeStr.includes('至')) {
+                // 包含"至"的情况，拆分开始和结束日期
+                const parts = timeStr.split('至').map(s => s.trim());
+                validityStartTime = parts[0] ? `${parts[0]} 08:00:00` : '';
+                validityEndTime = parts[1] ? `${parts[1]} 18:00:00` : '';
+            } else {
+                // 单个日期，作为开始日期，结束日期设为同一天
+                validityStartTime = `${timeStr} 08:00:00`;
+                validityEndTime = `${timeStr} 18:00:00`;
+            }
+        }
+
+        // 转换车辆列表格式
+        const vehicleList = formData.value.CarList.map(car => ({
+            licensePlate: car.code || '',
+            vehicleType: car.type || ''
+        }));
+
+        // 提取附件URL列表（只返回已上传成功的文件，排除上传中的文件）
+        const attachmentList = fileList1.value
+            .filter(file => !file.uploading && file.url) // 过滤掉上传中的文件和没有URL的文件
+            .map(file => file.url || '')
+            .filter(url => url);
+
+        // 从基础信息中获取项目ID和作业地点
+        const projectId = props.allData?.BasicsInfo?.projectId || null;
+        const workLocation = props.allData?.BasicsInfo?.SpecificAddress || '';
+
+        // 调试信息：打印 projectId 的值
+        console.log('GatePassInfo getFormData - projectId:', projectId);
+        console.log('GatePassInfo getFormData - allData.BasicsInfo:', props.allData?.BasicsInfo);
+
+        // 从基础信息中获取成员ID列表
+        const memberList = props.allData?.BasicsInfo?.MemberList || [];
+        const sysUserIds = memberList.map(member => {
+            // 如果成员ID是字符串，尝试转换为数字
+            const id = member.id;
+            return typeof id === 'string' ? parseInt(id) || id : id;
+        });
+
+        return {
+            projectId,
+            workLocation,
+            sysUserIds,
+            validityStartTime,
+            validityEndTime,
+            vehicleList,
+            attachmentList,
+            remark: formData.value.remark || ''
+        };
     }
 })
 
+// 生命周期钩子函数
+onMounted(() => {
+    // 组件挂载后，从 allData 中恢复数据
+    if (props.allData?.GatePassInfo && Object.keys(props.allData.GatePassInfo).length > 0) {
+        restoreFormData(props.allData.GatePassInfo);
+    }
+});
 
 
-// 处理出入证有效日期选择器确认事件
-const HandleValidTimeConfirm = (e) => {
+
+// 处理出入证开始有效日期选择器确认事件
+const HandleStartValidTimeConfirm = (e) => {
     const selectedDate = (e.value && dayjs(e.value).isValid()) ? e.value : minTimestamp.value;
-    formData.value.validTime = dayjs(selectedDate).format('YYYY-MM-DD');
-    showValidTimePicker.value = false;
+    startValidTimeText.value = dayjs(selectedDate).format('YYYY-MM-DD');
+    startValidTime.value = selectedDate;
+    endValidTimeText.value = '';
+    endValidTime.value = null;
+    showStartValidTimePicker.value = false;
+    updateValidTime();
 }
 
-// 处理车辆选择确认事件
-const HandleCarConfirm = (e) => {
-    console.log('选中的车辆：', e);
-    if (e.value && e.value.length > 0) {
-        const selectedCar = e.value[0];
-        console.log('选中的车辆：', selectedCar);
-        console.log('selectedCar 的类型:', typeof selectedCar);
+// 处理出入证结束有效日期选择器确认事件
+const HandleEndValidTimeConfirm = (e) => {
+    const selectedDate = (e.value && dayjs(e.value).isValid()) ? e.value : minTimestamp.value;
 
-        let carInfo;
-
-        // 判断返回的是对象还是字符串
-        if (typeof selectedCar === 'object' && selectedCar !== null) {
-            // 如果是对象，直接使用
-            carInfo = selectedCar;
-            console.log('返回的是对象，直接使用：', carInfo);
-        } else {
-            // 如果是字符串，从 CarArr 中根据id查找
-            carInfo = CarArr.value.find(item => item.id === selectedCar);
-            console.log('返回的是字符串，从 CarArr 根据id查找：', carInfo);
-        }
-
-        if (carInfo && carInfo.id) {
-            // 根据id检查车辆是否已存在
-            const isExist = formData.value.CarList.some(item => item.id === carInfo.id);
-            console.log('车辆是否已存在：', isExist);
-
-            if (!isExist) {
-                formData.value.CarList.push({
-                    id: carInfo.id,
-                    name: carInfo.name,
-                    code: carInfo.code,
-                    type: carInfo.type
-                });
-                console.log('添加车辆成功：', carInfo);
-                console.log('添加后的车辆列表：', formData.value.CarList);
-            } else {
-                uni.showToast({
-                    title: '该车辆已存在',
-                    icon: 'none',
-                    duration: 2000
-                });
-            }
-        } else {
-            console.log('未找到车辆信息或车辆信息无效');
-        }
-    } else {
-        console.log('e.value 为空或长度为0');
+    // 检查是否选择了开始日期
+    if (startValidTime.value && dayjs(selectedDate).isBefore(dayjs(startValidTime.value))) {
+        uni.showToast({
+            title: '结束日期不能小于开始日期',
+            icon: 'none',
+            duration: 2000
+        });
+        return;
     }
-    showCarPicker.value = false;
+
+    endValidTimeText.value = dayjs(selectedDate).format('YYYY-MM-DD');
+    endValidTime.value = selectedDate;
+    showEndValidTimePicker.value = false;
+    updateValidTime();
+}
+
+// 更新出入证有效日期
+const updateValidTime = () => {
+    if (startValidTimeText.value && endValidTimeText.value) {
+        formData.value.validTime = `${startValidTimeText.value} 至 ${endValidTimeText.value}`;
+    } else if (startValidTimeText.value) {
+        formData.value.validTime = startValidTimeText.value;
+    } else {
+        formData.value.validTime = '';
+    }
+}
+
+// 处理车辆信息输入确认事件
+const HandleCarInputConfirm = () => {
+    // 验证输入
+    if (!carInputForm.value.type || carInputForm.value.type.trim() === '') {
+        uni.showToast({
+            title: '请输入车辆类型',
+            icon: 'none',
+            duration: 2000
+        });
+        return;
+    }
+    if (!carInputForm.value.code || carInputForm.value.code.trim() === '') {
+        uni.showToast({
+            title: '请输入车牌号',
+            icon: 'none',
+            duration: 2000
+        });
+        return;
+    }
+
+    // 检查车牌号是否已存在
+    const isExist = formData.value.CarList.some(item => item.code === carInputForm.value.code.trim());
+    if (isExist) {
+        uni.showToast({
+            title: '该车牌号已存在',
+            icon: 'none',
+            duration: 2000
+        });
+        return;
+    }
+
+    // 添加车辆信息
+    const newCar = {
+        id: generateGuid(), // 使用生成唯一ID
+        type: carInputForm.value.type.trim(),
+        code: carInputForm.value.code.trim()
+    };
+
+    formData.value.CarList.push(newCar);
+    console.log('添加车辆成功：', newCar);
+
+    // 清空表单并关闭弹窗
+    carInputForm.value.type = '';
+    carInputForm.value.code = '';
+    showCarInputPopup.value = false;
+
+    uni.showToast({
+        title: '添加成功',
+        icon: 'success',
+        duration: 1500
+    });
 };
 
 // 删除车辆
@@ -288,6 +535,12 @@ const HandleDeleteCar = (carId) => {
             font-size: 24rpx;
             color: #666;
         }
+
+        .UpFileStatus {
+            font-size: 24rpx;
+            color: #2979ff;
+            margin-top: 10rpx;
+        }
     }
 }
 
@@ -371,7 +624,81 @@ const HandleDeleteCar = (carId) => {
         .FormValueBox {
             font-size: 30rpx;
             margin-top: 20rpx;
+
+            .MemberBox {
+                min-height: 60rpx;
+                display: flex;
+                align-items: center;
+                justify-content: flex-start;
+                gap: 20rpx;
+                flex-wrap: wrap;
+                border: 1rpx solid #e4e7ed;
+                padding: 20rpx;
+                border-radius: 10rpx;
+
+                .empty-tip {
+                    color: #999;
+                    font-size: 28rpx;
+                }
+            }
+
+            .date-range-box {
+                display: flex;
+                align-items: center;
+                gap: 20rpx;
+                flex: 1;
+
+                .date-item {
+                    flex: 1;
+                }
+
+                .date-separator {
+                    color: #999;
+                    font-size: 28rpx;
+                }
+            }
         }
     }
 }
+
+// 车辆信息输入弹窗样式
+.car-input-popup {
+    width: 600rpx;
+    padding: 40rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+
+    .popup-title {
+        font-size: 36rpx;
+        font-weight: bold;
+        color: #333;
+        text-align: center;
+        margin-bottom: 40rpx;
+    }
+
+    .popup-form {
+        display: flex;
+        flex-direction: column;
+        gap: 30rpx;
+        margin-bottom: 40rpx;
+
+        .form-item {
+            display: flex;
+            flex-direction: column;
+            gap: 20rpx;
+
+            .form-label {
+                font-size: 28rpx;
+                color: #333;
+                font-weight: 500;
+            }
+        }
+    }
+
+    .popup-buttons {
+        display: flex;
+        gap: 20rpx;
+        justify-content: space-between;
+    }
+}
 </style>
diff --git a/src/pages/WorkOrderEdit/compoents/RiskControl.vue b/src/pages/WorkOrderEdit/compoents/RiskControl.vue
index 22961dc..754da28 100644
--- a/src/pages/WorkOrderEdit/compoents/RiskControl.vue
+++ b/src/pages/WorkOrderEdit/compoents/RiskControl.vue
@@ -4,53 +4,48 @@
         <view class="FormBox">
             <view class="H2Box">基础信息</view>
             <view class="FormItem">
-                <view class="FormLableBox FlexBox">
-                    <view class="mustBox">所属单位</view>
-                    <view class="addBtn" @click="showUnitNamePicker = true">选择</view>
-                </view>
+                <view class="FormLableBox mustBox">所属单位</view>
                 <view class="FormValueBox">
-                    <view class="BorderBox">
-                        <view class="grayFont" v-if="!formData.unitName">请选择所属单位</view>
-                        <view v-else>{{ formData.unitName }}</view>
-                    </view>
-                    <u-picker v-model="formData.unitName" :columns="[unitNameList]" :show="showUnitNamePicker"
-                        keyName="name" @confirm="confirmUnitNamePicker" @cancel="showUnitNamePicker = false"></u-picker>
+                    <u-input v-model="formData.unitName" placeholder="所属单位" readonly></u-input>
                 </view>
             </view>
             <view class="FormItem">
                 <view class="FormLableBox mustBox">票证编号</view>
                 <view class="FormValueBox">
-                    <u-input v-model="formData.serialNumber" placeholder="请输入票证编号" readonly></u-input>
+                    <u-input v-model="formData.ticketNumber" placeholder="请输入票证编号" readonly></u-input>
                 </view>
             </view>
             <view class="FormItem">
                 <view class="FormLableBox mustBox">工作内容</view>
                 <view class="FormValueBox">
-                    <u-input v-model="formData.workContent" placeholder="请输入工作内容"></u-input>
+                    <u-input v-model="formData.workContent" placeholder="请输入工作内容" :readonly="isWorkTicketDetailLoaded"></u-input>
                 </view>
             </view>
             <view class="FormItem">
                 <view class="FormLableBox FlexBox">
                     <view class="mustBox">工作负责人</view>
-                    <view class="addBtn" @click="showWorkResponsiblePicker = true">选择</view>
+                    <view class="addBtn" v-if="!isWorkTicketDetailLoaded" @click="showWorkResponsiblePicker = true">选择</view>
                 </view>
                 <view class="FormValueBox">
                     <view class="BorderBox">
                         <view class="grayFont" v-if="!formData.workResponsible">请选择工作负责人</view>
                         <view v-else>{{ formData.workResponsible }}</view>
                     </view>
-                    <u-picker v-model="formData.workResponsible" :columns="[workResponsibleList]"
+                    <u-picker v-if="!isWorkTicketDetailLoaded" v-model="formData.workResponsible" :columns="[workResponsibleList]"
                         :show="showWorkResponsiblePicker" keyName="name" @confirm="confirmWorkResponsiblePicker"
                         @cancel="showWorkResponsiblePicker = false"></u-picker>
                 </view>
             </view>
 
             <view class="H2Box">检查内容</view>
-            <view class="CardBox">
-                <view class="CardBoxItem" v-for="(item, index) in checkContentList" :key="item.id">
-                    {{ index + 1 }}： {{ item.name }}
+            <view class="CardBox" v-if="checkContentList.length > 0">
+                <view class="CardBoxItem" v-for="(item, index) in checkContentList" :key="item.id || index">
+                    第{{ index + 1 }}项： {{  item.itemDescription }}
                 </view>
             </view>
+            <view class="CardBox" v-else>
+                <view class="CardBoxItem grayFont">暂无检查内容</view>
+            </view>
 
             <view class="H2Box">附件上传</view>
             <view style="margin-top: 20rpx;">
@@ -65,13 +60,16 @@
                 </up-upload>
             </view>
             <view class="UpFileListBox">
-                <view v-for="item in fileList1" :key="item.url" class="UpFileItem">
+                <view v-for="item in fileList1" :key="item.fid || item.url" class="UpFileItem">
                     <view>
                         <view class="UpFileName">{{ item.name }}</view>
                         <view class="UpFileSize">{{ item.size }}</view>
+                        <view v-if="item.uploading" class="UpFileStatus">上传中...</view>
                     </view>
 
-                    <u-button text="删除" type="primary" size="small" @click="deletePic(item.fid)"></u-button>
+                    <u-button text="删除" type="primary" size="small" :disabled="item.uploading"
+                        @click="deletePic(item.fid)">
+                    </u-button>
                 </view>
             </view>
         </view>
@@ -80,14 +78,21 @@
 <script setup>
 import { generateGuid } from '@/utils/index.js';
 import dayjs from 'dayjs';
-import { ref, defineExpose } from 'vue'
+import { ref, onMounted, watch, defineExpose } from 'vue'
+import { getRiskCardTemplateDetail, uploadFileApi } from '@/api/modules/workTicket'
+import { getUserInfo } from '@/api/modules/user'
+
+const props = defineProps({
+    allData: {
+        type: Object,
+        default: () => ({})
+    },
+    templateId: {
+        type: [Number, String],
+        default: null
+    }
+})
 
-const showUnitNamePicker = ref(false); // 所属单位选择器是否显示
-const unitNameList = ref([
-    { id: 1, name: '公司11' },
-    { id: 2, name: '公司13' },
-    { id: 3, name: '公司12' },
-]);
 
 // 工作负责人选择器是否显示
 const showWorkResponsiblePicker = ref(false);
@@ -98,36 +103,216 @@ const workResponsibleList = ref([
     { id: 3, name: '王五' },
 ]);
 
-// 检查内容列表
-const checkContentList = ref([
-    { id: 1, name: '动火安全作业票中对应的安全风险分析是否齐全' },
-    { id: 2, name: '检查内容2' },
-    { id: 3, name: '检查内容3' },
-])
+// 检查内容列表（从模板中获取）
+const checkContentList = ref([])
+
+// 模板详情数据
+const templateDetail = ref(null)
 
 // 上传的文件列表
 const fileList1 = ref([]);
 
+// 标记是否已加载工作票详情（用于控制字段是否可编辑）
+const isWorkTicketDetailLoaded = ref(false);
+
 const formData = ref({
-    serialNumber: generateGuid(), // 票证编号
+    ticketNumber: generateGuid(), // 票证编号
     unitName: '', // 所属单位
     workContent: '', // 工作内容
     workResponsible: '', // 工作负责人
 })
 
+// 从 allData 中恢复之前填写的数据
+const restoreFormData = (data) => {
+    if (!data || Object.keys(data).length === 0) return;
+    
+    if (data.unitName) formData.value.unitName = data.unitName;
+    if (data.ticketNumber) formData.value.ticketNumber = data.ticketNumber;
+    if (data.workContent) formData.value.workContent = data.workContent;
+    if (data.workResponsible) formData.value.workResponsible = data.workResponsible;
+    // 恢复文件列表（如果需要的话，可以从 data 中恢复）
+    // if (data.fileList && Array.isArray(data.fileList)) {
+    //     fileList1.value = [...data.fileList];
+    // }
+};
+
+// 监听 allData.RiskControl 的变化，恢复表单数据
+watch(() => props.allData?.RiskControl, (newData) => {
+    if (newData && Object.keys(newData).length > 0) {
+        restoreFormData(newData);
+    }
+}, { immediate: true, deep: true });
+
+// 监听工作票详情数据，自动填充票证编号、工作内容、工作负责人
+watch(() => props.allData?.RiskControl?.workTicketDetail, (workTicketDetail) => {
+    if (workTicketDetail && Object.keys(workTicketDetail).length > 0) {
+        console.log('工作票详情数据：', workTicketDetail);
+        
+        // 填充票证编号
+        if (workTicketDetail.ticketNumber) {
+            formData.value.ticketNumber = workTicketDetail.ticketNumber;
+        }
+        
+        // 填充工作内容
+        if (workTicketDetail.workContent) {
+            formData.value.workContent = workTicketDetail.workContent;
+        }
+        
+        // 填充工作负责人
+        if (workTicketDetail.supervisorName) {
+            formData.value.workResponsible = workTicketDetail.supervisorName;
+        }
+        
+        // 标记已加载工作票详情，使字段不可编辑
+        isWorkTicketDetailLoaded.value = true;
+    }
+}, { immediate: true, deep: true });
+
 // 暴露方法，获取表单数据
 defineExpose({
     getFormData() {
-        return formData.value;
+        return {
+            ...formData.value,
+            // 如果需要保存文件列表，可以在这里添加
+            // fileList: fileList1.value
+        };
+    },
+    // 获取提交数据，用于提交监理审核
+    getSubmitData() {
+        // 构建检查项列表
+        const checkItems = checkContentList.value.map((item, index) => ({
+            templateItemId: item.id || item.templateItemId || (index + 1),
+            itemDescription: item.itemDescription || item.description || '',
+            checkResult: item.checkResult || '合格', // 默认检查结果为"合格"
+            sortOrder: item.sortOrder || (index + 1)
+        }));
+        
+        // 构建附件列表（提取已上传文件的URL）
+        const attachmentList = fileList1.value
+            .filter(file => !file.uploading && file.url)
+            .map(file => file.url);
+        
+        // 获取工作票详情中的信息（可能存储在多个位置）
+        const workTicketDetail = props.allData?.RiskControl?.workTicketDetail 
+            || props.allData?.workTicketDetail 
+            || {};
+        
+        // 格式化检查时间（使用当前时间，格式：yyyy-MM-ddTHH:mm）
+        const inspectionTime = dayjs().format('YYYY-MM-DDTHH:mm');
+        
+        return {
+            ticketId: props.allData?.workTicketId || null,
+            templateId: props.templateId || null,
+            ticketNumber: formData.value.ticketNumber || '',
+            operatingUnit: formData.value.unitName || '',
+            workContent: formData.value.workContent || '',
+            supervisorName: formData.value.workResponsible || workTicketDetail.supervisorName || '',
+            supervisorPosition: workTicketDetail.supervisorPosition || '',
+            contactMethod: workTicketDetail.contactMethod || workTicketDetail.contactPhone || '',
+            inspectionTime: inspectionTime,
+            checkItems: checkItems,
+            attachmentList: attachmentList
+        };
     }
 })
 
-// 确认选择所属单位
-const confirmUnitNamePicker = (e) => {
-    formData.value.unitName = e.value[0].name ? e.value[0].name : unitNameList.value[0].name;
-    showUnitNamePicker.value = false;
+// 加载风险管控卡模板详情
+const loadTemplateDetail = async (templateId) => {
+    if (!templateId) {
+        console.warn('模板ID为空，无法加载模板详情');
+        return;
+    }
+    
+    try {
+        const res = await getRiskCardTemplateDetail(templateId);
+        templateDetail.value = res;
+        console.log('风险管控卡模板详情：', res);
+        
+        // 根据模板详情更新检查内容列表
+        // 假设模板详情中包含检查项列表，字段可能是 checkItems、items、contentList 等
+        if (res) {
+            if (Array.isArray(res.checkItems)) {
+                checkContentList.value = res.checkItems;
+            } else if (Array.isArray(res.items)) {
+                checkContentList.value = res.items;
+            } else if (Array.isArray(res.contentList)) {
+                checkContentList.value = res.contentList;
+            } else if (Array.isArray(res.list)) {
+                checkContentList.value = res.list;
+            } else if (res.templateContent) {
+                // 如果模板内容是字符串，可以解析或直接显示
+                // 这里假设需要解析为列表
+                try {
+                    const parsed = typeof res.templateContent === 'string' 
+                        ? JSON.parse(res.templateContent) 
+                        : res.templateContent;
+                    if (Array.isArray(parsed)) {
+                        checkContentList.value = parsed;
+                    }
+                } catch (e) {
+                    console.warn('模板内容解析失败：', e);
+                }
+            }
+            
+            // 如果模板中有其他字段需要填充到表单中，可以在这里处理
+            if (res.workContent && !formData.value.workContent) {
+                formData.value.workContent = res.workContent;
+            }
+            if (res.templateName && !formData.value.templateName) {
+                formData.value.templateName = res.templateName;
+            }
+        }
+    } catch (error) {
+        console.error('加载风险管控卡模板详情失败：', error);
+        uni.showToast({
+            title: '加载模板详情失败',
+            icon: 'none'
+        });
+    }
 }
 
+// 监听 templateId 变化
+watch(() => props.templateId, (newTemplateId) => {
+    if (newTemplateId) {
+        loadTemplateDetail(newTemplateId);
+    }
+}, { immediate: true });
+
+// 获取用户信息
+const loadUserInfo = async () => {
+    try {
+        const res = await getUserInfo();
+        console.log('用户信息：', res);
+        // 从响应数据中获取 deptName 作为所属单位
+        if (res && res.user && res.user.dept && res.user.dept.deptName) {
+            formData.value.unitName = res.user.dept.deptName;
+        }
+    } catch (error) {
+        console.error('获取用户信息失败：', error);
+        uni.showToast({
+            title: '获取用户信息失败',
+            icon: 'none'
+        });
+    }
+}
+
+// 生命周期钩子函数
+onMounted(() => {
+    // 组件挂载后，从 allData 中恢复数据
+    if (props.allData?.RiskControl && Object.keys(props.allData.RiskControl).length > 0) {
+        restoreFormData(props.allData.RiskControl);
+    }
+    
+    // 如果有模板ID，加载模板详情
+    if (props.templateId) {
+        loadTemplateDetail(props.templateId);
+    }
+    
+    // 获取用户信息
+    loadUserInfo();
+});
+
+
 // 确认选择工作负责人
 const confirmWorkResponsiblePicker = (e) => {
     formData.value.workResponsible = e.value[0].name ? e.value[0].name : workResponsibleList.value[0].name;
@@ -135,7 +320,7 @@ const confirmWorkResponsiblePicker = (e) => {
 }
 
 // 处理上传文件事件
-const afterRead = (e) => {
+const afterRead = async (e) => {
     console.log('上传的文件：', e);
     let fileInfo = e.file[0];
     // 判断文件大小
@@ -155,14 +340,62 @@ const afterRead = (e) => {
         return;
     }
 
-    let arr = [...fileList1.value];
-    arr.push({
-        fid: generateGuid(),
+    // 生成临时文件ID，用于标识上传中的文件
+    const tempFid = generateGuid();
+    const tempFile = {
+        fid: tempFid,
         name: fileInfo.name,
         size: (fileInfo.size / 1024 / 1024).toFixed(2) + 'MB',
         url: fileInfo.url,
-    });
-    fileList1.value = arr;
+        uploading: true // 标记为上传中
+    };
+
+    // 先添加到列表，显示上传状态
+    fileList1.value.push(tempFile);
+
+    try {
+        // 调用上传接口
+        const uploadResult = await uploadFileApi(
+            fileInfo.url, // 文件路径
+            'file', // 文件字段名
+            {}, // 额外的表单数据
+            { loading: true, loadingText: '上传中...' }
+        );
+
+        // 上传成功，更新文件信息
+        // 接口返回的数据结构: { name: "文件名", url: "文件URL" }
+        const serverUrl = uploadResult?.url || fileInfo.url;
+        const serverFileName = uploadResult?.name || fileInfo.name;
+        // 使用服务器返回的文件名作为唯一标识，如果没有则使用临时ID
+        const fileId = uploadResult?.name || tempFid;
+
+        // 更新文件列表中的对应项
+        const fileIndex = fileList1.value.findIndex(item => item.fid === tempFid);
+        if (fileIndex !== -1) {
+            fileList1.value[fileIndex] = {
+                fid: fileId,
+                name: serverFileName, // 使用服务器返回的文件名
+                size: (fileInfo.size / 1024 / 1024).toFixed(2) + 'MB',
+                url: serverUrl, // 使用服务器返回的URL
+                uploading: false
+            };
+        }
+
+        uni.showToast({
+            title: '上传成功',
+            icon: 'success',
+            duration: 1500
+        });
+    } catch (error) {
+        console.error('文件上传失败：', error);
+        // 上传失败，从列表中移除
+        fileList1.value = fileList1.value.filter(item => item.fid !== tempFid);
+        uni.showToast({
+            title: '上传失败，请重试',
+            icon: 'none',
+            duration: 2000
+        });
+    }
 }
 
 // 删除上传的文件
@@ -311,6 +544,12 @@ const deletePic = (fid) => {
             font-size: 24rpx;
             color: #666;
         }
+
+        .UpFileStatus {
+            font-size: 24rpx;
+            color: #2979ff;
+            margin-top: 10rpx;
+        }
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/WorkOrderEdit/compoents/WorkNote.vue b/src/pages/WorkOrderEdit/compoents/WorkNote.vue
index cf21b2f..e123d83 100644
--- a/src/pages/WorkOrderEdit/compoents/WorkNote.vue
+++ b/src/pages/WorkOrderEdit/compoents/WorkNote.vue
@@ -5,7 +5,7 @@
             <view class="FormItem">
                 <view class="FormLableBox mustBox">票证编号</view>
                 <view class="FormValueBox">
-                    <u-input v-model="formData.serialNumber" placeholder="请输入票证编号" readonly></u-input>
+                    <u-input v-model="formData.ticketNumber" placeholder="请输入票证编号" readonly></u-input>
                 </view>
             </view>
             <view class="FormItem">
@@ -110,7 +110,7 @@
                                 </view>
                             </view>
                             <view class="FlexBox">
-                                    <u-checkbox v-model="checkedList" label="已经确认特种作业资格"></u-checkbox>
+                                    <u-checkbox v-model="item.checked" label="已经确认特种作业资格"></u-checkbox>
                                 
                             </view>
 
@@ -119,10 +119,24 @@
                 </view>
             </view>
 
-            <view class="H2Box">高风险作业专项</view>
-            <view class="FormItem">
+            <view class="H2Box" v-if="isHighRiskType">高风险作业专项</view>
+            <view class="FormItem" v-if="isHighRiskType">
                 <view class="FormLableBox FlexBox">
-                    <view >是否需要申领移动球机</view>
+                    <view class="mustBox">风险管控卡模板</view>
+                    <view class="addBtn" @click="showTemplatePicker = true">选择</view>
+                </view>
+                <view class="FormValueBox">
+                    <view class="BorderBox">
+                        <view class="grayFont" v-if="!selectedTemplate">请选择风险管控卡模板</view>
+                        <view v-else>{{ getTemplateDisplayName(selectedTemplate) }}</view>
+                    </view>
+                    <u-picker v-model="selectedTemplate" :columns="[riskCardTemplateList]" :show="showTemplatePicker"
+                        keyName="name" @confirm="confirmTemplatePicker" @cancel="showTemplatePicker = false"></u-picker>
+                </view>
+            </view>
+            <view class="FormItem" v-if="isHighRiskType">
+                <view class="FormLableBox FlexBox">
+                    <view class="mustBox">是否需要申领移动球机</view>
                     <view class="FlexBox">
                        <span>否</span> 
                        <up-switch v-model="needApplyBallMachine" @change="change"></up-switch>
@@ -141,7 +155,8 @@
 <script setup>
 import { generateGuid } from '@/utils/index.js';
 import dayjs from 'dayjs';
-import { ref, defineExpose } from 'vue'
+import { ref, onMounted, watch, defineExpose, computed, nextTick } from 'vue'
+import { getRiskCardTemplateList } from '@/api/modules/workTicket'
 
 // 定义props
 const props = defineProps({
@@ -201,32 +216,160 @@ const showMeasureBox = ref(false); // 是否显示自定义安全措施输入框
 const customSafeMeasure = ref(''); // 自定义安全措施输入框值
 
 // 作业班成员资质确认
-const memberList = ref([
-    {
-        id: 1,
-        name: '张三',
-        status: '持证',
-    },
-    {
-        id: 2,
-        name: '李四',
-        status: '未持证',
-    },
-    {
-        id: 3,
-        name: '王五',
-        status: '持证',
-    },
-])
+const memberList = ref([])
+
+// 从基础信息中更新成员列表
+const updateMemberListFromBasicsInfo = (preserveCheckedState = true) => {
+    const basicsInfo = props.allData?.BasicsInfo;
+    if (basicsInfo && basicsInfo.MemberList && Array.isArray(basicsInfo.MemberList) && basicsInfo.MemberList.length > 0) {
+        // 从基础信息中获取成员列表，并初始化勾选状态
+        const savedCheckedList = props.allData?.WorkNote?.memberCheckedList || [];
+        
+        // 如果 preserveCheckedState 为 true，且当前 memberList 已有数据，则保留现有的勾选状态
+        const existingCheckedMap = new Map();
+        if (preserveCheckedState && memberList.value.length > 0) {
+            memberList.value.forEach(member => {
+                existingCheckedMap.set(member.id, member.checked);
+            });
+        }
+        
+        memberList.value = basicsInfo.MemberList.map(member => {
+            // 优先使用已保存的勾选状态
+            let checked = false;
+            
+            // 首先尝试从保存的数据中恢复（优先使用保存的数据）
+            const savedMember = savedCheckedList.find(m => 
+                (m.id == member.id) || (m.memberId == member.id)
+            );
+            if (savedMember !== undefined) {
+                // 如果保存的数据中明确指定了 checked 值，使用该值；否则默认为 true（已勾选）
+                checked = savedMember.checked === true || savedMember.checked === 'true' || savedMember.checked === 1;
+            } else if (preserveCheckedState && existingCheckedMap.has(member.id)) {
+                // 如果保存的数据中没有，且需要保留状态，则使用现有的勾选状态
+                checked = existingCheckedMap.get(member.id);
+            }
+            
+            return {
+                id: member.id,
+                name: member.name,
+                status: member.status || '持证', // 默认持证，如果没有状态信息
+                checked: checked
+            };
+        });
+    } else if (props.allData?.WorkNote?.memberCheckedList && Array.isArray(props.allData.WorkNote.memberCheckedList) && props.allData.WorkNote.memberCheckedList.length > 0) {
+        // 如果未回填基础信息（例如：从详情页直接带 workTicketId 跳到填写工作票），
+        // 则使用工作票详情映射后的 memberCheckedList（来源：qualificationList）来渲染成员资质列表
+        const savedCheckedList = props.allData.WorkNote.memberCheckedList || []
+
+        // 保留现有勾选状态（优先级：现有 memberList > savedCheckedList）
+        const existingCheckedMap = new Map();
+        if (preserveCheckedState && memberList.value.length > 0) {
+            memberList.value.forEach(member => {
+                existingCheckedMap.set(member.id, member.checked);
+            });
+        }
+
+        memberList.value = savedCheckedList.map((m) => {
+            const id = m.id || m.memberId || m.userId
+            const name = m.name || m.memberName || m.userName
+
+            let checked = false
+            if (m.checked !== undefined) {
+                checked = m.checked === true || m.checked === 'true' || m.checked === 1
+            } else if (preserveCheckedState && existingCheckedMap.has(id)) {
+                checked = existingCheckedMap.get(id)
+            } else {
+                // 没提供时，默认按“已确认”展示更符合“详情回填”预期
+                checked = true
+            }
+
+            return {
+                id,
+                name,
+                status: m.status || '持证',
+                checked
+            }
+        })
+    } else {
+        // 如果没有基础信息，使用默认的测试数据（仅用于开发测试）
+        // 保留现有的勾选状态
+        const existingCheckedMap = new Map();
+        if (preserveCheckedState && memberList.value.length > 0) {
+            memberList.value.forEach(member => {
+                existingCheckedMap.set(member.id, member.checked);
+            });
+        }
+        
+        // 从保存的数据中恢复勾选状态
+        const savedCheckedList = props.allData?.WorkNote?.memberCheckedList || [];
+        
+        memberList.value = [
+            {
+                id: 1,
+                name: '张三',
+                status: '持证',
+                checked: (() => {
+                    const saved = savedCheckedList.find(m => (m.id == 1) || (m.memberId == 1));
+                    if (saved !== undefined) {
+                        return saved.checked === true || saved.checked === 'true' || saved.checked === 1;
+                    }
+                    return preserveCheckedState && existingCheckedMap.has(1) ? existingCheckedMap.get(1) : false;
+                })(),
+            },
+            {
+                id: 2,
+                name: '李四',
+                status: '未持证',
+                checked: (() => {
+                    const saved = savedCheckedList.find(m => (m.id == 2) || (m.memberId == 2));
+                    if (saved !== undefined) {
+                        return saved.checked === true || saved.checked === 'true' || saved.checked === 1;
+                    }
+                    return preserveCheckedState && existingCheckedMap.has(2) ? existingCheckedMap.get(2) : false;
+                })(),
+            },
+            {
+                id: 3,
+                name: '王五',
+                status: '持证',
+                checked: (() => {
+                    const saved = savedCheckedList.find(m => (m.id == 3) || (m.memberId == 3));
+                    if (saved !== undefined) {
+                        return saved.checked === true || saved.checked === 'true' || saved.checked === 1;
+                    }
+                    return preserveCheckedState && existingCheckedMap.has(3) ? existingCheckedMap.get(3) : false;
+                })(),
+            },
+        ];
+    }
+}
 
 // 是否需要申领移动球机
 const needApplyBallMachine = ref(false);
 
+// 判断是否为高等风险类型
+const isHighRiskType = computed(() => {
+    return formData.value.riskType && formData.value.riskType.includes('高等风险');
+});
+
+// 风险管控卡模板相关
+const showTemplatePicker = ref(false); // 是否显示模板选择器
+const riskCardTemplateList = ref([]); // 风险管控卡模板列表
+const selectedTemplate = ref(null); // 选中的模板
+const selectedTemplateId = ref(null); // 选中的模板ID
+
+// 安全措施复选框的值
+const checkboxValue1 = ref([]);
+// 复选框变化事件
+const checkboxChange = (e) => {
+    console.log('安全措施选择变化：', e);
+};
+
 
 
 // 组件数据
 const formData = ref({
-    serialNumber: '', // 票证编号
+    ticketNumber: '', // 票证编号
     projectName: '', // 所属项目
     workLocation: '', // 作业地点
     workResponsible: '', // 作业负责人
@@ -245,13 +388,181 @@ const endDateText = ref(''); // 结束日期显示文本
 const minTimestamp = ref(dayjs('2020-01-01').valueOf()); // 最小可选日期时间戳
 
 
+// 从 allData 中恢复之前填写的数据
+const restoreFormData = (data) => {
+    if (!data || Object.keys(data).length === 0) return;
+    
+    if (data.ticketNumber) formData.value.ticketNumber = data.ticketNumber;
+    if (data.projectName) formData.value.projectName = data.projectName;
+    if (data.workLocation) formData.value.workLocation = data.workLocation;
+    if (data.workResponsible) formData.value.workResponsible = data.workResponsible;
+    if (data.workContent) formData.value.workContent = data.workContent;
+    if (data.riskType) formData.value.riskType = data.riskType;
+    if (data.period && Array.isArray(data.period) && data.period.length >= 2) {
+        if (data.period[0]) {
+            startDateText.value = data.period[0];
+            startDate.value = dayjs(data.period[0]).valueOf();
+        }
+        if (data.period[1]) {
+            endDateText.value = data.period[1];
+            endDate.value = dayjs(data.period[1]).valueOf();
+        }
+    }
+    // 恢复其他数据字段
+    if (data.safeMeasures && Array.isArray(data.safeMeasures)) {
+        checkboxValue1.value = [...data.safeMeasures];
+    }
+    if (data.needApplyBallMachine !== undefined) {
+        needApplyBallMachine.value = data.needApplyBallMachine;
+    }
+    // 恢复作业班成员资质确认状态
+    // 注意：成员列表可能还没有从基础信息中加载，所以先更新成员列表，再恢复勾选状态
+    // 先更新成员列表，updateMemberListFromBasicsInfo 函数会从 allData.WorkNote.memberCheckedList 中恢复勾选状态
+    updateMemberListFromBasicsInfo(true);
+    // 如果 data.memberCheckedList 存在，再次确保勾选状态正确恢复（双重保险）
+    if (data.memberCheckedList && Array.isArray(data.memberCheckedList) && data.memberCheckedList.length > 0) {
+        // 根据成员ID恢复勾选状态
+        data.memberCheckedList.forEach(checkedMember => {
+            const member = memberList.value.find(m => 
+                (m.id == checkedMember.id) || (m.id == checkedMember.memberId)
+            );
+            if (member) {
+                // 确保正确恢复勾选状态：如果保存的数据中 checked 为 true，则设置为 true
+                member.checked = checkedMember.checked === true || checkedMember.checked === 'true' || checkedMember.checked === 1;
+            }
+        });
+    }
+    // 恢复风险管控卡模板
+    if (data.riskCardTemplateId) {
+        selectedTemplateId.value = data.riskCardTemplateId;
+        // 如果模板列表已加载，尝试找到对应的模板对象
+        if (riskCardTemplateList.value.length > 0) {
+            restoreSelectedTemplate();
+        }
+    }
+};
+
+// 恢复选中的风险管控卡模板
+const restoreSelectedTemplate = () => {
+    if (selectedTemplateId.value && riskCardTemplateList.value.length > 0) {
+        const template = riskCardTemplateList.value.find(t => 
+            (t.id || t.templateId || t.template_id) == selectedTemplateId.value
+        );
+        if (template) {
+            selectedTemplate.value = template;
+        }
+    }
+};
+
+// 监听 allData.WorkNote 的变化，恢复表单数据
+watch(() => props.allData?.WorkNote, (newData) => {
+    if (newData && Object.keys(newData).length > 0) {
+        restoreFormData(newData);
+    }
+}, { immediate: true, deep: true });
+
 // 暴露的组件方法
 defineExpose({
     getFormData() {
-        return formData.value;
+        // 构建成员勾选状态列表
+        const memberCheckedList = memberList.value.map(member => ({
+            id: member.id,
+            name: member.name,
+            checked: member.checked || false
+        }));
+        
+        return {
+            ...formData.value,
+            period: formData.value.period || [startDateText.value, endDateText.value],
+            safeMeasures: checkboxValue1.value,
+            needApplyBallMachine: needApplyBallMachine.value,
+            riskCardTemplateId: selectedTemplateId.value, // 风险管控卡模板ID
+            memberCheckedList: memberCheckedList // 作业班成员资质确认状态
+        };
     }
 })
 
+// 从基础信息中获取项目信息
+const initFromBasicsInfo = () => {
+    const basicsInfo = props.allData?.BasicsInfo;
+    if (basicsInfo) {
+        if (basicsInfo.ProjectName && !formData.value.projectName) {
+            formData.value.projectName = basicsInfo.ProjectName;
+        }
+        if (basicsInfo.SpecificAddress && !formData.value.workLocation) {
+            formData.value.workLocation = basicsInfo.SpecificAddress;
+        }
+        if (basicsInfo.ResponsiblePerson && !formData.value.workResponsible) {
+            formData.value.workResponsible = basicsInfo.ResponsiblePerson;
+        }
+        // 更新成员列表，保留现有的勾选状态
+        updateMemberListFromBasicsInfo(true);
+    }
+};
+
+// 监听基础信息变化
+watch(() => props.allData?.BasicsInfo, (newData) => {
+    if (newData && Object.keys(newData).length > 0) {
+        initFromBasicsInfo();
+    }
+}, { immediate: true, deep: true });
+
+// 生成票证编号
+const generateticketNumber = () => {
+    // 如果已经有编号了，不重新生成
+    if (formData.value.ticketNumber) {
+        return;
+    }
+    
+    // 获取当前年月（YYYYMM格式）
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const yearMonth = `${year}${month}`;
+    
+    // 生成4位随机序号（0001-9999）
+    const randomNum = Math.floor(Math.random() * 9999) + 1;
+    const serialNum = String(randomNum).padStart(4, '0');
+    
+    // 组合成完整编号：HQ-GZP-YYYYMM-XXXX
+    formData.value.ticketNumber = `HQ-GZP-${yearMonth}-${serialNum}`;
+};
+
+// 生命周期钩子函数
+onMounted(() => {
+    // 从基础信息中初始化（这会更新成员列表，但会从保存的数据中恢复勾选状态）
+    initFromBasicsInfo();
+    
+    // 组件挂载后，从 allData 中恢复数据（这会确保所有数据都被正确恢复，包括勾选状态）
+    if (props.allData?.WorkNote && Object.keys(props.allData.WorkNote).length > 0) {
+        restoreFormData(props.allData.WorkNote);
+    }
+    
+    // 如果没有编号，自动生成
+    if (!formData.value.ticketNumber) {
+        generateticketNumber();
+    }
+    
+    // 确保成员列表已初始化（如果还没有初始化）
+    if (memberList.value.length === 0) {
+        updateMemberListFromBasicsInfo(true);
+    }
+    
+    // 最后再次确保勾选状态正确恢复（使用 nextTick 确保在 DOM 更新后执行）
+    nextTick(() => {
+        if (props.allData?.WorkNote?.memberCheckedList && Array.isArray(props.allData.WorkNote.memberCheckedList)) {
+            props.allData.WorkNote.memberCheckedList.forEach(checkedMember => {
+                const member = memberList.value.find(m => 
+                    (m.id == checkedMember.id) || (m.id == checkedMember.memberId)
+                );
+                if (member) {
+                    member.checked = checkedMember.checked === true || checkedMember.checked === 'true' || checkedMember.checked === 1;
+                }
+            });
+        }
+    });
+});
+
 // 确认选择风险类型
 const confirmRiskTypePicker = (e) => {
     formData.value.riskType = e.value[0].name;
@@ -322,6 +633,91 @@ const addCustomSafeMeasure = () => {
     }
 }
 
+// 处理移动球机开关变化
+const change = (e) => {
+    console.log('移动球机开关状态变化：', e);
+}
+
+// 加载风险管控卡模板列表
+const loadRiskCardTemplateList = async () => {
+    try {
+        const res = await getRiskCardTemplateList({status: '1'});
+        // 处理返回的数据，可能是数组或对象
+        let templateList = [];
+        if (Array.isArray(res)) {
+            templateList = res;
+        } else if (res && Array.isArray(res.list)) {
+            templateList = res.list;
+        } else if (res && Array.isArray(res.rows)) {
+            templateList = res.rows;
+        } else if (res && Array.isArray(res.data)) {
+            templateList = res.data;
+        }
+        
+        // 统一处理模板数据，确保每个模板都有 name 字段用于显示
+        riskCardTemplateList.value = templateList.map(template => ({
+            ...template,
+            name: template.templateName || template.name || template.title || `模板${template.id || template.templateId || ''}`
+        }));
+        
+        console.log('风险管控卡模板列表：', riskCardTemplateList.value);
+        
+        // 模板列表加载完成后，恢复选中的模板
+        restoreSelectedTemplate();
+    } catch (error) {
+        console.error('加载风险管控卡模板列表失败：', error);
+        uni.showToast({
+            title: '加载模板列表失败',
+            icon: 'none'
+        });
+    }
+}
+
+// 获取模板显示名称
+const getTemplateDisplayName = (template) => {
+    if (!template) return '';
+    return template.templateName || template.name || template.title || `模板${template.id || template.templateId || ''}`;
+}
+
+// 确认选择风险管控卡模板
+const confirmTemplatePicker = (e) => {
+    if (e.value && e.value.length > 0) {
+        const template = e.value[0];
+        selectedTemplate.value = template;
+        // 支持多种可能的ID字段名
+        selectedTemplateId.value = template.id || template.templateId || template.template_id;
+        console.log('选中的模板：', template, '模板ID：', selectedTemplateId.value);
+    }
+    showTemplatePicker.value = false;
+}
+
+// 监听风险类型变化，如果是高风险类型则加载模板列表
+watch(() => formData.value.riskType, (newRiskType) => {
+    if (newRiskType && newRiskType.includes('高等风险')) {
+        // 如果是高风险类型，加载模板列表
+        if (riskCardTemplateList.value.length === 0) {
+            loadRiskCardTemplateList().then(() => {
+                // 模板列表加载完成后，恢复选中的模板
+                restoreSelectedTemplate();
+            });
+        } else {
+            // 如果模板列表已存在，直接恢复选中的模板
+            restoreSelectedTemplate();
+        }
+    } else {
+        // 如果不是高风险类型，清空选中的模板
+        selectedTemplate.value = null;
+        selectedTemplateId.value = null;
+    }
+}, { immediate: true });
+
+// 监听模板列表变化，当列表加载完成后恢复选中的模板
+watch(() => riskCardTemplateList.value, (newList) => {
+    if (newList.length > 0 && selectedTemplateId.value) {
+        restoreSelectedTemplate();
+    }
+}, { deep: true });
+
 </script>
 <style lang="scss" scoped>
 .BlueTxt {
@@ -342,6 +738,11 @@ const addCustomSafeMeasure = () => {
     border-radius: 10rpx;
 }
 
+.grayFont {
+    font-size: 28rpx;
+    color: #909399;
+}
+
 .FlexBox {
     display: flex;
     align-items: center;
diff --git a/src/pages/WorkOrderEdit/index.vue b/src/pages/WorkOrderEdit/index.vue
index af7b361..f84eb27 100644
--- a/src/pages/WorkOrderEdit/index.vue
+++ b/src/pages/WorkOrderEdit/index.vue
@@ -19,7 +19,7 @@
             <GatePassInfo ref="gatePassInfoRef" :allData="allData" v-if="currentStep.id == 2"></GatePassInfo>
             <WorkNote ref="workNoteRef" :allData="allData" :openApplyForMachine="openApplyForMachine"
                 v-if="currentStep.id == 3"></WorkNote>
-            <RiskControl ref="riskControlRef" :allData="allData" v-if="currentStep.id == 4"></RiskControl>
+            <RiskControl ref="riskControlRef" :allData="allData" :templateId="templateId" v-if="currentStep.id == 4"></RiskControl>
             <ApplyForMachine ref="applyForMachineRef" :allData="allData" v-if="currentStep.id == '3a'">
             </ApplyForMachine>
         </view>
@@ -30,30 +30,15 @@
     </view>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { ref, onMounted, nextTick } from 'vue'
 import BasicsInfo from './compoents/BasicsInfo.vue'
 import GatePassInfo from './compoents/GatePassInfo.vue'
 import WorkNote from './compoents/WorkNote.vue'
 import RiskControl from './compoents/RiskControl.vue'
 import ApplyForMachine from './compoents/ApplyForMachine.vue'
-
-const currentStep = ref({
-    id: 1,
-    Title: '工单基础信息',
-    PrevBtnName: '返回上一页',
-    NextBtnName: '下一步（申请出入证）',
-})// 当前步骤
-const basicsInfoRef = ref(null); // 基础信息组件引用
-const gatePassInfoRef = ref(null); // 出入证申请组件引用
-const workNoteRef = ref(null); // 工作票填写组件引用
-const riskControlRef = ref(null); // 风险控制卡填写组件引用
-const applyForMachineRef = ref(null); // 球机申领组件引用
-
-// 各个页面汇总数据
-const allData = ref({
-    BasicsInfo: {}, // 基础信息
-    GatePassInfo: {}, // 出入证申请
-});
+import { createWorkTicket, applyAccessPermit, createWorkPlan, createCameraApplication, submitWorkPlan, getWorkPlanDetail, getWorkTicketDetail, submitRiskControlCard, submitWorkTicketForContractor } from '@/api'
+import { setStorage } from '@/utils/storage'
+import dayjs from 'dayjs'
 
 // 步骤列表
 const stepList = ref([
@@ -73,30 +58,272 @@ const stepList = ref([
         id: 3,
         Title: '填写工作票',
         PrevBtnName: '保存草稿',
-        NextBtnName: '提交+下一步（风险控制卡）',
+        NextBtnName: '提交工单',
     },
     {
         id: 4,
         Title: '填写风险控制卡',
-        PrevBtnName: '保存草稿',
+        PrevBtnName: '取消提交',
         NextBtnName: '提交监理审核',
     },
     {
         id: '3a',
         Title: '球机申领',
         PrevBtnName: '取消申领',
-        NextBtnName: '返回申领',
+        NextBtnName: '提交申领',
     },
 ])
 
+// 初始化当前步骤，从步骤列表中获取第一个步骤
+const currentStep = ref({ ...stepList.value[0] })
+const basicsInfoRef = ref(null); // 基础信息组件引用
+const gatePassInfoRef = ref(null); // 出入证申请组件引用
+const workNoteRef = ref(null); // 工作票填写组件引用
+const riskControlRef = ref(null); // 风险控制卡填写组件引用
+const applyForMachineRef = ref(null); // 球机申领组件引用
+
+// 各个页面汇总数据
+const allData = ref({
+    BasicsInfo: {}, // 基础信息
+    GatePassInfo: {}, // 出入证申请
+    WorkNote: {}, // 工作票
+    workTicketId: null, // 工作票ID，用于球机申领
+})
+
+// 风险管控卡模板ID（从路由参数获取）
+const templateId = ref(null);
+
+// 将 WorkNote/BasicsInfo 中的“作业班成员资质”统一转换为后端可提交的 qualificationList
+const buildQualificationList = (workNoteData, basicsInfo) => {
+    // 优先使用 WorkNote 里回填/勾选后的 memberCheckedList（来源可能是详情 qualificationList）
+    const fromWorkNote = workNoteData?.memberCheckedList
+    if (Array.isArray(fromWorkNote) && fromWorkNote.length > 0) {
+        return fromWorkNote.map((m) => {
+            const memberId = m.memberId || m.id || m.userId
+            const memberName = m.memberName || m.name || m.userName || ''
+            const checked = m.checked === true || m.checked === 'true' || m.checked === 1
+            const status = m.status || ''
+            return {
+                memberId: parseInt(memberId) || memberId,
+                memberName,
+                qualificationConfirmed: checked ? '1' : '0',
+                hasCertificate: status.includes('未') ? '0' : '1',
+            }
+        })
+    }
+
+    // 兜底：使用基础信息的成员列表（旧逻辑）
+    const memberList = basicsInfo?.MemberList || []
+    return Array.isArray(memberList)
+        ? memberList.map(member => ({
+            memberId: parseInt(member.id) || member.id,
+            memberName: member.name || '',
+            qualificationConfirmed: '1',
+            hasCertificate: '1'
+        }))
+        : []
+}
+
+// 将工作票详情尽可能映射为 WorkNote 组件可回填的数据结构
+const mapWorkTicketDetailToWorkNote = (detail) => {
+    if (!detail) return {}
+
+    const start = detail.workStartTime || detail.startTime || detail.workStart || detail.startDate
+    const end = detail.workEndTime || detail.endTime || detail.workEnd || detail.endDate
+    const period = []
+    if (start) {
+        const d = dayjs(start)
+        period.push(d.isValid() ? d.format('YYYY-MM-DD') : start)
+    }
+    if (end) {
+        const d = dayjs(end)
+        period.push(d.isValid() ? d.format('YYYY-MM-DD') : end)
+    }
+
+    const safetyMeasuresList = detail.safetyMeasuresList || detail.safeMeasures || detail.safetyMeasures || []
+    // 作业班成员资质（后端字段：qualificationList）
+    const qualificationList = detail.qualificationList || detail.qualifications || detail.qualification || []
+
+    return {
+        ticketNumber: detail.ticketNumber || detail.number || detail.ticketNo || '',
+        projectName: detail.projectName || detail.project || '',
+        workLocation: detail.workLocation || detail.location || '',
+        workResponsible: detail.supervisorName || detail.workResponsible || detail.responsiblePerson || '',
+        workContent: detail.workContent || '',
+        riskType: detail.riskType || '',
+        period: period.length === 2 ? period : undefined,
+        safeMeasures: Array.isArray(safetyMeasuresList) ? safetyMeasuresList : undefined,
+        needApplyBallMachine:
+            detail.needMonitoringCamera === '1' ||
+            detail.needMonitoringCamera === 1 ||
+            detail.needMonitoringCamera === true ||
+            detail.needApplyBallMachine === true,
+        riskCardTemplateId:
+            detail.riskCardTemplateId ||
+            detail.templateId ||
+            detail.riskCardTemplateID ||
+            undefined,
+        memberCheckedList: Array.isArray(qualificationList)
+            ? qualificationList.map((m) => ({
+                id: m.id || m.memberId || m.userId,
+                name: m.name || m.memberName || m.userName,
+                // 尽量携带“持证/未持证”信息，供 WorkNote 直接渲染
+                status:
+                    m.status ||
+                    (m.hasCertificate === '0' || m.hasCertificate === 0 || m.hasCertificate === false ? '未持证' : '持证'),
+                // 后端如未提供勾选状态，默认按“已确认”处理，避免进入页面全空需要重勾
+                checked: m.checked === undefined ? true : (m.checked === true || m.checked === 'true' || m.checked === 1)
+            }))
+            : undefined
+    }
+}
+
+// 从路由参数获取项目ID和模板ID
+onMounted(() => {
+    const pages = getCurrentPages();
+    const currentPage = pages[pages.length - 1];
+    if (currentPage && currentPage.options) {
+        const projectId = currentPage.options.projectId;
+        const step = currentPage.options.step;
+        const templateIdParam = currentPage.options.templateId;
+        const workTicketIdParam = currentPage.options.workTicketId;
+        
+        if (projectId) {
+            // 将项目ID存储到基础信息中
+            if (!allData.value.BasicsInfo.projectId) {
+                allData.value.BasicsInfo.projectId = parseInt(projectId) || projectId;
+            }
+        }
+        
+        // 如果传入了步骤参数，切换到对应步骤
+        if (step) {
+            // 处理字符串类型的 step（如 '3a'）和数字类型的 step
+            const stepId = isNaN(parseInt(step)) ? step : parseInt(step);
+            const stepConfig = stepList.value.find(item => item.id == stepId);
+            if (stepConfig) {
+                currentStep.value = { ...stepConfig };
+                
+                // 如果直接跳转到风险管控卡页面（步骤4），获取工作计划详细信息和工作票详细信息
+                if (stepId === 4) {
+                    // 获取工作计划详细信息
+                    if (projectId) {
+                        getWorkPlanDetail(projectId)
+                            .then((workPlanDetail) => {
+                                console.log('工作计划详细信息：', workPlanDetail);
+                                // 将工作计划详细信息保存到 allData 中，以便 RiskControl 组件使用
+                                if (!allData.value.RiskControl) {
+                                    allData.value.RiskControl = {};
+                                }
+                                allData.value.RiskControl.workPlanDetail = workPlanDetail;
+                            })
+                            .catch((err) => {
+                                console.error('获取工作计划详细信息失败:', err);
+                                uni.showToast({
+                                    title: err.message || err.msg || '获取工作计划信息失败',
+                                    icon: 'none'
+                                });
+                            });
+                    }
+                    
+                    // 获取工作票详细信息
+                    const ticketId = allData.value.workTicketId || workTicketIdParam;
+                    if (ticketId) {
+                        getWorkTicketDetail(ticketId)
+                            .then((workTicketDetail) => {
+                                console.log('工作票详细信息：', workTicketDetail);
+                                // 将工作票详细信息保存到 allData 中，以便 RiskControl 组件使用
+                                if (!allData.value.RiskControl) {
+                                    allData.value.RiskControl = {};
+                                }
+                                allData.value.RiskControl.workTicketDetail = workTicketDetail;
+                            })
+                            .catch((err) => {
+                                console.error('获取工作票详细信息失败:', err);
+                                uni.showToast({
+                                    title: err.message || err.msg || '获取工作票信息失败',
+                                    icon: 'none'
+                                });
+                            });
+                    }
+                }
+            }
+        }
+        
+        // 如果传入了模板ID，保存到 templateId
+        if (templateIdParam) {
+            templateId.value = parseInt(templateIdParam) || templateIdParam;
+        }
+        
+        // 如果传入了工作票ID，保存到 allData
+        if (workTicketIdParam) {
+            allData.value.workTicketId = parseInt(workTicketIdParam) || workTicketIdParam;
+        }
+
+        // 如果带了 workTicketId，并且进入“填写工作票”步骤（或其他需要回填的步骤），拉取工作票详情用于初始回填
+        // 需求：高风险票/球机申领在“待填写”时点击卡片，跳到填写工作票页并带入工作票ID，渲染初始数据
+        const stepIdForHydrate = step ? (isNaN(parseInt(step)) ? step : parseInt(step)) : null
+        if (allData.value.workTicketId && (stepIdForHydrate === 3 || stepIdForHydrate === '3a' || stepIdForHydrate === 4)) {
+            getWorkTicketDetail(allData.value.workTicketId)
+                .then((workTicketDetail) => {
+                    // WorkNote 初始回填
+                    if (!allData.value.WorkNote) allData.value.WorkNote = {}
+                    allData.value.WorkNote = {
+                        ...allData.value.WorkNote,
+                        ...mapWorkTicketDetailToWorkNote(workTicketDetail)
+                    }
+
+                    // RiskControl 也可能需要工作票详情（原逻辑只在 step=4 时写入，这里不破坏，只做补充）
+                    if (!allData.value.RiskControl) allData.value.RiskControl = {}
+                    if (!allData.value.RiskControl.workTicketDetail) {
+                        allData.value.RiskControl.workTicketDetail = workTicketDetail
+                    }
+                })
+                .catch((err) => {
+                    console.error('获取工作票详细信息失败:', err);
+                    uni.showToast({
+                        title: err.message || err.msg || '获取工作票信息失败',
+                        icon: 'none'
+                    });
+                });
+        }
+    }
+})
+
 // 返回上一步
 const goBack = () => {
     if (currentStep.value.id == '3a') {
-        currentStep.value = stepList.value.find(item => item.id == 3);
-    } if (currentStep.value.id == 1) {
+        // 从球机申领页面返回时，保存球机申领数据（如果有）
+        if (applyForMachineRef.value) {
+            allData.value.ApplyForMachine = applyForMachineRef.value.getFormData();
+        }
+        // 保存工作票数据（确保数据不丢失，包括人员资质的勾选状态）
+        // 注意：虽然工作票数据在打开球机申领页面时已经保存，但为了确保数据完整性，这里再次保存
+        // 由于 WorkNote 组件可能已经被销毁（v-if 导致），所以需要从 allData 中获取之前保存的数据
+        // 如果组件还存在，则获取最新数据；如果不存在，则使用之前保存的数据
+        if (workNoteRef.value) {
+            const workNoteData = workNoteRef.value.getFormData();
+            allData.value.WorkNote = workNoteData;
+        }
+        // 切换回工作票页面
+        const stepConfig = stepList.value.find(item => item.id == 3);
+        if (stepConfig) {
+            currentStep.value = { ...stepConfig };
+            // 使用 nextTick 确保组件重新挂载后，数据能够正确恢复
+            nextTick(() => {
+                // 确保 WorkNote 组件能够正确恢复数据
+                if (workNoteRef.value && allData.value.WorkNote) {
+                    // 组件已经重新挂载，数据会通过 watch 和 onMounted 自动恢复
+                    console.log('工作票数据已恢复，包括成员资质勾选状态');
+                }
+            });
+        }
+    } else if (currentStep.value.id == 1) {
         goHome();
     } else {
-        currentStep.value = stepList.value.find(item => item.id == currentStep.value.id - 1);
+        const stepConfig = stepList.value.find(item => item.id == currentStep.value.id - 1);
+        if (stepConfig) {
+            currentStep.value = { ...stepConfig };
+        }
     }
 }
 
@@ -105,43 +332,904 @@ const goHome = () => {
     uni.switchTab({ url: '/pages/WorkOrderApproval/index' })
 }
 
+// 保存草稿
+const saveDraft = () => {
+    // 收集当前步骤的数据
+    let currentStepData = {};
+    
+    if (currentStep.value.id == 1) {
+        // 保存基础信息数据
+        if (basicsInfoRef.value) {
+            currentStepData = basicsInfoRef.value.getFormData();
+            allData.value.BasicsInfo = currentStepData;
+            
+            // 格式化数据为接口所需格式
+            const locationParts = currentStepData.Location ? currentStepData.Location.split(',') : ['', ''];
+            const longitude = locationParts[0] || '';
+            const latitude = locationParts[1] || '';
+            const sysUserIds = currentStepData.MemberList ? currentStepData.MemberList.map(member => parseInt(member.id) || member.id) : [];
+            
+            // 构建工作计划请求数据（projectStatus设为0表示草稿）
+            const workPlanData = {
+                projectName: currentStepData.ProjectName || '',
+                workLocation: currentStepData.SpecificAddress || '',
+                longitude: longitude,
+                latitude: latitude,
+                workStartTime: currentStepData.period && currentStepData.period[0] ? currentStepData.period[0] : '',
+                workEndTime: currentStepData.period && currentStepData.period[1] ? currentStepData.period[1] : '',
+                supervisorName: currentStepData.ResponsiblePerson || '',
+                sysUserIds: sysUserIds,
+                remark: currentStepData.remark || '',
+                projectStatus: 0  // 草稿状态
+            };
+            
+            // 调用接口保存草稿
+            createWorkPlan(workPlanData)
+                .then((res) => {
+                    // 保存返回的 projectId
+                    if (res) {
+                        allData.value.BasicsInfo.projectId = res;
+                    }
+                    uni.showToast({
+                        title: '草稿保存成功',
+                        icon: 'success',
+                        duration: 2000
+                    });
+                    // 延迟返回工单审批页面，确保提示信息显示
+                    setTimeout(() => {
+                        uni.switchTab({ url: '/pages/WorkOrderApproval/index' });
+                    }, 2000);
+                })
+                .catch((err) => {
+                    console.error('草稿保存失败:', err);
+                    uni.showToast({
+                        title: err.message || '草稿保存失败',
+                        icon: 'none',
+                        duration: 2000
+                    });
+                });
+            return;
+        }
+    } else if (currentStep.value.id == 3) {
+        // 保存工作票草稿
+        if (!allData.value.BasicsInfo.projectId) {
+            uni.showToast({
+                title: '请先填写基础信息中的项目信息',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        if (workNoteRef.value) {
+            currentStepData = workNoteRef.value.getFormData();
+            allData.value.WorkNote = currentStepData;
+        }
+        // 构建作业班成员资质列表（优先使用 WorkNote.memberCheckedList）
+        const qualificationList = buildQualificationList(currentStepData, allData.value.BasicsInfo)
+        
+        // 格式化时间：将日期格式转换为 yyyy-MM-dd HH:mm:ss
+        const formatDateTime = (dateStr, defaultTime = '08:00:00') => {
+            if (!dateStr) return '';
+            if (dateStr.includes(' ') && dateStr.includes(':')) {
+                const parts = dateStr.split(' ');
+                if (parts.length >= 2) {
+                    const datePart = parts[0];
+                    const timePart = parts[1].substring(0, 8);
+                    return `${datePart} ${timePart}`;
+                }
+                return dateStr;
+            }
+            if (dateStr.includes('T')) {
+                return dateStr.replace('T', ' ').substring(0, 19);
+            }
+            return `${dateStr} ${defaultTime}`;
+        };
+        
+        // 构建工作票草稿数据
+        const workTicketData = {
+            projectId: allData.value.BasicsInfo.projectId,
+            workLocation: currentStepData.workLocation || allData.value.BasicsInfo.SpecificAddress || '',
+            supervisorId: null,
+            supervisorName: currentStepData.workResponsible || allData.value.BasicsInfo.ResponsiblePerson || '',
+            supervisorPosition: '',
+            workContent: currentStepData.workContent || '',
+            riskType: currentStepData.riskType || '',
+            workStartTime: currentStepData.period && currentStepData.period[0] ? formatDateTime(currentStepData.period[0], '08:00:00') : '',
+            workEndTime: currentStepData.period && currentStepData.period[1] ? formatDateTime(currentStepData.period[1], '18:00:00') : '',
+            safetyMeasuresList: currentStepData.safeMeasures || [],
+            qualificationList: qualificationList,
+            needMonitoringCamera: currentStepData.needApplyBallMachine ? '1' : '0',
+            cameraApplicationId: allData.value.ApplyForMachine?.cameraApplicationId || null,
+            remark: '',
+            status: 0 // 草稿状态为0
+        };
+        
+        // 调用接口保存草稿
+        createWorkTicket(workTicketData)
+            .then((res) => {
+                if (res) {
+                    allData.value.workTicketId = res;
+                }
+                uni.showToast({
+                    title: '草稿保存成功',
+                    icon: 'success',
+                    duration: 2000
+                });
+                // 延迟返回工单审批页面，确保提示信息显示
+                setTimeout(() => {
+                    uni.switchTab({ url: '/pages/WorkOrderApproval/index' });
+                }, 2000);
+            })
+            .catch((err) => {
+                console.error('草稿保存失败:', err);
+                uni.showToast({
+                    title: err.message || err.msg || '草稿保存失败',
+                    icon: 'none',
+                    duration: 2000
+                });
+            });
+        return;
+    } else if (currentStep.value.id == 4) {
+        // 保存风险控制卡数据
+        if (riskControlRef.value) {
+            currentStepData = riskControlRef.value.getFormData();
+            allData.value.RiskControl = currentStepData;
+        }
+    }
+    
+    // 保存所有数据到本地存储（非步骤1的情况）
+    const draftData = {
+        ...allData.value,
+        currentStep: currentStep.value.id,
+        saveTime: new Date().toISOString()
+    };
+    
+    const saved = setStorage('workOrderDraft', draftData);
+    if (saved) {
+        uni.showToast({
+            title: '草稿保存成功',
+            icon: 'success',
+            duration: 2000
+        });
+        // 延迟返回工单审批页面，确保提示信息显示
+        setTimeout(() => {
+            uni.switchTab({ url: '/pages/WorkOrderApproval/index' });
+        }, 2000);
+    } else {
+        uni.showToast({
+            title: '草稿保存失败',
+            icon: 'none',
+            duration: 2000
+        });
+    }
+}
+
 // 点击上一步
 const prevStep = () => {
+    // 判断按钮类型
+    if (currentStep.value.PrevBtnName === '保存草稿') {
+        // 执行保存草稿操作
+        saveDraft();
+        return;
+    }
+    
+    // 如果是"返回修改"，切换到上一步
+    if (currentStep.value.PrevBtnName === '返回修改') {
+        // 在切换步骤前，先保存当前步骤的数据
+        if (gatePassInfoRef.value) {
+            allData.value.GatePassInfo = gatePassInfoRef.value.getFormData();
+        }
+        const stepConfig = stepList.value.find(item => item.id == currentStep.value.id - 1);
+        if (stepConfig) {
+            currentStep.value = { ...stepConfig };
+        }
+        return;
+    }
+    
+    // 如果是"取消提交"（风险控制卡页面）
+    if (currentStep.value.PrevBtnName === '取消提交') {
+        // 保存风险控制卡数据（如果有填写）
+        if (riskControlRef.value) {
+            allData.value.RiskControl = riskControlRef.value.getFormData();
+        }
+        // 保存工作票数据（确保数据不丢失）
+        if (workNoteRef.value) {
+            const workNoteData = workNoteRef.value.getFormData();
+            allData.value.WorkNote = workNoteData;
+        }
+        // 返回到填写工作票页面（步骤3）
+        const stepConfig = stepList.value.find(item => item.id == 3);
+        if (stepConfig) {
+            currentStep.value = { ...stepConfig };
+        }
+        return;
+    }
+    
+    // 如果是"取消申领"
     if (currentStep.value.id == '3a') {
-        currentStep.value = stepList.value.find(item => item.id == 3);
-    } else {
-        currentStep.value = stepList.value.find(item => item.id == currentStep.value.id - 1);
+        // 保存球机申领数据
+        if (applyForMachineRef.value) {
+            allData.value.ApplyForMachine = applyForMachineRef.value.getFormData();
+        }
+        // 保存工作票数据（确保数据不丢失，包括人员资质的勾选状态）
+        // 由于 WorkNote 组件可能已经被销毁（v-if 导致），所以需要从 allData 中获取之前保存的数据
+        // 如果组件还存在，则获取最新数据；如果不存在，则使用之前保存的数据
+        if (workNoteRef.value) {
+            const workNoteData = workNoteRef.value.getFormData();
+            allData.value.WorkNote = workNoteData;
+        }
+        // 返回到填写工作票页面（步骤3）
+        const stepConfig = stepList.value.find(item => item.id == 3);
+        if (stepConfig) {
+            currentStep.value = { ...stepConfig };
+            // 使用 nextTick 确保组件重新挂载后，数据能够正确恢复
+            nextTick(() => {
+                // 确保 WorkNote 组件能够正确恢复数据
+                if (workNoteRef.value && allData.value.WorkNote) {
+                    // 组件已经重新挂载，数据会通过 watch 和 onMounted 自动恢复
+                    console.log('工作票数据已恢复，包括成员资质勾选状态');
+                }
+            });
+        }
+        return;
+    }
+    
+    // 其他情况切换到上一步
+    if (currentStep.value.id != '3a') {
+        const stepConfig = stepList.value.find(item => item.id == currentStep.value.id - 1);
+        if (stepConfig) {
+            currentStep.value = { ...stepConfig };
+        }
     }
 }
 
 // 点击下一步
 const nextStep = () => {
+    // 在切换步骤前，先保存当前步骤的数据
     if (currentStep.value.id == 1) {
         console.log(basicsInfoRef.value.getFormData());
-        allData.value.BasicsInfo = basicsInfoRef.value.getFormData();
+        const basicsData = basicsInfoRef.value.getFormData();
+        allData.value.BasicsInfo = basicsData;
+        
+        // 数据验证
+        if (!basicsData.ProjectName) {
+            uni.showToast({
+                title: '请填写项目名称',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!basicsData.SpecificAddress) {
+            uni.showToast({
+                title: '请填写作业地点',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!basicsData.Location) {
+            uni.showToast({
+                title: '请在地图上选择位置',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!basicsData.period || basicsData.period.length < 2 || !basicsData.period[0] || !basicsData.period[1]) {
+            uni.showToast({
+                title: '请选择作业周期',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!basicsData.ResponsiblePerson) {
+            uni.showToast({
+                title: '请填写作业负责人',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!basicsData.MemberList || basicsData.MemberList.length === 0) {
+            uni.showToast({
+                title: '请至少添加一个作业班成员',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        // 格式化数据为接口所需格式
+        const locationParts = basicsData.Location.split(',');
+        const longitude = locationParts[0] || '';
+        const latitude = locationParts[1] || '';
+        const workStartTime = basicsData.period[0] ? `${basicsData.period[0]} 08:00:00` : '';
+        const workEndTime = basicsData.period[1] ? `${basicsData.period[1]} 18:00:00` : '';
+        const sysUserIds = basicsData.MemberList.map(member => parseInt(member.id) || member.id);
+        
+        // 构建工作计划请求数据
+        const workPlanData = {
+            projectName: basicsData.ProjectName,
+            workLocation: basicsData.SpecificAddress,
+            longitude: longitude,
+            latitude: latitude,
+            workStartTime: basicsData.period[0],
+            workEndTime: basicsData.period[1],
+            supervisorName: basicsData.ResponsiblePerson,
+            sysUserIds: sysUserIds,
+            remark: basicsData.remark || '', // 如果有备注字段
+            projectStatus: 0
+        };
+        
+        // 提交工作计划
+        createWorkPlan(workPlanData)
+            .then((res) => {
+                // 保存返回的 projectId（res.data 就是 projectId）
+                if (res) {
+                    allData.value.BasicsInfo.projectId = res;
+                }
+                uni.showToast({
+                    title: '工作计划提交成功',
+                    icon: 'success'
+                });
+                // 切换到下一步
+                const nextStepId = currentStep.value.id + 1;
+                const nextStepConfig = stepList.value.find(item => item.id == nextStepId);
+                if (nextStepConfig) {
+                    currentStep.value = { ...nextStepConfig };
+                }
+            })
+            .catch((err) => {
+                console.error('工作计划提交失败:', err);
+                uni.showToast({
+                    title: err.message || '工作计划提交失败',
+                    icon: 'none'
+                });
+            });
+        return;
     } else if (currentStep.value.id == 2) {
+        // 确保 projectId 已经被设置到 allData 中
+        // 如果 GatePassInfo 组件中的 projectId 为 null，从 BasicsInfo 中获取
+        console.log('allData.value.BasicsInfo.projectId：', allData.value.BasicsInfo.projectId);
+        if (!allData.value.BasicsInfo.projectId) {
+            uni.showToast({
+                title: '请先填写基础信息中的项目信息',
+                icon: 'none'
+            });
+            return;
+        }
+        
         console.log(gatePassInfoRef.value.getFormData());
-        allData.value.GatePassInfo = gatePassInfoRef.value.getFormData();
+        const gatePassData = gatePassInfoRef.value.getFormData();
+        
+        // 如果 gatePassData 中的 projectId 为 null，从 allData 中获取并设置
+        if (!gatePassData.projectId && allData.value.BasicsInfo.projectId) {
+            gatePassData.projectId = allData.value.BasicsInfo.projectId;
+        }
+        
+        // 数据验证
+        if (!gatePassData.projectId) {
+            uni.showToast({
+                title: '请先填写基础信息中的项目信息',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!gatePassData.workLocation) {
+            uni.showToast({
+                title: '请填写作业地点',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!gatePassData.validityStartTime || !gatePassData.validityEndTime) {
+            uni.showToast({
+                title: '请选择出入证有效日期',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!gatePassData.sysUserIds || gatePassData.sysUserIds.length === 0) {
+            uni.showToast({
+                title: '请至少添加一个作业班成员',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        allData.value.GatePassInfo = gatePassData;
+        
+        // 提交出入证申请
+        applyAccessPermit(gatePassData)
+            .then((res) => {
+                uni.showToast({
+                    title: '出入证申请提交成功',
+                    icon: 'success'
+                });
+                // 切换到下一步
+                const nextStepId = currentStep.value.id + 1;
+                const nextStepConfig = stepList.value.find(item => item.id == nextStepId);
+                if (nextStepConfig) {
+                    currentStep.value = { ...nextStepConfig };
+                }
+            })
+            .catch((err) => {
+                console.error('出入证申请提交失败:', err);
+                uni.showToast({
+                    title: err.message || '出入证申请提交失败',
+                    icon: 'none'
+                });
+            });
+        return;
     } else if (currentStep.value.id == 3) {
+        // 确保 projectId 已经被设置到 allData 中
+        if (!allData.value.BasicsInfo.projectId) {
+            uni.showToast({
+                title: '请先填写基础信息中的项目信息',
+                icon: 'none'
+            });
+            return;
+        }
+        
         console.log(workNoteRef.value.getFormData());
-        allData.value.WorkNote = workNoteRef.value.getFormData();
+        const workNoteData = workNoteRef.value.getFormData();
+        allData.value.WorkNote = workNoteData;
+        
+        // 数据验证
+        if (!workNoteData.workContent) {
+            uni.showToast({
+                title: '请填写作业内容',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!workNoteData.riskType) {
+            uni.showToast({
+                title: '请选择风险类型',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!workNoteData.period || workNoteData.period.length < 2 || !workNoteData.period[0] || !workNoteData.period[1]) {
+            uni.showToast({
+                title: '请选择作业起止时间',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!workNoteData.safeMeasures || workNoteData.safeMeasures.length === 0) {
+            uni.showToast({
+                title: '请至少选择一项安全措施',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        // 如果为高等风险，验证风险管控模版和申领球机必填
+        const isHighRisk = workNoteData.riskType && workNoteData.riskType.includes('高等风险');
+        if (isHighRisk) {
+            // 验证风险管控卡模板
+            if (!workNoteData.riskCardTemplateId) {
+                uni.showToast({
+                    title: '高等风险作业必须选择风险管控卡模板',
+                    icon: 'none'
+                });
+                return;
+            }
+            // 验证申领球机
+            if (!workNoteData.needApplyBallMachine) {
+                uni.showToast({
+                    title: '高等风险作业必须申领移动球机',
+                    icon: 'none'
+                });
+                return;
+            }
+            // 如果选择了申领球机，验证是否已提交球机申领
+            if (workNoteData.needApplyBallMachine && !allData.value.ApplyForMachine?.cameraApplicationId) {
+                uni.showToast({
+                    title: '请先完成球机申领',
+                    icon: 'none'
+                });
+                return;
+            }
+        }
+        
+        // 获取基础信息中的成员列表
+        const memberList = allData.value.BasicsInfo.MemberList || [];
+        const workNoteMemberCheckedList = allData.value.WorkNote?.memberCheckedList || [];
+        if ((Array.isArray(memberList) && memberList.length === 0) && (Array.isArray(workNoteMemberCheckedList) && workNoteMemberCheckedList.length === 0)) {
+            uni.showToast({
+                title: '请先添加作业班成员',
+                icon: 'none'
+            });
+            return;
+        }
+        // 构建作业班成员资质列表（优先使用 WorkNote.memberCheckedList）
+        const qualificationList = buildQualificationList(workNoteData, allData.value.BasicsInfo)
+        
+        // 格式化时间：将日期格式转换为 yyyy-MM-dd HH:mm:ss
+        const formatDateTime = (dateStr, defaultTime = '08:00:00') => {
+            if (!dateStr) return '';
+            // 如果已经是完整的时间格式（包含空格和冒号），直接返回
+            if (dateStr.includes(' ') && dateStr.includes(':')) {
+                // 确保格式为 yyyy-MM-dd HH:mm:ss
+                const parts = dateStr.split(' ');
+                if (parts.length >= 2) {
+                    const datePart = parts[0];
+                    const timePart = parts[1].substring(0, 8); // 取前8位 HH:mm:ss
+                    return `${datePart} ${timePart}`;
+                }
+                return dateStr;
+            }
+            // 如果是 ISO 格式（包含 T），转换为标准格式
+            if (dateStr.includes('T')) {
+                return dateStr.replace('T', ' ').substring(0, 19);
+            }
+            // 否则添加默认时间
+            return `${dateStr} ${defaultTime}`;
+        };
+        
+        // 构建工作票申请数据
+        const workTicketData = {
+            projectId: allData.value.BasicsInfo.projectId, // 必填字段
+            workLocation: workNoteData.workLocation || allData.value.BasicsInfo.SpecificAddress || '',
+            supervisorId: null, // 作业负责人ID，如果需要可以从成员列表中查找
+            supervisorName: workNoteData.workResponsible || allData.value.BasicsInfo.ResponsiblePerson || '',
+            supervisorPosition: '', // 作业负责人职位，如果需要可以从用户信息中获取
+            workContent: workNoteData.workContent || '',
+            riskType: workNoteData.riskType || '',
+            workStartTime: formatDateTime(workNoteData.period[0], '08:00:00'),
+            workEndTime: formatDateTime(workNoteData.period[1], '18:00:00'),
+            safetyMeasuresList: workNoteData.safeMeasures || [],
+            qualificationList: qualificationList,
+            needMonitoringCamera: workNoteData.needApplyBallMachine ? '1' : '0',
+            cameraApplicationId: allData.value.ApplyForMachine?.cameraApplicationId || null, // 球机申请单ID，如果有球机申请则传入
+            remark: '', // 备注，如果需要可以从表单中获取
+            status: 0 // 提交工单状态为1
+        };
+        
+        // 提交工作票申请
+        createWorkTicket(workTicketData)
+            .then((res) => {
+                // 保存工作票ID，用于后续球机申领
+                if (res) {
+                    allData.value.workTicketId = res;
+                }
+                
+                // 调用提交工作计划接口
+                return submitWorkPlan(allData.value.BasicsInfo.projectId);
+            })
+            .then(() => {
+                uni.showToast({
+                    title: '工作票提交成功',
+                    icon: 'success',
+                    duration: 2000
+                });
+                // 延迟跳转，确保提示信息显示
+                setTimeout(() => {
+                    // 如果选择了风险管控卡模板，切换到风险管控卡页面（步骤4）
+                    if (workNoteData.riskCardTemplateId) {
+                        // 保存模板ID到 allData，以便 RiskControl 组件使用
+                        if (!allData.value.RiskControl) {
+                            allData.value.RiskControl = {};
+                        }
+                        allData.value.RiskControl.templateId = workNoteData.riskCardTemplateId;
+                        
+                        // 获取工作计划详细信息和工作票详细信息
+                        const promises = [];
+                        
+                        if (allData.value.BasicsInfo.projectId) {
+                            promises.push(
+                                getWorkPlanDetail(allData.value.BasicsInfo.projectId)
+                                    .then((workPlanDetail) => {
+                                        console.log('工作计划详细信息：', workPlanDetail);
+                                        // 将工作计划详细信息保存到 allData 中，以便 RiskControl 组件使用
+                                        if (!allData.value.RiskControl) {
+                                            allData.value.RiskControl = {};
+                                        }
+                                        allData.value.RiskControl.workPlanDetail = workPlanDetail;
+                                    })
+                                    .catch((err) => {
+                                        console.error('获取工作计划详细信息失败:', err);
+                                        uni.showToast({
+                                            title: err.message || err.msg || '获取工作计划信息失败',
+                                            icon: 'none'
+                                        });
+                                    })
+                            );
+                        }
+                        
+                        // 获取工作票详细信息
+                        if (allData.value.workTicketId) {
+                            promises.push(
+                                getWorkTicketDetail(allData.value.workTicketId)
+                                    .then((workTicketDetail) => {
+                                        console.log('工作票详细信息：', workTicketDetail);
+                                        // 将工作票详细信息保存到 allData 中，以便 RiskControl 组件使用
+                                        if (!allData.value.RiskControl) {
+                                            allData.value.RiskControl = {};
+                                        }
+                                        allData.value.RiskControl.workTicketDetail = workTicketDetail;
+                                    })
+                                    .catch((err) => {
+                                        console.error('获取工作票详细信息失败:', err);
+                                        uni.showToast({
+                                            title: err.message || err.msg || '获取工作票信息失败',
+                                            icon: 'none'
+                                        });
+                                    })
+                            );
+                        }
+                        
+                        // 等待所有接口调用完成后，切换到步骤4（风险管控卡页面）
+                        Promise.all(promises).finally(() => {
+                            const stepConfig = stepList.value.find(item => item.id == 4);
+                            if (stepConfig) {
+                                currentStep.value = { ...stepConfig };
+                                // 更新 templateId，以便 RiskControl 组件接收
+                                templateId.value = workNoteData.riskCardTemplateId;
+                            }
+                        });
+                    } else {
+                        // 如果没有选择风险管控卡模板，直接提交工单
+                        uni.showToast({
+                            title: '工单提交成功',
+                            icon: 'success',
+                            duration: 2000
+                        });
+                        setTimeout(() => {
+                            goHome();
+                        }, 2000);
+                    }
+                }, 2000);
+            })
+            .catch((err) => {
+                console.error('工作票提交失败:', err);
+                uni.showToast({
+                    title: err.message || err.msg || '工作票提交失败',
+                    icon: 'none'
+                });
+            });
+        return;
     } else if (currentStep.value.id == '3a') {
-        console.log(applyForMachineRef.value.getFormData());
-        allData.value.ApplyForMachine = applyForMachineRef.value.getFormData();
-        currentStep.value = stepList.value.find(item => item.id == 3);
+        // 球机申领提交
+        if (!applyForMachineRef.value) {
+            uni.showToast({
+                title: '请填写球机申领信息',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        const applyData = applyForMachineRef.value.getFormData();
+        allData.value.ApplyForMachine = applyData;
+        
+        // 数据验证
+        if (!allData.value.BasicsInfo.projectId) {
+            uni.showToast({
+                title: '项目ID不存在，请先填写基础信息',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!applyData.applyQuantity || applyData.applyQuantity <= 0) {
+            uni.showToast({
+                title: '请填写申领数量，且必须大于0',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!applyData.installationSite || applyData.installationSite.trim() === '') {
+            uni.showToast({
+                title: '请填写安装位置',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!applyData.contactPerson || applyData.contactPerson.trim() === '') {
+            uni.showToast({
+                title: '请填写联系人',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!applyData.contactPhone || applyData.contactPhone.trim() === '') {
+            uni.showToast({
+                title: '请填写联系方式',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        // 构建球机申领请求数据
+        const cameraApplicationData = {
+            projectId: allData.value.BasicsInfo.projectId,
+            needCameraCnt: applyData.applyQuantity,
+            installationLocation: applyData.installationSite,
+            contactPerson: applyData.contactPerson,
+            contactPhone: applyData.contactPhone,
+            remark: applyData.remark || ''
+        };
+        
+        // 提交球机申领
+        createCameraApplication(cameraApplicationData)
+            .then((res) => {
+                // 保存返回的申领单ID（res 就是球机申请单的id）
+                const cameraApplicationId = res;
+                if (cameraApplicationId) {
+                    // 确保 ApplyForMachine 对象存在
+                    if (!allData.value.ApplyForMachine) {
+                        allData.value.ApplyForMachine = {};
+                    }
+                    allData.value.ApplyForMachine.cameraApplicationId = cameraApplicationId;
+                }
+                uni.showToast({
+                    title: '球机申领提交成功',
+                    icon: 'success'
+                });
+                // 设置工作票中的"是否需要申领移动球机"为选中状态
+                if (!allData.value.WorkNote) {
+                    allData.value.WorkNote = {};
+                }
+                allData.value.WorkNote.needApplyBallMachine = true;
+                // 返回工作票填写页面
+                const stepConfig = stepList.value.find(item => item.id == 3);
+                if (stepConfig) {
+                    currentStep.value = { ...stepConfig };
+                    // 使用 nextTick 确保组件更新后，WorkNote 组件能正确响应数据变化
+                    nextTick(() => {
+                        // 如果 WorkNote 组件已经挂载，强制更新其数据
+                        if (workNoteRef.value) {
+                            const workNoteData = workNoteRef.value.getFormData();
+                            // 确保 needApplyBallMachine 被设置为 true
+                            if (workNoteData) {
+                                allData.value.WorkNote.needApplyBallMachine = true;
+                            }
+                        }
+                    });
+                }
+            })
+            .catch((err) => {
+                console.error('球机申领提交失败:', err);
+                uni.showToast({
+                    title: err.message || err.msg || '球机申领提交失败',
+                    icon: 'none'
+                });
+            });
         return;
     } else if (currentStep.value.id == 4) {
-        console.log(riskControlRef.value.getFormData());
-        allData.value.RiskControl = riskControlRef.value.getFormData();
+        // 提交风险管控卡监理审核
+        if (!riskControlRef.value) {
+            uni.showToast({
+                title: '请填写风险管控卡信息',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        // 获取表单数据
+        const riskControlData = riskControlRef.value.getFormData();
+        allData.value.RiskControl = riskControlData;
+        
+        // 获取提交数据
+        const submitData = riskControlRef.value.getSubmitData();
+        
+        // 数据验证
+        if (!submitData.ticketId) {
+            uni.showToast({
+                title: '工作票ID不存在，请先填写工作票',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!submitData.templateId) {
+            uni.showToast({
+                title: '模板ID不存在',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!submitData.ticketNumber) {
+            uni.showToast({
+                title: '请填写票证编号',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!submitData.operatingUnit) {
+            uni.showToast({
+                title: '请填写所属单位',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!submitData.workContent) {
+            uni.showToast({
+                title: '请填写工作内容',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!submitData.supervisorName) {
+            uni.showToast({
+                title: '请选择工作负责人',
+                icon: 'none'
+            });
+            return;
+        }
+        if (!submitData.checkItems || submitData.checkItems.length === 0) {
+            uni.showToast({
+                title: '检查项不能为空',
+                icon: 'none'
+            });
+            return;
+        }
+        
+        // 提交风险管控卡
+        submitRiskControlCard(submitData)
+            .then((res) => {
+                // 保存返回的风险管控卡ID（cardId）
+                // 接口可能返回 cardId、id、riskControlCardId 等字段
+                const cardId = res?.cardId || res?.id || res?.riskControlCardId || res;
+                if (cardId) {
+                    // 将 cardId 保存到 allData 中
+                    if (!allData.value.RiskControl) {
+                        allData.value.RiskControl = {};
+                    }
+                    allData.value.RiskControl.cardId = cardId;
+                    console.log('风险管控卡ID已保存：', cardId);
+                }
+                
+                // 提交风险管控卡成功后，调用提交工作票接口
+                if (!submitData.ticketId) {
+                    uni.showToast({
+                        title: '工作票ID不存在',
+                        icon: 'none',
+                        duration: 2000
+                    });
+                    return;
+                }
+                
+                return submitWorkTicketForContractor(submitData.ticketId);
+            })
+            .then(() => {
+                uni.showToast({
+                    title: '提交成功',
+                    icon: 'success',
+                    duration: 2000
+                });
+                // 延迟返回查询页面（工单审批页面）
+                setTimeout(() => {
+                    goHome();
+                }, 2000);
+            })
+            .catch((err) => {
+                console.error('提交失败:', err);
+                uni.showToast({
+                    title: err.message || err.msg || '提交失败',
+                    icon: 'none',
+                    duration: 2000
+                });
+            });
+        return;
     }
 
-    currentStep.value = stepList.value.find(item => item.id == currentStep.value.id + 1);
+    // 切换到下一步，从步骤列表中获取对应的步骤配置
+    const nextStepId = currentStep.value.id === '3a' ? 3 : (currentStep.value.id + 1);
+    const nextStepConfig = stepList.value.find(item => item.id == nextStepId);
+    if (nextStepConfig) {
+        currentStep.value = { ...nextStepConfig };
+    }
 }
 
 // 打开球机申领
 const openApplyForMachine = (e) => {
     console.log(e);
-    currentStep.value = stepList.value.find(item => item.id == '3a');
+    // 在切换到球机申领页面之前，先保存工作票数据
+    if (workNoteRef.value) {
+        const workNoteData = workNoteRef.value.getFormData();
+        allData.value.WorkNote = workNoteData;
+    }
+    const stepConfig = stepList.value.find(item => item.id == '3a');
+    if (stepConfig) {
+        currentStep.value = { ...stepConfig };
+    }
 }
 
 </script>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 446f1c8..7312931 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -35,6 +35,8 @@
 
 <script setup>
 import { ref, reactive } from 'vue'
+import { login } from '@/api'
+import { useUserStore } from '@/store/user'
 
 const formData = reactive({
   username: '',
@@ -48,15 +50,56 @@ const roleList = ref([
 ])
 
 const loading = ref(false)
+const userStore = useUserStore()
 
 async function handleLogin() {
+  // 表单验证
+  if (!formData.username) {
+    uni.showToast({ title: '请输入账号', icon: 'none' })
+    return
+  }
+  if (!formData.password) {
+    uni.showToast({ title: '请输入密码', icon: 'none' })
+    return
+  }
+  if (!formData.role) {
+    uni.showToast({ title: '请选择角色', icon: 'none' })
+    return
+  }
+
   loading.value = true
   try {
-    // 登录逻辑
+    // 调用登录接口
+    const response = await login({
+      username: formData.username,
+      password: formData.password,
+      role: formData.role
+    })
+    console.log(response);
+    
+    // 保存用户信息和token
+    if (response) {
+      userStore.setUserInfo(response)
+      if (response.access_token) {
+        userStore.setToken(response.access_token)
+      }
+      if (response.refreshToken) {
+        userStore.setRefreshToken(response.refreshToken)
+      }
+    }
+    
     uni.showToast({ title: '登录成功', icon: 'success' })
-    uni.switchTab({ url: '/pages/WorkOrderApproval/index' })
+    
+    // 跳转到工作台页面
+    setTimeout(() => {
+      uni.switchTab({ url: '/pages/WorkOrderApproval/index' })
+    }, 1500)
   } catch (error) {
     console.error('登录失败:', error)
+    uni.showToast({ 
+      title: error?.message || '登录失败，请重试', 
+      icon: 'none' 
+    })
   } finally {
     loading.value = false
   }
diff --git a/vite.config.js b/vite.config.js
index 827067f..b493aee 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -22,5 +22,17 @@ export default defineConfig({
   },
   optimizeDeps: {
     include: ['uview-plus']
+  },
+  // H5 开发环境代理配置，解决跨域问题
+  server: {
+    port: 5173,
+    proxy: {
+      '/api': {
+        target: 'http://172.16.1.146:8080',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, ''),
+        secure: false
+      }
+    }
   }
 })