From 1a30a3ece46a93b0fb6282f1b99eab289787d276 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Mon, 12 Jan 2026 23:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../securityNjgl/components/detailForm.vue    | 148 ++++++---------
 .../securityNjgl/components/shForm.vue        |  49 ++++-
 src/views/Training/securityNjgl/index.vue     | 173 ++++++------------
 src/views/Training/securityNjsp/index.vue     | 111 +++--------
 4 files changed, 181 insertions(+), 300 deletions(-)

diff --git a/src/views/Training/securityNjgl/components/detailForm.vue b/src/views/Training/securityNjgl/components/detailForm.vue
index ac592d1..d5ca7fb 100644
--- a/src/views/Training/securityNjgl/components/detailForm.vue
+++ b/src/views/Training/securityNjgl/components/detailForm.vue
@@ -7,165 +7,124 @@
     <div class="cntinfo">
       <!-- 标签 -->
       <ul class="tag-box">
-        <li class="tag_item">驳回</li>
+        <li class="tag_item" :class="detail.shzt == 0 ? 'dsh_item' : detail.shzt == 1 ? 'tgg_item' : 'jtb_item'">
+          <!-- 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>
+        <li class="tag_item">待审核</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="性别">{{ detail.xb }}</el-descriptions-item>
+        <el-descriptions-item label="民族">{{ detail.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="民族">{{ 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="服务行业"> {{ detail.fwxy }}</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="政治面貌"> {{ detail.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"
+              :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>
 
-        <el-descriptions-item label="审核时间">{{ detail.auditTime }}</el-descriptions-item>
-        <el-descriptions-item label="发证机关">{{ detail.issuingAuthority }}</el-descriptions-item>
-        <el-descriptions-item label="发证日期">{{ detail.issueDate }}</el-descriptions-item>
+        <el-descriptions-item label="审核时间">{{ detail.shsj }}</el-descriptions-item>
+        <el-descriptions-item label="发证机关">{{ detail.fqjg }}</el-descriptions-item>
+        <el-descriptions-item label="发证日期">{{ detail.fqsj }}</el-descriptions-item>
 
-        <el-descriptions-item label="驳回原因" :span="3">{{ detail.rejectReason }}</el-descriptions-item>
+        <el-descriptions-item label="驳回原因" :span="3">{{ detail.bhyy }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
 </template>
 
 <script setup>
-import { ref, computed, defineEmits, getCurrentInstance } from 'vue';
+import { ref, computed, defineEmits, getCurrentInstance,defineProps } from 'vue';
+import { qcckPost } from "@/api/qcckApi.js";
 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,
-  };
+  qcckPost({},'/mosty-base/bans/njxx/getInfo/'+row.id).then(res => {
+    let zj = res.sfzzfmj.split(',');
+    res.sfzzm = [zj[0]];
+    res.sfzfm = [zj[1]];
+    detail.value = res || {};
+  })
 };
 
 const close = () => {
   dialogForm.value = false;
-  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;
+  detail.value = {};
 };
 
-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>
 
 <style lang="scss" scoped>
 @import "@/assets/css/layout.scss";
-
 .mapBox {
   width: calc(100% - 24rem);
   height: 500px;
@@ -183,6 +142,7 @@ defineExpose({ init })
     display: flex;
     flex-direction: column;
     gap: 10px;
+    z-index: 99999;
     .tag_item{
       width: 70px;
       height: 70px;
@@ -192,17 +152,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/securityNjgl/components/shForm.vue b/src/views/Training/securityNjgl/components/shForm.vue
index 1a2ebd4..80efa81 100644
--- a/src/views/Training/securityNjgl/components/shForm.vue
+++ b/src/views/Training/securityNjgl/components/shForm.vue
@@ -1,19 +1,26 @@
 <template>
   <div>
-    <el-dialog class="steps-dialog" title="审核" v-model="dialogForm" :close-on-click-modal="false" @close="dialogForm = false" width="420px">
+    <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>
             <el-radio label="0">不通过</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="驳回原因" prop="auditRemark" v-if="formData.auditStatus === '0'">
-          <el-input v-model="formData.auditRemark" type="textarea" placeholder="请输入驳回原因" :autosize="{ minRows: 2, maxRows: 4 }" />
+        <el-form-item label="驳回原因" prop="rejectReason" v-if="formData.auditStatus === '0'">
+          <el-input v-model="formData.rejectReason" type="textarea" placeholder="请输入驳回原因" :autosize="{ minRows: 2, maxRows: 4 }" />
         </el-form-item>
         <div class="flex just-center">
-          <el-button @click="dialogForm = false">取消</el-button>
-          <el-button type="primary" @click="submitForm">提交</el-button>
+          <el-button @click="dialogForm = false,formData = {}">取消</el-button>
+          <el-button type="primary" :loading="loading" @click="submitForm">提交</el-button>
         </div>
       </el-form>
     </el-dialog>
@@ -21,18 +28,42 @@
 </template>
 
 <script setup>
-import { ref, defineExpose } from 'vue';
+import { ElMessage } from "element-plus";
+import { ref, defineExpose,defineEmits } from 'vue';
+import { qcckPost } from "@/api/qcckApi.js";
+const emit = defineEmits(['refresh'])
 const dialogForm = ref(false);
+const loading = ref(false)
 const formData = ref({})
 const rules = ref({
+  auditType: [{ required: true, message: '请选择审核类型', trigger: 'blur' }],
   auditStatus: [{ required: true, message: '请选择是否通过', trigger: 'blur' }],
-  auditRemark: [{ required: true, message: '请输入驳回原因', trigger: 'blur' }],
+  rejectReason: [{ required: true, message: '请输入驳回原因', trigger: 'blur' }],
 })
-const init = (row) => {
-  formData.value = row
+const formRef = ref();
+const idsVal = ref([])
+const init = (ids) => {
+  idsVal.value = ids;
   dialogForm.value = true;
 }
 
+const submitForm = () =>{
+  formRef.value.validate((valid) => {
+    if (!valid) return;
+    loading.value = true;
+    let params = { ...formData.value,ids:idsVal.value }
+      qcckPost(params,"/mosty-base/bans/njxx/batchAudit").then((res) => {
+        loading.value = false;
+        ElMessage.success("操作成功");
+        dialogForm.value = false;
+        formData.value={}
+        emit('refresh')
+      }).catch(()=>{
+        loading.value = false;
+      });
+  });
+}
+
 defineExpose({
   init
 })
diff --git a/src/views/Training/securityNjgl/index.vue b/src/views/Training/securityNjgl/index.vue
index 52fb29c..8572c5a 100644
--- a/src/views/Training/securityNjgl/index.vue
+++ b/src/views/Training/securityNjgl/index.vue
@@ -1,7 +1,10 @@
 <template>
   <div>
     <div class="titleBox">
-      <PageTitle title="保安员年检管理" />
+      <PageTitle title="保安员年检管理" >
+        <el-button type="primary" @click="onBatchAudit(selectedRows)">批量审核</el-button>
+        <el-button type="primary" @click="handleItemSp(selectedRows)">批量送培</el-button>
+      </PageTitle>
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
@@ -9,28 +12,27 @@
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <div style="margin-bottom: 12px;">
-        <el-button type="primary" @click="onBatchAudit">批量审核</el-button>
-      </div>
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
-        <template #auditStatus="{ row }">
-          <el-tag v-if="String(row.auditStatus || '').includes('驳回')" type="danger">{{ row.auditStatus }}</el-tag>
-          <el-tag v-else-if="String(row.auditStatus || '').includes('待')" type="warning">{{ row.auditStatus }}</el-tag>
-          <el-tag v-else-if="String(row.auditStatus || '').includes('通过')" type="success">{{ row.auditStatus }}</el-tag>
-          <span v-else>{{ row.auditStatus }}</span>
+        <template #whcd="{ row }">
+          <DictTag :value="row.whcd" :tag="false" :options="D_BZ_WHCD" />
         </template>
-        <template #sendStatus="{ row }">
-          <el-tag v-if="String(row.sendStatus || '').includes('未')" type="info">{{ row.sendStatus }}</el-tag>
-          <el-tag v-else-if="String(row.sendStatus || '').includes('已')" type="success">{{ row.sendStatus }}</el-tag>
-          <span v-else>{{ row.sendStatus }}</span>
+        <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>
+        <template #sptz="{ row }">
+          <DictTag :value="row.sptz" :tag="false" :options="D_BA_SPZT" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-            <el-link type="primary" link @click="addEdit('shForm', row)">立即审核</el-link>
+          <!--currentAuditStage 当前审核阶段：1-保安公司审核阶段，2-培训公司审核阶段，3-公安局审核阶段，4-审核完成 -->
+          <el-link type="primary" link @click="onBatchAudit([row.id])">立即审核</el-link>
           <el-link type="primary" link @click="addEdit('RefSteap', row)">审核流程</el-link>
-          <el-link type="primary" link @click="addEdit('sp', row)">送培</el-link>
+          <el-link type="primary" link @click="handleItemSp([row.id])">送培</el-link>
           <el-link type="primary" link @click="addEdit('detail', row)">详情</el-link>
         </template>
       </MyTable>
@@ -40,11 +42,11 @@
       }"></Pages>
     </div>
     <!-- 详情 -->
-    <DetailForm ref="detailDiloag" :dict="{D_BZ_SF}"/>
+    <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}"/>
     <!-- 审核流程 -->
     <Steps ref="RefSteap" ></Steps>
     <!-- 审核 -->
-    <ShForm ref="shForm" />
+    <ShForm ref="shForm" @refresh="getList" />
   </div>
 </template>
 
@@ -56,12 +58,11 @@ import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
 import Steps from "./components/steps.vue";
 import ShForm from "./components/shForm.vue";
-import {getItem} from '@/utils/storage.js'
-import { cyryPage,njryPage} from "@/api/pxzx.js";
+import { qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
-const { D_BZ_SF ,D_BAXX_DWLX} = proxy.$dict("D_BZ_SF","D_BAXX_DWLX");
+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 shForm = ref();
@@ -75,12 +76,12 @@ const searchConfiger = ref([
   },
   {
     label: "身份证号码",
-    prop: "sfzh",
+    prop: "sfzhm",
     showType: "input"
   },
   {
     label: "电话",
-    prop: "lxdh",
+    prop: "dh",
     showType: "input"
   },
   {
@@ -90,45 +91,21 @@ const searchConfiger = ref([
     placeholder: "不限",
     clearable: true,
     defaultVal: "",
-    options: [
-      { label: "驳回", value: "驳回" },
-      { label: "待审核", value: "待审核" },
-      { label: "通过", value: "通过" }
-    ]
+    options: D_BA_SHZT
   },
   {
     label: "送培状态",
-    prop: "spzt",
+    prop: "sptz",
     showType: "select",
     placeholder: "不限",
     clearable: true,
     defaultVal: "",
-    options: [
-      { label: "未送培", value: "未送培" },
-      { label: "已送培", value: "已送培" }
-    ]
+    options: D_BA_SPZT
   }
 ]);
-const idEntityCard=getItem('idEntityCard')
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [
-    {
-        companyName: "保安公司名称",
-        reviewYear: "年审年份",
-        xm: "姓名",
-        sfzh: "身份证号码",
-        phone: "电话",
-        education: "文化程度",
-        certificateNo: "证书编号",
-        serviceIndustry: "服务行业",
-        entryDate: "入职时间",
-        workCardNo: "上岗证号码",
-        auditStatus: "审核状态",
-        auditTime: "审核时间",
-        sendStatus: "送培状态"
-    }
-  ],
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -138,36 +115,35 @@ const pageData = reactive({
   total: 0,
   pageConfiger: {
     pageSize: 20,
-    pageCurrent: 1
+    pageNum: 1
   },
   controlsWidth: 280,
   tableColumn: [
-    { label: "保安公司名称", prop: "companyName", width: 160, showOverflowTooltip: true },
-    { label: "年审年份", prop: "reviewYear", width: 100 },
-    { label: "姓名", prop: "xm", width: 100 },
-    { label: "身份证号码", prop: "sfzh", width: 170, showOverflowTooltip: true },
-    { label: "电话", prop: "phone", width: 120 },
-    { label: "文化程度", prop: "education", width: 110 },
-    { label: "证书编号", prop: "certificateNo", width: 140, showOverflowTooltip: true },
-    { label: "服务行业", prop: "serviceIndustry", width: 110 },
-    { label: "入职时间", prop: "entryDate", width: 120 },
-    { label: "上岗证号码", prop: "workCardNo", width: 140, showOverflowTooltip: true },
-    { label: "审核状态", prop: "auditStatus", width: 100, showSolt: true },
-    { label: "审核时间", prop: "auditTime", width: 140 },
-    { label: "送培状态", prop: "sendStatus", width: 100, showSolt: true }
+    { label: "保安公司名称", prop: "ssbakk", showOverflowTooltip: true },
+    { label: "年审年份", prop: "njnf" },
+    { label: "姓名", prop: "xm" },
+    { label: "身份证号码", prop: "sfzhm", showOverflowTooltip: true },
+    { label: "电话", prop: "dh" },
+    { label: "文化程度", prop: "whcd",showSolt: true },
+    { label: "证书编号", prop: "zsbh", showOverflowTooltip: true },
+    { label: "服务行业", prop: "fwxy", showSolt: true },
+    { label: "入职时间", prop: "rzsj" },
+    { label: "上岗证号码", prop: "sgxkhm", showOverflowTooltip: true },
+    { label: "审核状态", prop: "shzt", showSolt: true },
+    { label: "审核时间", prop: "shsj" },
+    { label: "送培状态", prop: "sptz", showSolt: true }
   ]
 });
 onMounted(() => {
-//   getInfo();
+  getList();
   tabHeightFn();
 });
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
-  pageData.pageConfiger.pageCurrent = 1;
+  pageData.pageConfiger.pageNum = 1;
   getList();
 };
-const gsId=ref('')
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
@@ -176,74 +152,47 @@ const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList();
 };
-const getInfo = () => {
-  let promes = { sfzh: idEntityCard }
-  cyryPage(promes).then(res => {
-    const data = res.records[0] || {};
-    if (data) {
-    gsId.value=data.code
-   }
-    getList()
-  }).finally(() => {
-    pageData.tableConfiger.loading = false;
-  })
-}
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
-    dwbm: gsId.value
   }
-  njryPage(promes).then((res) => {
-    pageData.tableData = (res.records || []).map((item) => {
-      return {
-        ...item,
-        companyName: item.companyName || item.dwmc || item.gsmc || item.dwmcName || item.bagsmc,
-        reviewYear: item.reviewYear || item.njnd || item.njYear || item.nf || item.year,
-        phone: item.phone || item.lxdh || item.dh || item.sjhm || item.xssbrdh,
-        education: item.education || item.whcd || item.whcdText,
-        certificateNo: item.certificateNo || item.zsbh || item.zsbhm || item.zjbh,
-        serviceIndustry: item.serviceIndustry || item.fwhy || item.fwhyText || item.hy,
-        entryDate: item.entryDate || item.rzsj || item.rzrq,
-        workCardNo: item.workCardNo || item.sgzh || item.sgzNumber,
-        auditStatus: item.auditStatus || item.shztText || item.shzt,
-        auditTime: item.auditTime || item.shsj || item.njsj,
-        sendStatus: item.sendStatus || item.spztText || item.spzt || (item.RefSteap ? "已送培" : "未送培")
-      };
-    });
+  qcckPost(promes,'/mosty-base/bans/njxx/page').then(res => {
+    pageData.tableData = res.records || [];
     pageData.total = res.total;
-  }).catch((err) => {
-    console.log(err);
-
-  }).finally(() => {
     pageData.tableConfiger.loading = false;
-  });
+  }).catch((err) => {
+    pageData.tableConfiger.loading = false;
+  })
 };
 
 const chooseData = (rows) => {
   selectedRows.value = Array.isArray(rows) ? rows : [];
 };
 
-const onBatchAudit = () => {
-  if (!selectedRows.value.length) {
-    ElMessage.warning("请选择需要审核的数据");
-    return;
-  }
-  ElMessage.success("已选择 " + selectedRows.value.length + " 条");
+const onBatchAudit = (ids) => {
+  if (!ids.length) return ElMessage.warning("请选择需要的数据");
+  shForm.value.init(ids);
 };
 
+// 送培
+const handleItemSp = (ids) =>{
+  proxy.$modal.confirm("是否确认送培？").then(() => {
+    qcckPost(ids,'/mosty-base/bans/njxx/sendTraining').then(res=>{
+      ElMessage.success("送培成功");
+      getList()
+    })
+  });
+}
 
 // 详情
 const addEdit = (type, row) => {
   nextTick(() => {
     if(type == 'RefSteap'){
       RefSteap.value.init(row);
-    }else if(type == 'shForm'){
-      shForm.value.init(row);
-    }
-    else{
+    }else{
       detailDiloag.value.init(type, row);
     }
   })
diff --git a/src/views/Training/securityNjsp/index.vue b/src/views/Training/securityNjsp/index.vue
index 6323447..df7fdc9 100644
--- a/src/views/Training/securityNjsp/index.vue
+++ b/src/views/Training/securityNjsp/index.vue
@@ -11,22 +11,11 @@
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <div style="margin-bottom: 12px;">
-        <el-button type="primary" @click="onBatchAudit">批量审核</el-button>
-      </div>
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
-        <template #auditStatus="{ row }">
-          <el-tag v-if="String(row.auditStatus || '').includes('驳回')" type="danger">{{ row.auditStatus }}</el-tag>
-          <el-tag v-else-if="String(row.auditStatus || '').includes('待')" type="warning">{{ row.auditStatus }}</el-tag>
-          <el-tag v-else-if="String(row.auditStatus || '').includes('通过')" type="success">{{ row.auditStatus }}</el-tag>
-          <span v-else>{{ row.auditStatus }}</span>
-        </template>
-        <template #sendStatus="{ row }">
-          <el-tag v-if="String(row.sendStatus || '').includes('未')" type="info">{{ row.sendStatus }}</el-tag>
-          <el-tag v-else-if="String(row.sendStatus || '').includes('已')" type="success">{{ row.sendStatus }}</el-tag>
-          <span v-else>{{ row.sendStatus }}</span>
+        <template #sptz="{ row }">
+           <DictTag :value="row.sptz" :tag="false" :options="D_BA_SPZT" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
@@ -54,11 +43,11 @@ import Search from "@/components/aboutTable/Search.vue";
 import DetailForm from "./components/detailForm.vue";
 import Steps from "./components/steps.vue";
 import {getItem} from '@/utils/storage.js'
-import { cyryPage,njryPage} from "@/api/pxzx.js";
+import { qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 import { ElMessage } from "element-plus";
 const { proxy } = getCurrentInstance();
-const { D_BZ_SF ,D_BAXX_DWLX} = proxy.$dict("D_BZ_SF","D_BAXX_DWLX");
+const { D_BA_SHZT,D_BA_SPZT } = proxy.$dict("D_BA_SHZT",'D_BA_SPZT');
 const detailDiloag = ref();
 const RefSteap = ref();
 const shForm = ref();
@@ -72,35 +61,18 @@ const searchConfiger = ref([
   },
   {
     label: "身份证号码",
-    prop: "sfzh",
+    prop: "sfzhm",
     showType: "input"
   },
   {
     label: "电话",
-    prop: "lxdh",
+    prop: "dh",
     showType: "input"
   },
 ]);
-const idEntityCard=getItem('idEntityCard')
 const queryFrom = ref({});
 const pageData = reactive({
-  tableData: [
-    {
-        companyName: "保安公司名称",
-        reviewYear: "年审年份",
-        xm: "姓名",
-        sfzh: "身份证号码",
-        phone: "电话",
-        education: "文化程度",
-        certificateNo: "证书编号",
-        serviceIndustry: "服务行业",
-        entryDate: "入职时间",
-        workCardNo: "上岗证号码",
-        auditStatus: "审核状态",
-        auditTime: "审核时间",
-        sendStatus: "送培状态"
-    }
-  ],
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
@@ -110,35 +82,34 @@ const pageData = reactive({
   total: 0,
   pageConfiger: {
     pageSize: 20,
-    pageCurrent: 1
+    pageNum: 1
   },
   controlsWidth: 180,
   tableColumn: [
-    { label: "保安公司名称", prop: "companyName",showOverflowTooltip: true },
-    { label: "培训公司", prop: "pxgs", showOverflowTooltip: true },
-    { label: "年审年份", prop: "reviewYear"},
+    { label: "保安公司名称", prop: "ssbakk",showOverflowTooltip: true },
+    { label: "培训公司", prop: "sptzCompanyName", showOverflowTooltip: true },
+    { label: "年审年份", prop: "njnf"},
     { label: "姓名", prop: "xm" },
-    { label: "身份证号码", prop: "sfzh",showOverflowTooltip: true },
-    { label: "电话", prop: "phone" },
-    { label: "文化程度", prop: "education" },
-    { label: "证书编号", prop: "certificateNo", showOverflowTooltip: true },
-    { label: "服务行业", prop: "serviceIndustry" },
-    { label: "入职时间", prop: "entryDate" },
-    { label: "上岗证号码", prop: "workCardNo", showOverflowTooltip: true },
-    { label: "送培状态", prop: "sendStatus", showSolt: true }
+    { label: "身份证号码", prop: "sfzhm",showOverflowTooltip: true },
+    { label: "电话", prop: "dh" },
+    { label: "文化程度", prop: "whcd" },
+    { label: "证书编号", prop: "zsbh", showOverflowTooltip: true },
+    { label: "服务行业", prop: "fwxymc" },
+    { label: "入职时间", prop: "rzsj" },
+    { label: "上岗证号码", prop: "sgxkhm", showOverflowTooltip: true },
+    { label: "送培状态", prop: "sptz", showSolt: true }
   ]
 });
 onMounted(() => {
-//   getInfo();
+  getList();
   tabHeightFn();
 });
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
-  pageData.pageConfiger.pageCurrent = 1;
+  pageData.pageConfiger.pageNum = 1;
   getList();
 };
-const gsId=ref('')
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
@@ -147,50 +118,20 @@ const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
   getList();
 };
-const getInfo = () => {
-  let promes = { sfzh: idEntityCard }
-  cyryPage(promes).then(res => {
-    const data = res.records[0] || {};
-    if (data) {
-    gsId.value=data.code
-   }
-    getList()
-  }).finally(() => {
-    pageData.tableConfiger.loading = false;
-  })
-}
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
   const promes = {
     ...pageData.pageConfiger,
     ...queryFrom.value,
-    dwbm: gsId.value
   }
-  njryPage(promes).then((res) => {
-    pageData.tableData = (res.records || []).map((item) => {
-      return {
-        ...item,
-        companyName: item.companyName || item.dwmc || item.gsmc || item.dwmcName || item.bagsmc,
-        reviewYear: item.reviewYear || item.njnd || item.njYear || item.nf || item.year,
-        phone: item.phone || item.lxdh || item.dh || item.sjhm || item.xssbrdh,
-        education: item.education || item.whcd || item.whcdText,
-        certificateNo: item.certificateNo || item.zsbh || item.zsbhm || item.zjbh,
-        serviceIndustry: item.serviceIndustry || item.fwhy || item.fwhyText || item.hy,
-        entryDate: item.entryDate || item.rzsj || item.rzrq,
-        workCardNo: item.workCardNo || item.sgzh || item.sgzNumber,
-        auditStatus: item.auditStatus || item.shztText || item.shzt,
-        auditTime: item.auditTime || item.shsj || item.njsj,
-        sendStatus: item.sendStatus || item.spztText || item.spzt || (item.RefSteap ? "已送培" : "未送培")
-      };
-    });
+  qcckPost(promes,'/mosty-base/bans/njxx/listForSendTraining').then((res) => {
+    pageData.tableData = res.records || []
     pageData.total = res.total;
+     pageData.tableConfiger.loading = false;
   }).catch((err) => {
-    console.log(err);
-
-  }).finally(() => {
-    pageData.tableConfiger.loading = false;
-  });
+     pageData.tableConfiger.loading = false;
+  })
 };
 
 const chooseData = (rows) => {