From a128d2f139c42e27a04585a40dc4c3e52c91f627 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Tue, 13 Jan 2026 16:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E5=AE=89=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E9=80=81=E5=9F=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DictTag/index.vue              |   5 +
 src/router/index.js                           |  18 +++
 .../securityNjgl/components/detailForm.vue    |  23 ++-
 .../securityNjgl/components/shForm.vue        |  10 +-
 .../securityNjgl/components/steps.vue         |  41 +++--
 src/views/Training/securityNjgl/index.vue     |  45 ++++--
 .../securityNjsp/components/detailForm.vue    | 146 +++++++-----------
 .../securityNjsp/components/steps.vue         |  21 +--
 src/views/Training/securityNjsp/index.vue     |  26 ++--
 9 files changed, 186 insertions(+), 149 deletions(-)

diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 0361970..fe8058a 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -8,6 +8,7 @@
           :key="item.value"
           :index="index"
           :class="item.elTagType"
+          :style="{'color': props.color}"
           >{{ item.label }}</span>
         <el-tag
           v-else
@@ -33,6 +34,10 @@ const props = defineProps({
     type: Array,
     default: null
   },
+  color: {
+    type: String,
+    default: ''
+  },
   tag: false,
   value: [Number, String, Array]
 });
diff --git a/src/router/index.js b/src/router/index.js
index f2dd714..5bdda0f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -212,6 +212,24 @@ export const privateRoutes = [
           icon: "personnel"
         }
       },
