diff --git a/src/api/labelManage/labelManage.js b/src/api/labelManage/labelManage.js
index 24bd625..9778d03 100644
--- a/src/api/labelManage/labelManage.js
+++ b/src/api/labelManage/labelManage.js
@@ -66,7 +66,7 @@ export function updateStatusBusUserLabel(query) {
   return request({
     url: '/admin/busUserLabel/checkStatus',
     method: 'post',
-    params: query
+    data: query
   })
 } 
 
diff --git a/src/views/labelManage/escApproval/approvalDetail.vue b/src/views/labelManage/escApproval/approvalDetail.vue
index bc33ecc..8f56089 100644
--- a/src/views/labelManage/escApproval/approvalDetail.vue
+++ b/src/views/labelManage/escApproval/approvalDetail.vue
@@ -13,7 +13,7 @@
             <el-card>
                 <template #header>
                     <div class="card-header">
-                        <span>申请标签：ESC</span>
+                        <span>申请标签：{{ detailForm.labelName }}</span>
                     </div>
                 </template>
                 <el-form ref="ruleFormRef" :model="ruleForm" label-position="left">
@@ -24,91 +24,110 @@
                                 <el-row class="myRow" :gutter="20">
                                     <el-col :span="8">
                                         <el-form-item label="当前标签:" prop="targetQualification">
