更新

src/views/Training/trainingCompanyNjgl/components/detailForm.vue

@@ -7,9 +7,9 @@
     <div class="cntinfo">
       <!-- 标签 -->
       <ul class="tag-box">
-        <li class="tag_item" :class="detail.shzt == 0 ? 'dsh_item' : detail.shzt == 1 ? 'tgg_item' : 'jtb_item'">
+        <li class="tag_item" :class="detail.pxgsShzt == 0 ? 'dsh_item' : detail.pxgsShzt == 1 ? 'tgg_item' : 'jtb_item'">
           <!-- 0-待审核 1-通过 2-驳回 -->
-          {{ detail.shzt == 0 ? '待审核' : detail.shzt == 1 ? '通过' : '驳回' }}
+          {{ detail.pxgsShzt == 0 ? '待审核' : detail.pxgsShzt == 1 ? '通过' : '驳回' }}
         </li>
       </ul>
       <!-- 内容描述 -->
@@ -85,11 +85,11 @@
           </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" v-if="detail.pxgsShzt== 2">{{ detail.bhyy }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
@@ -118,7 +118,7 @@ const init = (type, row,) => {
     let zj = res.sfzzfmj.split(',');
     res.sfzzm = [zj[0]];
     res.sfzfm = [zj[1]];
-    detail.value = res || {};
+    detail.value = res || {};  
   })
 };
 

src/views/Training/trainingCompanyNjgl/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>

src/views/Training/trainingCompanyNjgl/index.vue

@@ -14,6 +14,13 @@
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
         :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData">
+        <template #whcd="{ row }">
+          <DictTag :value="row.whcd" :tag="false" :options="D_BZ_WHCD" />
+        </template>
+        <template #pxgsShzt="{ row }">
+          <DictTag :value="row.pxgsShzt" :tag="false" :color="row.pxgsShzt == 0 ? '#ff0000' : row.pxgsShzt == 1 ? '#28EEBF' : '#FA3758'" :options="D_BA_SHZT" />
+        </template>
+
         <!-- 操作 -->
         <template #controls="{ row }">
           <el-link type="primary" link @click="onBatchAudit([row.id])" v-if="row.pxgsShzt == 0">立即审核</el-link>
@@ -27,9 +34,11 @@
       }"></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>
+    <!-- 审核 -->
+    <ShForm ref="shForm" @refresh="getList"></ShForm>
   </div>
 </template>
 
@@ -40,6 +49,7 @@ 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 ShForm from "./components/shForm.vue";
 import {getItem} from '@/utils/storage.js'
 import { qcckPost } from "@/api/qcckApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
@@ -53,11 +63,7 @@ const shForm = ref();
 const searchBox = ref(); //搜索框
 const selectedRows = ref([]);
 const searchConfiger = ref([
-  {
-    label: "保安公司名称",
-    prop: "ssbakk",
-    showType: "input"
-  },
+  
   {
     label: "姓名",
     prop: "xm",
@@ -88,22 +94,23 @@ const pageData = reactive({
     pageSize: 20,
     pageNum: 1
   },
-  controlsWidth: 180,
+  controlsWidth: 220,
   tableColumn: [
     { label: "保安公司名称", prop: "ssbakk",showOverflowTooltip: true },
     { label: "年审年份", prop: "njnf"},
     { label: "姓名", prop: "xm" },
     { label: "身份证号码", prop: "sfzhm",showOverflowTooltip: true },
     { label: "电话", prop: "dh" },
-    { label: "文化程度", prop: "whcd" },
+    { label: "文化程度", prop: "whcd" ,showSolt: true},
     { label: "证书编号", prop: "zsbh", showOverflowTooltip: true },
     { label: "服务行业", prop: "fwxymc" },
     { label: "入职时间", prop: "rzsj" },
     { label: "上岗证号码", prop: "sgxkhm", showOverflowTooltip: true },
+    { label: "审核状态", prop: "pxgsShzt",showSolt: true },
   ]
 });
 onMounted(() => {
-  // getList();
+  getList();
   tabHeightFn();
 });
 // 搜索
@@ -128,7 +135,8 @@ const getList = () => {
     ...queryFrom.value,
     ssbakk:userInfo.pxgs,
     ssbakkId:userInfo.pxgsid,
-    bakkShzt:'1',
+    pxgsShzt:'1',//保安公司已通过
+    sptz:'1',//已送培
   }
   qcckPost(promes,'/mosty-base/bans/njxx/page').then((res) => {
     pageData.tableData = res.records || []
@@ -140,14 +148,14 @@ const getList = () => {
 };
 
 const chooseData = (rows) => {
-  selectedRows.value = Array.isArray(rows) ? rows : [];
+  selectedRows.value = Array.isArray(rows) ? rows.map(v=>v.id) : [];
 };
 
 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(obj && obj.pxgsShzt == 0) ids.push(id);
   });
   if (!ids.length) return ElMessage.warning("请选择未审核的数据！该数据再审核状态下不能操作！");
   shForm.value.init(ids);