+      {
+        path: "/trainingCompanyNjgl",
+        name: "trainingCompanyNjgl",
+        component: () => import("@/views/Training/trainingCompanyNjgl/index"),
+        meta: {
+          title: "公司保安员年检管理",
+          icon: "personnel"
+        }
+      },
+      {
+        path: "/trainingCompanyNjsp",
+        name: "trainingCompanyNjsp",
+        component: () => import("@/views/Training/trainingCompanyNjsp/index"),
+        meta: {
+          title: "年检签到",
+          icon: "personnel"
+        }
+      },
     ]
   },
   {
diff --git a/src/views/Training/securityNjgl/components/detailForm.vue b/src/views/Training/securityNjgl/components/detailForm.vue
index d5ca7fb..ff00eda 100644
--- a/src/views/Training/securityNjgl/components/detailForm.vue
+++ b/src/views/Training/securityNjgl/components/detailForm.vue
@@ -11,9 +11,6 @@
           <!-- 0-待审核 1-通过 2-驳回 -->
           {{ detail.shzt == 0 ? '待审核' : detail.shzt == 1 ? '通过' : '驳回' }}
         </li>
-        <!-- <li class="tag_item">驳回</li>
-        <li class="tag_item">通过</li>
-        <li class="tag_item">待审核</li> -->
       </ul>
       <!-- 内容描述 -->
       <el-descriptions class="desc" :column="3" border label-width="200px">
@@ -23,18 +20,28 @@
 
         <el-descriptions-item label="身份证号码">{{ detail.sfzhm }}</el-descriptions-item>
         <el-descriptions-item label="电话">{{ detail.dh }}</el-descriptions-item>
-        <el-descriptions-item label="性别">{{ detail.xb }}</el-descriptions-item>
-        <el-descriptions-item label="民族">{{ detail.mz }}</el-descriptions-item>
+        <el-descriptions-item label="性别">
+          <DictTag :value="detail.xb" :tag="false" :options="props.dic.D_BZ_XB" />
+        </el-descriptions-item>
+        <el-descriptions-item label="民族">
+          <DictTag :value="detail.mz" :tag="false" :options="props.dic.D_BZ_MZ" />
+        </el-descriptions-item>
         <el-descriptions-item label="籍贯">{{ detail.jg }}</el-descriptions-item>
-        <el-descriptions-item label="文化程度">{{ detail.whcd }}</el-descriptions-item>
+        <el-descriptions-item label="文化程度">
+          <DictTag :value="detail.whcd" :tag="false" :options="props.dic.D_BZ_WHCD" />
+        </el-descriptions-item>
 
         <el-descriptions-item label="证书编号">{{ detail.zsbh }}</el-descriptions-item>
         <el-descriptions-item label="上岗证号码">{{ detail.sgxkhm }}</el-descriptions-item>
-        <el-descriptions-item label="服务行业"> {{ detail.fwxy }}</el-descriptions-item>
+        <el-descriptions-item label="服务行业">
+          <DictTag :value="detail.fwxy" :tag="false" :options="props.dic.D_BAXX_SSHY" />
+        </el-descriptions-item>
 
         <el-descriptions-item label="服务行业名称">{{ detail.fwxymc }}</el-descriptions-item>
         <el-descriptions-item label="入职时间">{{ detail.rzsj }}</el-descriptions-item>
-        <el-descriptions-item label="政治面貌"> {{ detail.zzmm }}</el-descriptions-item>
+        <el-descriptions-item label="政治面貌">
+          <DictTag :value="detail.zzmm" :tag="false" :options="props.dic.D_BZ_ZZMM" />
+        </el-descriptions-item>
 
         <el-descriptions-item label="无犯罪记录证明">
           <div class="img-grid one">
diff --git a/src/views/Training/securityNjgl/components/shForm.vue b/src/views/Training/securityNjgl/components/shForm.vue
index 80efa81..5a0a0b0 100644
--- a/src/views/Training/securityNjgl/components/shForm.vue
+++ b/src/views/Training/securityNjgl/components/shForm.vue
@@ -2,13 +2,6 @@
   <div>
     <el-dialog class="steps-dialog" title="审核" v-model="dialogForm" :close-on-click-modal="false" @close="dialogForm = false,formData = {}" width="420px">
       <el-form :model="formData" ref="formRef" :rules="rules" label-width="120px">
-        <el-form-item label="审核类型" prop="auditType">
-          <el-select v-model="formData.auditType" placeholder="请选择审核类型">
-            <el-option label="保安公司审核" value="bakk"></el-option>
-            <el-option label="培训公司审核" value="pxgs"></el-option>
-            <el-option label="公安局审核" value="gongan"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="是否通过" prop="auditStatus">
           <el-radio-group v-model="formData.auditStatus">
             <el-radio label="1">通过</el-radio>
@@ -51,7 +44,8 @@ const submitForm = () =>{
   formRef.value.validate((valid) => {
     if (!valid) return;
     loading.value = true;
-    let params = { ...formData.value,ids:idsVal.value }
+    // // 保安公司审核 - bakk   培训公司审核 -- pxgs   公安局审核 -- gongan
+    let params = { ...formData.value,ids:idsVal.value,auditType:'bakk' }
       qcckPost(params,"/mosty-base/bans/njxx/batchAudit").then((res) => {
         loading.value = false;
         ElMessage.success("操作成功");
diff --git a/src/views/Training/securityNjgl/components/steps.vue b/src/views/Training/securityNjgl/components/steps.vue
index da5e4f7..b039ce1 100644
--- a/src/views/Training/securityNjgl/components/steps.vue
+++ b/src/views/Training/securityNjgl/components/steps.vue
@@ -3,7 +3,9 @@
     <el-dialog class="steps-dialog" title="审核流程" v-model="dialogForm" width="420px">
       <div class="steps-body">
         <el-steps direction="vertical" :active="active" :space="90">
-          <el-step v-for="(item, idx) in steps" :key="item.title" :title="item.title" :description="idx === 0 ? item.time : ''" />
+          <el-step title="保安公司审核" :description="dataForm.bakkShsj || '未审核'" />
+          <el-step title="培训公司审核" :description="dataForm.pxgsShsj || '未审核'" />
+          <el-step title="公安局审核" :description="dataForm.gonganShsj || '未审核'" />
         </el-steps>
       </div>
     </el-dialog>
@@ -11,18 +13,19 @@
 </template>
 
 <script setup>
+import { qcckPost } from "@/api/qcckApi.js";
 import { ref, defineExpose } from 'vue';
 const dialogForm = ref(false);
-const pxgsData = ref()
-const active = ref(1)
-const steps = ref([
-  { title: '保安公司审核', time: '2026-01-07　21:00' },
-  { title: '培训公司审核', time: '2026-01-07　21:00' },
-  { title: '公安局审核', time: '2026-01-07　21:00' },
-])
+const active = ref(0)
+const dataForm = ref({})
 const init = (row) => {
-  pxgsData.value = row
-  dialogForm.value = true;
+  let ids = [row.id]
+  qcckPost(ids,"/mosty-base/bans/njxx/getAuditStatusList").then(res=>{
+    dialogForm.value = true;
+    let obj = res ? res[0] : {};
+    dataForm.value = obj;
+    active.value = Number(obj.currentAuditStage) - 1;
+  })
 }
 
 defineExpose({
@@ -102,4 +105,22 @@ defineExpose({
 ::v-deep .is-finish .el-step__icon{
   background: #86b6f1;
 }
+::v-deep .el-dialog__close{
+  width: 30px;
+  height: 30px;
+  color: #fff;
+  svg{
+    width: 30px;
+    height: 30px;
+  }
+}
+::v-deep .el-dialog__headerbtn{
+  top: auto;
+  bottom: -60px;
+  border: 2px solid #fff;
+  color: #fff;
+  left: 50%;
+  transform: translateX(-50%);
+  border-radius: 50%;
+}
 </style>
diff --git a/src/views/Training/securityNjgl/index.vue b/src/views/Training/securityNjgl/index.vue
index 8572c5a..4707bc6 100644
--- a/src/views/Training/securityNjgl/index.vue
+++ b/src/views/Training/securityNjgl/index.vue
@@ -21,8 +21,8 @@
         <template #fwxy="{ row }">
           <DictTag :value="row.fwxy" :tag="false" :options="D_BAXX_SSHY" />
         </template>
-        <template #shzt="{ row }">
-          <DictTag :value="row.shzt" :tag="false" :options="D_BA_SHZT" />
+        <template #bakkShzt="{ row }">
+          <DictTag :value="row.bakkShzt" :tag="false" :color="row.bakkShzt == 0 ? '#ff0000' : row.bakkShzt == 1 ? '#28EEBF' : '#FA3758'" :options="D_BA_SHZT" />
         </template>
         <template #sptz="{ row }">
           <DictTag :value="row.sptz" :tag="false" :options="D_BA_SPZT" />
@@ -30,9 +30,9 @@
         <!-- 操作 -->
         <template #controls="{ row }">
           <!--currentAuditStage 当前审核阶段：1-保安公司审核阶段，2-培训公司审核阶段，3-公安局审核阶段，4-审核完成 -->
-          <el-link type="primary" link @click="onBatchAudit([row.id])">立即审核</el-link>
+          <el-link type="primary" link @click="onBatchAudit([row.id])" v-if="row.bakkShzt == 0">立即审核</el-link>
           <el-link type="primary" link @click="addEdit('RefSteap', row)">审核流程</el-link>
-          <el-link type="primary" link @click="handleItemSp([row.id])">送培</el-link>
+          <el-link type="primary" link @click="handleItemSp([row.id])" v-if="row.sptz == 0 && row.bakkShzt == 1">送培</el-link>
           <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
         </template>
       </MyTable>
@@ -42,7 +42,7 @@
       }"></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" :dict="{D_BZ_ZZMM,D_BZ_XB,D_BZ_MZ,D_BA_SHZT,D_BAXX_SSHY,D_BA_SPZT,D_BZ_WHCD}"/>
+    <DetailForm ref="detailDiloag" :dic="{D_BZ_ZZMM,D_BZ_XB,D_BZ_MZ,D_BA_SHZT,D_BAXX_SSHY,D_BA_SPZT,D_BZ_WHCD}"/>
     <!-- 审核流程 -->
     <Steps ref="RefSteap" ></Steps>
     <!-- 审核 -->
@@ -51,6 +51,7 @@
 </template>
 
 <script setup>
+import { getItem } from "@/utils/storage";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -63,6 +64,7 @@ import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
 const { D_BZ_ZZMM,D_BZ_XB,D_BZ_MZ,D_BA_SHZT,D_BAXX_SSHY,D_BA_SPZT,D_BZ_WHCD } = proxy.$dict('D_BZ_ZZMM','D_BZ_XB','D_BZ_MZ','D_BA_SHZT','D_BAXX_SSHY','D_BA_SPZT','D_BZ_WHCD');
+const userInfo = getItem('userInfo');
 const detailDiloag = ref();
 const RefSteap = ref();
 const shForm = ref();
@@ -86,7 +88,7 @@ const searchConfiger = ref([
   },
   {
     label: "审核状态",
-    prop: "shzt",
+    prop: "bakkShzt",
     showType: "select",
     placeholder: "不限",
     clearable: true,
@@ -129,7 +131,7 @@ const pageData = reactive({
     { label: "服务行业", prop: "fwxy", showSolt: true },
     { label: "入职时间", prop: "rzsj" },
     { label: "上岗证号码", prop: "sgxkhm", showOverflowTooltip: true },
-    { label: "审核状态", prop: "shzt", showSolt: true },
+    { label: "审核状态", prop: "bakkShzt", showSolt: true },
     { label: "审核时间", prop: "shsj" },
     { label: "送培状态", prop: "sptz", showSolt: true }
   ]
@@ -155,9 +157,12 @@ const changeSize = (val) => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
+  
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
+    ssbakk:userInfo.pxgs,
+    ssbakkId:userInfo.pxgsid
   }
   qcckPost(promes,'/mosty-base/bans/njxx/page').then(res => {
     pageData.tableData = res.records || [];
@@ -172,17 +177,33 @@ const chooseData = (rows) => {
   selectedRows.value = Array.isArray(rows) ? rows : [];
 };
 
-const onBatchAudit = (ids) => {
-  if (!ids.length) return ElMessage.warning("请选择需要的数据");
+const onBatchAudit = (valIds) => {
+  let ids = [];
+  valIds.forEach(id =>{
+    let obj = pageData.tableData.find(it=>it.id == id);
+    if(obj && obj.bakkShzt == 0) ids.push(id);
+  });
+  if (!ids.length) return ElMessage.warning("请选择未审核的数据！该数据再审核状态下不能操作！");
   shForm.value.init(ids);
 };
 
 // 送培
-const handleItemSp = (ids) =>{
+const handleItemSp = (valIds) =>{
+  let ids = [];
+  valIds.forEach(id =>{
+    let obj = pageData.tableData.find(it=>it.id == id);
+    if(obj && obj.sptz == 0 && obj.bakkShzt == 1) ids.push(id);
+  });
+  if (!ids.length) return ElMessage.warning("请选择未送培的数据！该数据已送培！");
   proxy.$modal.confirm("是否确认送培？").then(() => {
-    qcckPost(ids,'/mosty-base/bans/njxx/sendTraining').then(res=>{
-      ElMessage.success("送培成功");
+    let params = {
+      ssbakk:userInfo.pxgs,
+      ssbakkId:userInfo.pxgsid,
+      ids:ids
+    }
+    qcckPost(params,'/mosty-base/bans/njxx/sendTraining').then(res=>{
       getList()
+      ElMessage.success("送培成功");
     })
   });
 }
diff --git a/src/views/Training/securityNjsp/components/detailForm.vue b/src/views/Training/securityNjsp/components/detailForm.vue
index ac592d1..7e4b4aa 100644
--- a/src/views/Training/securityNjsp/components/detailForm.vue
+++ b/src/views/Training/securityNjsp/components/detailForm.vue
@@ -7,75 +7,80 @@
     <div class="cntinfo">
       <!-- 标签 -->
       <ul class="tag-box">
-        <li class="tag_item">驳回</li>
-        <li class="tag_item">通过</li>
-        <li class="tag_item">待审核</li>
+        <li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'">
+          <!-- 0-待审核 1-通过 2-驳回 -->
+          {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
+        </li>
       </ul>
       <!-- 内容描述 -->
       <el-descriptions class="desc" :column="3" border label-width="200px">
-        <el-descriptions-item label="保安公司名称">{{ detail.companyName }}</el-descriptions-item>
-        <el-descriptions-item label="年审年份">{{ detail.reviewYear }}</el-descriptions-item>
+        <el-descriptions-item label="保安公司名称">{{ detail.ssbakk }}</el-descriptions-item>
+        <el-descriptions-item label="年审年份">{{ detail.njnf }}</el-descriptions-item>
         <el-descriptions-item label="姓名">{{ detail.xm }}</el-descriptions-item>
 
-        <el-descriptions-item label="身份证号码">{{ detail.sfzh }}</el-descriptions-item>
-        <el-descriptions-item label="电话">{{ detail.phone }}</el-descriptions-item>
-        <el-descriptions-item label="性别">{{ detail.sexText }}</el-descriptions-item>
+        <el-descriptions-item label="身份证号码">{{ detail.sfzhm }}</el-descriptions-item>
+        <el-descriptions-item label="电话">{{ detail.dh }}</el-descriptions-item>
+        <el-descriptions-item label="性别">
+          <DictTag :value="detail.xb" :tag="false" :options="props.dic.D_BZ_XB" />
+        </el-descriptions-item>
+        <el-descriptions-item label="民族">
+          <DictTag :value="detail.mz" :tag="false" :options="props.dic.D_BZ_MZ" />
+        </el-descriptions-item>
+        <el-descriptions-item label="籍贯">{{ detail.jg }}</el-descriptions-item>
+        <el-descriptions-item label="文化程度">
+          <DictTag :value="detail.whcd" :tag="false" :options="props.dic.D_BZ_WHCD" />
+        </el-descriptions-item>
 
-        <el-descriptions-item label="民族">{{ detail.nationText }}</el-descriptions-item>
-        <el-descriptions-item label="籍贯">{{ detail.nativePlace }}</el-descriptions-item>
-        <el-descriptions-item label="文化程度">{{ detail.education }}</el-descriptions-item>
+        <el-descriptions-item label="证书编号">{{ detail.zsbh }}</el-descriptions-item>
+        <el-descriptions-item label="上岗证号码">{{ detail.sgxkhm }}</el-descriptions-item>
+        <el-descriptions-item label="服务行业">
+          <DictTag :value="detail.fwxy" :tag="false" :options="props.dic.D_BAXX_SSHY" />
+        </el-descriptions-item>
 
-        <el-descriptions-item label="证书编号">{{ detail.certificateNo }}</el-descriptions-item>
-        <el-descriptions-item label="上岗证号码">{{ detail.workCardNo }}</el-descriptions-item>
-        <el-descriptions-item label="服务行业">{{ detail.serviceIndustry }}</el-descriptions-item>
-
-        <el-descriptions-item label="服务行业名称">{{ detail.serviceIndustryName }}</el-descriptions-item>
-        <el-descriptions-item label="入职时间">{{ detail.entryDate }}</el-descriptions-item>
-        <el-descriptions-item label="政治面貌">{{ detail.politicalStatus }}</el-descriptions-item>
+        <el-descriptions-item label="服务行业名称">{{ detail.fwxymc }}</el-descriptions-item>
+        <el-descriptions-item label="入职时间">{{ detail.rzsj }}</el-descriptions-item>
+        <el-descriptions-item label="政治面貌">
+          <DictTag :value="detail.zzmm" :tag="false" :options="props.dic.D_BZ_ZZMM" />
+        </el-descriptions-item>
 
         <el-descriptions-item label="无犯罪记录证明">
           <div class="img-grid one">
             <el-image
-              v-for="(src, idx) in noCrimeUrls"
-              :key="idx"
-              :src="src"
+              :src="baseUrl + detail.wfbjlzm"
               fit="cover"
-              :preview-src-list="noCrimeUrls"
+              :preview-src-list='[baseUrl + detail.wfbjlzm]'
               preview-teleported
               class="img"
             />
-            <div v-if="noCrimeUrls.length === 0" class="img-placeholder"></div>
           </div>
         </el-descriptions-item>
         <el-descriptions-item label="体检报告">
           <div class="img-grid one">
             <el-image
-              v-for="(src, idx) in medicalUrls"
-              :key="idx"
-              :src="src"
+              :src="baseUrl + detail.tjbg"
               fit="cover"
-              :preview-src-list="medicalUrls"
+              :preview-src-list='[baseUrl + detail.tjbg]'
               preview-teleported
               class="img"
             />
-            <div v-if="medicalUrls.length === 0" class="img-placeholder"></div>
           </div>
         </el-descriptions-item>
         <el-descriptions-item label="身份证正反面">
           <div class="img-grid two">
-            <el-image
-              v-for="(src, idx) in idCardUrls"
-              :key="idx"
-              :src="src"
+             <el-image
+              :src="baseUrl + detail.sfzzm"
               fit="cover"
-              :preview-src-list="idCardUrls"
+              :preview-src-list='[baseUrl + detail.sfzzm]'
+              preview-teleported
+              class="img"
+            />
+            <el-image
+              :src="baseUrl + detail.sfzfm"
+              fit="cover"
+              :preview-src-list='[baseUrl + detail.sfzfm]'
               preview-teleported
               class="img"
             />
-            <template v-if="idCardUrls.length === 0">
-              <div class="img-placeholder"></div>
-              <div class="img-placeholder"></div>
-            </template>
           </div>
         </el-descriptions-item>
 
@@ -90,45 +95,29 @@
 </template>
 
 <script setup>
-import { ref, computed, defineEmits, getCurrentInstance } from 'vue';
+import { ref, defineEmits } from 'vue';
 const emit = defineEmits(["refresh"]);
-const { proxy } = getCurrentInstance();
+const baseUrl = '/bagl/mosty-base/minio/image/download'
 const props = defineProps({
-  dict: {
+  dic: {
     default: [[]], //二维数组
     type: Array
   }
 })
 const dialogForm = ref(false);
 const listQuery = ref({});
+const detail = ref({})
 
 // 初始化数据
 const init = (type, row,) => {
   dialogForm.value = true;
-  const raw = row || {};
-  listQuery.value = {
-    ...raw,
-    companyName: raw.companyName || raw.dwmc || raw.gsmc || raw.bagsmc,
-    reviewYear: raw.reviewYear || raw.njnd || raw.njYear || raw.nf || raw.year,
-    phone: raw.phone || raw.lxdh || raw.dh || raw.sjhm || raw.xssbrdh,
-    sexText: raw.sexText || raw.xbText || raw.xb || raw.sex,
-    nationText: raw.nationText || raw.mzText || raw.mz,
-    nativePlace: raw.nativePlace || raw.jg || raw.jgText,
-    education: raw.education || raw.whcd || raw.whcdText,
-    certificateNo: raw.certificateNo || raw.zsbh || raw.zsbhm || raw.zjbh,
-    workCardNo: raw.workCardNo || raw.sgzh || raw.sgzNumber,
-    serviceIndustry: raw.serviceIndustry || raw.fwhy || raw.fwhyText || raw.hy,
-    serviceIndustryName: raw.serviceIndustryName || raw.fwhymc || raw.hyName,
-    entryDate: raw.entryDate || raw.rzsj || raw.rzrq,
-    politicalStatus: raw.politicalStatus || raw.zzmm || raw.zzmmText,
-    auditTime: raw.auditTime || raw.shsj || raw.njsj,
-    rejectReason: raw.rejectReason || raw.bhyy || raw.bhReason || raw.reason,
-    issuingAuthority: raw.issuingAuthority || raw.fzjg,
-    issueDate: raw.issueDate || raw.fzrq,
-    noCrimeProof: raw.noCrimeProof || raw.wffzjlzm || raw.wffzjlzmId,
-    medicalReport: raw.medicalReport || raw.tjbg || raw.tjbgId,
-    idCardImages: raw.idCardImages || raw.sfzzf || raw.sfzImgs || raw.sfzzm,
-  };
+  let obj = JSON.parse(JSON.stringify(row));
+  let zj = obj.sfzzfmj.split(',');
+  obj.sfzzm = [zj[0]];
+  obj.sfzfm = [zj[1]];
+  setTimeout(() => {
+    detail.value = obj;
+  }, 1000);
 };
 
 const close = () => {
@@ -136,29 +125,6 @@ const close = () => {
   listQuery.value = {};
 };;
 
-const detail = computed(() => listQuery.value || {});
-
-const toIdList = (val, limit) => {
-  const v = val ?? [];
-  const arr = Array.isArray(v) ? v : [v];
-  const ids = arr
-    .map((el) => {
-      if (!el) return null;
-      if (typeof el === 'string' || typeof el === 'number') return String(el);
-      if (typeof el === 'object') return el.id ? String(el.id) : null;
-      return null;
-    })
-    .filter(Boolean);
-  return typeof limit === 'number' ? ids.slice(0, limit) : ids;
-};
-
-const toUrls = (val, limit) => {
-  return toIdList(val, limit).map((id) => `/bagl/mosty-base/minio/image/download/${id}`);
-};
-
-const noCrimeUrls = computed(() => toUrls(detail.value.noCrimeProof, 1));
-const medicalUrls = computed(() => toUrls(detail.value.medicalReport, 1));
-const idCardUrls = computed(() => toUrls(detail.value.idCardImages, 2));
 
 defineExpose({ init })
 </script>
@@ -192,17 +158,17 @@ defineExpose({ init })
       font-size: 16px;
       margin-bottom: 20px;
     }
-    .tag_item:nth-child(1){
+    .jtb_item{
       border: 5px solid #FA3758;
       color: #FA3758;
       background: rgba(250,55,88,0.2);
     }
-    .tag_item:nth-child(2){
+    .tgg_item{
       color: #28EEBF;
       background: rgba(40,238,191,0.2);
       border: 5px solid #28EEBF;
     }
-    .tag_item:nth-child(3){
+    .dsh_item{
       background: rgba(0,114,255,0.2);
        color: #0072FF;
       border: 5px solid #0072FF;
diff --git a/src/views/Training/securityNjsp/components/steps.vue b/src/views/Training/securityNjsp/components/steps.vue
index da5e4f7..9ea5b10 100644
--- a/src/views/Training/securityNjsp/components/steps.vue
+++ b/src/views/Training/securityNjsp/components/steps.vue
@@ -3,7 +3,9 @@
     <el-dialog class="steps-dialog" title="审核流程" v-model="dialogForm" width="420px">
       <div class="steps-body">
         <el-steps direction="vertical" :active="active" :space="90">
-          <el-step v-for="(item, idx) in steps" :key="item.title" :title="item.title" :description="idx === 0 ? item.time : ''" />
+          <el-step title="保安公司审核" :description="dataForm.bakkShsj || '未审核'" />
+          <el-step title="培训公司审核" :description="dataForm.pxgsShsj || '未审核'" />
+          <el-step title="公安局审核" :description="dataForm.gonganShsj || '未审核'" />
         </el-steps>
       </div>
     </el-dialog>
@@ -11,18 +13,19 @@
 </template>
 
 <script setup>
+import { qcckPost } from "@/api/qcckApi.js";
 import { ref, defineExpose } from 'vue';
 const dialogForm = ref(false);
-const pxgsData = ref()
 const active = ref(1)
-const steps = ref([
-  { title: '保安公司审核', time: '2026-01-07　21:00' },
-  { title: '培训公司审核', time: '2026-01-07　21:00' },
-  { title: '公安局审核', time: '2026-01-07　21:00' },
-])
+const dataForm = ref({})
 const init = (row) => {
-  pxgsData.value = row
-  dialogForm.value = true;
+  let ids = [row.id]
+  qcckPost(ids,"/mosty-base/bans/njxx/getAuditStatusList").then(res=>{
+    dialogForm.value = true;
+    let obj = res ? res[0] : {};
+    dataForm.value = obj;
+    active.value = Number(obj.currentAuditStage) - 1;
+  })
 }
 
 defineExpose({
diff --git a/src/views/Training/securityNjsp/index.vue b/src/views/Training/securityNjsp/index.vue
index df7fdc9..d81490a 100644
--- a/src/views/Training/securityNjsp/index.vue
+++ b/src/views/Training/securityNjsp/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="titleBox">
       <PageTitle title="保安员年检送培">
-        <el-button type="primary" @click="onBatchAudit">新增</el-button>
+        <el-button type="primary" @click="onBatchAudit">批量送培</el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
@@ -19,7 +19,7 @@
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link type="primary" link @click="addEdit('RefSteap', row)">审核流程</el-link>
+          <el-link type="primary" link @click="addEdit('sh', row)">审核流程</el-link>
           <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
         </template>
       </MyTable>
@@ -29,9 +29,11 @@
       }"></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" :dict="{D_BZ_SF}"/>
+    <DetailForm ref="detailDiloag" :dic="{ D_BZ_ZZMM,D_BZ_XB,D_BZ_MZ,D_BA_SHZT,D_BAXX_SSHY,D_BA_SPZT,D_BZ_WHCD }"/>
     <!-- 审核流程 -->
     <Steps ref="RefSteap" ></Steps>
+    <!-- 送培 -->
+    <AddSp ref="addSpDiloag" @refresh="getList" />
   </div>
 </template>
 
@@ -42,14 +44,16 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
 import Steps from "./components/steps.vue";
+import AddSp from "./components/addSp.vue";
 import {getItem} from '@/utils/storage.js'
 import { qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { ElMessage } from "element-plus";
+const userInfo = getItem('userInfo');
 const { proxy } = getCurrentInstance();
-const { D_BA_SHZT,D_BA_SPZT } = proxy.$dict("D_BA_SHZT",'D_BA_SPZT');
+const { D_BZ_ZZMM,D_BZ_XB,D_BZ_MZ,D_BA_SHZT,D_BAXX_SSHY,D_BA_SPZT,D_BZ_WHCD } = proxy.$dict('D_BZ_ZZMM','D_BZ_XB','D_BZ_MZ','D_BA_SHZT','D_BAXX_SSHY','D_BA_SPZT','D_BZ_WHCD');
 const detailDiloag = ref();
 const RefSteap = ref();
+const addSpDiloag = ref();
 const shForm = ref();
 const searchBox = ref(); //搜索框
 const selectedRows = ref([]);
@@ -124,6 +128,8 @@ const getList = () => {
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
+    ssbakk:userInfo.pxgs,
+    ssbakkId:userInfo.pxgsid
   }
   qcckPost(promes,'/mosty-base/bans/njxx/listForSendTraining').then((res) => {
     pageData.tableData = res.records || []
@@ -139,19 +145,15 @@ const chooseData = (rows) => {
 };
 
 const onBatchAudit = () => {
-  if (!selectedRows.value.length) {
-    ElMessage.warning("请选择需要审核的数据");
-    return;
-  }
-  ElMessage.success("已选择 " + selectedRows.value.length + " 条");
+  addSpDiloag.value.init();
 };
 
 
 // 详情
 const addEdit = (type, row) => {
   nextTick(() => {
-    if(type == 'RefSteap'){
-      RefSteap.value.init(row);
+    if(type == 'sh'){
+      addSpDiloag.value.init(row);
     }else if(type == 'shForm'){
       shForm.value.init(row);
     }