-                                            ES
+                                            {{ detailForm.sourceLabelName ? detailForm.sourceLabelName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="部门:" prop="departmentName">
-                                            XXXX部门
+                                            {{ detailForm.deptName ? detailForm.deptName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="科室:" prop="officeName">
-                                            XXX科室
+                                            {{ detailForm.sectionName ? detailForm.sectionName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="员工工号:" prop="employeeNumber">
-                                            NO.43242342
+                                            {{ detailForm.workNo ? detailForm.workNo : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="员工姓名(中文):" prop="employeeChineseName">
-                                            管思成
+                                            {{ detailForm.userName ? detailForm.userName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="员工姓名(英文):" prop="employeeEnglishName">
-                                            GuangSiCheng
+                                            {{ detailForm.englishName ? detailForm.englishName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="属地:" prop="localityName">
-                                            XXX属地
+                                            {{ detailForm.dependencyName ? detailForm.dependencyName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="属地ESC:" prop="localityName">
-                                            赵文杰
+                                            {{ detailForm.escUserName ? detailForm.escUserName : '-' }}
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="8">
                                         <el-form-item label="创建时间:" prop="employeeEnglishName">
-                                            2024-12-24 14:23
+                                            {{ detailForm.createTime ? detailForm.createTime : '-' }}
                                         </el-form-item>
                                     </el-col>
                                 </el-row>
                             </el-col>
                             <el-col :span="4">
                                 <el-form-item label="审批状态" label-position="top" class="myFormItemLable">
-                                    待审批
+                                    <template v-if="detailForm.state">
+                                        <el-text v-if="detailForm.state == 1 && detailForm.node == 0" type="info"
+                                            class="infoinfoText">待审核</el-text>
+                                        <el-text v-if="detailForm.state == 1 && detailForm.node == 1" type="info"
+                                            class="infoinfoText">待审核</el-text>
+                                        <el-text v-if="detailForm.state == 1 && detailForm.node == 2" type="info"
+                                            class="infoinfoText">待标签管理员审核</el-text>
+                                        <el-text v-if="detailForm.state == 2" type="success"
+                                            class="successText">通过</el-text>
+                                        <el-text v-if="detailForm.state == 9" type="danger"
+                                            class="dangerText">驳回</el-text>
+                                    </template>
+                                    <template v-else>-</template>
                                 </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
                 </el-form>
                 <el-form ref="ruleFormRef" :model="ruleForm" label-position="top">
-                    <div class="headerTitle">申请信息</div>
-                    <div class="applyFormContainer">
-                        <el-table :data="approvalData" style="width: 100%; margin-bottom: 20px;">
-                            <el-table-column prop="name" label="资质名称" />
-                            <el-table-column prop="certificate" label="资质证书" align="center">
+                    <div class="headerTitle" v-if="detailForm.labelId">申请信息</div>
+                    <div class="applyFormContainer" v-if="detailForm.labelId">
+                        <el-table :data="detailForm.userQualificationCertificateList" style="width: 100%">
+                            <el-table-column prop="qualificationName" label="资质名称" width="100" />
+                            <el-table-column prop="certificateUrl" label="资质证书" align="center">
                                 <template #default="scope">
-                                    <el-image v-if="scope.row.certificate"
+                                    <el-image v-if="scope.row.certificateUrl"
                                         style="width: 70px; height: 44px;line-height: 50px;"
-                                        :src="scope.row.certificate" fit="fill" />
+                                        :src="baseUrl + scope.row.certificateUrl" fit="fill" />
+                                    <span v-else>请在"高压资质培训信息"上传资质证书</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="expired" label="是否过期">
+                            <el-table-column prop="status" label="是否过期" width="120">
                                 <template #default="scope">
-                                    <el-text v-if="scope.row.expired == false && scope.row.certificate" type="success"
+                                    <el-text v-if="scope.row.status == 1 && scope.row.certificateUrl" type="success"
                                         class="successText">正常</el-text>
-                                    <el-text v-if="scope.row.expired == true && scope.row.certificate" type="danger"
+                                    <el-text v-else-if="scope.row.status == 2 && scope.row.certificateUrl" type="danger"
                                         class="dangerText">过期</el-text>
+                                    <span v-else>-</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="startTime" label="有效开始日期">
+                            <el-table-column prop="startTime" label="有效开始日期" width="150">
                                 <template #default="scope">
-                                    <span v-if="scope.row.startTime && scope.row.certificate"> {{ scope.row.startTime
+                                    <span v-if="scope.row.startTime"> {{
+                                        moment(scope.row.startTime).format('YYYY-MM-DD')
                                         }}</span>
                                     <span v-else>-</span>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="expireTime" label="到期日期">
+                            <el-table-column prop="expireTime" label="到期日期" width="130">
                                 <template #default="scope">
-                                    <span v-if="scope.row.expireTime && scope.row.certificate"> {{ scope.row.expireTime
-                                        }}</span>
-                                    <span v-else>-</span>
+                                    <span v-if="scope.row.expireFlag == 0">长期</span>
+                                    <template v-else>
+                                        <span v-if="scope.row.expireTime"> {{
+                                            moment(scope.row.expireTime).format('YYYY-MM-DD')
+                                            }}</span>
+                                        <span v-else>-</span>
+                                    </template>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -122,162 +141,97 @@
                                 {{ scope.$index + 1 }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="name" label="节点名称" width="260" />
-                        <el-table-column prop="approvalResult" label="审批意见" min-width="100" align="left" />
-                        <el-table-column prop="approvalTime" label="审批时间" width="150">
+                        <el-table-column prop="checkNode" label="节点名称" width="260">
                             <template #default="scope">
-                                <span v-if="scope.row.approvalTime && scope.row.approvalTime"> {{ scope.row.approvalTime
-                                }}</span>
+                                <span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 1">提交申请</span>
+                                <span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 1">提交申请</span>
+                                <span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 2">ESC审核通过</span>
+                                <span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 9">ESC驳回</span>
+                                <span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 2">培训中心审核通过</span>
+                                <span v-if="scope.row.checkNode == 2 && scope.row.checkStatus == 9">培训中心驳回</span>
+                                <span v-if="scope.row.checkNode == 0 && scope.row.checkStatus == 3">用户重新申请</span>
+                                <span v-if="scope.row.checkNode == 1 && scope.row.checkStatus == 3">ESC代替用户重新申请</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="remark" label="审批意见" min-width="100" align="left" />
+                        <el-table-column prop="createTime" label="审批时间" width="230">
+                            <template #default="scope">
+                                <span v-if="scope.row.createTime"> {{ scope.row.createTime }}</span>
                                 <span v-else>-</span>
                             </template>
                         </el-table-column>
                     </el-table>
-                </div>
-                <el-form ref="ruleFormRef" :model="ruleForm" label-position="top">
-                    <div class="headerTitle">审批信息</div>
-                    <div class="applyFormContainer">
-                        <el-row class="myRow" :gutter="20">
-                            <el-col :span="6">
-                                <el-form-item label="审批结果" prop="urgency">
-                                    <el-radio-group v-model="ruleForm.urgency">
-                                        <el-radio value="2">驳回</el-radio>
-                                        <el-radio value="1">通过</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="18">
-                                <el-form-item label="审批意见" prop="urgency">
-                                    <el-input v-model="textarea" style="width: 100%" :rows="5" type="textarea"
-                                        placeholder="请输入" />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </div>
-                </el-form>
+                </div> 
             </el-card>
         </div>
 
         <div class="submitTool">
-            <el-button class="cancelApplyBtn" @click="handleCancel">取消</el-button>
-            <el-button class="submitApplyBtn" @click="handleSubmit">提交</el-button>
+            <el-button class="cancelApplyBtn" @click="handleCancel">返回</el-button> 
         </div>
     </div>
 
 </template>
 <script setup>
-import { reactive } from 'vue'
-import { Plus } from '@element-plus/icons-vue'
-import { useRouter } from 'vue-router'
+import { onMounted, reactive } from 'vue'
+import { getBusUserLabelDetail, getBusUserrLabelRecord } from "@/api/labelManage/labelManage"
+import moment from 'moment'
 
-const router = useRouter()
+const route = useRoute()
 const levelList = ref([
     { title: '标签管理', path: '/labelManage' },
     { title: 'ESC审批', path: '/labelManage/labelEscApproval' },
-    { title: '审批', path: '/labelManage/labelEscApproval/approvalDetail' }
+    { title: '审批详情', path: '/labelManage/labelEscApproval/approvalDetail' }
 ])
 const { proxy } = getCurrentInstance()
 const data = reactive({
-    ruleForm: {},
-    rules: {
-        targetQualification: [{ required: true, message: "目标资质不能为空", trigger: "change" }],
-        employeeNumber: [{ required: true, message: "员工工号不能为空", trigger: "blur" }],
-        employeeChineseName: [{ required: true, message: "员工姓名(中文)不能为空", trigger: "blur" }],
-        employeeEnglishName: [{ required: true, message: "员工姓名(英文)", trigger: "blur" }],
-        departmentName: [{ required: true, message: "部门不能为空", trigger: "change" }],
-        officeName: [{ required: true, message: "科室不能为空", trigger: "change" }],
-        localityName: [{ required: true, message: "属地不能为空", trigger: "change" }],
-        localityManager: [{ required: true, message: "属地ESC不能为空", trigger: "blur" }],
-    },
+    detailForm: {}, 
 })
-const tableData = [
-    {
-        name: '提交申请',
-        approvalResult: '-',
-        approvalTime: '2016-05-03'
-    },
-]
-const approvalData = [
-    {
-        name: '电工证',
-        certificate: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-        expired: false,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-    {
-        name: 'SH',
-        certificate: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-        expired: false,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-    {
-        name: 'ES',
-        certificate: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-        expired: false,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-    {
-        name: 'ESC',
-        certificate: null,
-        expired: null,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-    {
-        name: 'CESC',
-        certificate: null,
-        expired: null,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-    {
-        name: '急救证',
-        certificate: null,
-        expired: null,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-    {
-        name: 'LLP',
-        certificate: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-        expired: true,
-        startTime: '2016-05-03',
-        expireTime: '2019-05-03',
-    },
-]
-const { ruleForm, rules } = toRefs(data)
+const { detailForm } = toRefs(data)
+
+// 初始化
+onMounted(() => {
+    const id = route.params && route.params.Id
+    if (id) {
+        console.log('接收id', id)
+        ruleForm.value.id = id
+        getDetailInfo(id)
+        getLabelApprovalRecord(id)
+    } else {
+        ruleForm.value.id = null
+    }
+});
+
+// 获取详情
+const getDetailInfo = (_id) => {
+    getBusUserLabelDetail(_id).then(res => {
+        if (res.code == 200) {
+            detailForm.value = res.data
+            console.log('标签详情', detailForm.value)
+        }
+    })
+}
+const baseUrl = import.meta.env.VITE_APP_BASE_API
+// 审批记录
+const tableData = ref([])
+// 获取审批记录
+const getLabelApprovalRecord = (_id) => {
+    var queryParamsRecord = {
+        pageIndex: 1,
+        pageSize: 50,
+        userLabelId: _id
+    }
+    getBusUserrLabelRecord(queryParamsRecord).then(res => {
+        console.log('审批记录', res.data.list)
+        if (res.code == 200) tableData.value = res.data.list
+    })
+}
+
 const handleCancel = () => {
     proxy.resetForm("ruleFormRef")
     router.push({
         path: '/labelManage/labelEscApproval'
     })
 }
-const handleSubmit = () => {
-    proxy.$refs["ruleFormRef"].validate(valid => {
-        if (valid) {
-            router.push({
-                path: '/labelManage/labelEscApproval'
-            })
-            //   if (form.value.roleId != undefined) {
-            //     form.value.menuIds = getMenuAllCheckedKeys()
-            //     updateRole(form.value).then(response => {
-            //       proxy.$modal.msgSuccess("修改成功")
-            //       open.value = false
-            //       getList()
-            //     })
-            //   } else {
-            //     form.value.menuIds = getMenuAllCheckedKeys()
-            //     addRole(form.value).then(response => {
-            //       proxy.$modal.msgSuccess("新增成功")
-            //       open.value = false
-            //       getList()
-            //     })
-            //   }
-        }
-    })
-}
 </script>
 <style lang='scss'>
 .app-main {
@@ -372,6 +326,13 @@ const handleSubmit = () => {
     padding: 6px 14px;
 }
 
+.infoinfoText {
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    font-size: 18px;
+    color: #DD9200;
+}
+
 .successText {
     font-family: Microsoft YaHei;
     font-weight: 400;
@@ -464,7 +425,7 @@ const handleSubmit = () => {
     font-size: 16px !important;
     text-align: left !important;
     color: #787878 !important;
-    padding: 0 10px 0 60px;
+    padding: 0 10px 0 24px;
 }
 
 .myFormItemLable .el-form-item__content {
@@ -473,7 +434,7 @@ const handleSubmit = () => {
     font-size: 18px !important;
     text-align: left !important;
     color: #000000 !important;
-    padding-left: 60px;
+    padding-left: 24px;
 }
 
 .el-form-item--label-left .el-form-item__content {