From 433795b20d9372cce40ff3c094d7ac47e5fbb8ce Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期二, 05 三月 2024 08:53:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/notCoalMine/nCertificateList/index.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/notCoalMine/nCertificateList/index.vue b/src/views/notCoalMine/nCertificateList/index.vue
index e981bf1..7c23fe7 100644
--- a/src/views/notCoalMine/nCertificateList/index.vue
+++ b/src/views/notCoalMine/nCertificateList/index.vue
@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">证书查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -32,12 +32,12 @@
           size="mini"
           @click="getAsyncData"
           v-hasPermi="['system:experts:add']"
-        >同步数据</el-button>
+        >同步国家平台数据</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getPage"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column type="index" label="归档序号" width="55" align="center" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="性别" align="center" prop="sex"/>
       <el-table-column label="身份证号" align="center" prop="idcardNum">
@@ -51,8 +51,8 @@
       <el-table-column label="资格类型" align="center" prop="personTypeName" />
       <el-table-column label="作业类别" align="center" prop="jobTypeName" />
       <el-table-column label="操作项目" align="center" prop="operItemName" />
-      <el-table-column label="初领日期" align="center" prop="firstCertDate"/>
-      <el-table-column label="发证日期" align="center" prop="createTime">
+      <el-table-column label="证书初申请" align="center" prop="firstCertDate"/>
+      <el-table-column label="证书发放" align="center" prop="createTime">
         <template #default="scope">
           {{scope.row.createTime.substring(0,7)}}
         </template>
@@ -61,12 +61,18 @@
       <el-table-column label="有效期到" align="center" prop="validEndDate"/>
       <el-table-column label="复审期" align="center" prop="shouldReviewDate"/>
 <!--      <el-table-column label="二次复审期" align="center" prop="operItemName"/>-->
-<!--      <el-table-column label="历史记录" align="center" prop="operItemName"/>-->
+     <el-table-column label="证书领取" align="center" > 机构代领 </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-check"
+            @click="openCert(scope.row,'view')"
+          >审核发证</el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-edit"
             @click="openCert(scope.row,'view')"
           >查看</el-button>

--
Gitblit v1.9.2