From b842cc558bf3f96a74023feff6ccbce4d6539fe3 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Fri, 16 Jan 2026 18:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=B2=97=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/jobTransferManagement.vue | 12 ++++++
 .../trainingRecordManagement.vue              |  3 ++
 src/views/workLicense/personnelEquipment.vue  |  8 +++-
 src/views/workLicense/workLicense.vue         | 42 +++++++++++++------
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index dc70d6f..b9dbcb5 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -46,6 +46,18 @@
         <el-button type="text" @click="departFun(scope.row)">离职</el-button>
         <el-button type="text" @click="individualTakeFun(scope.row)">个人信息</el-button>
       </template>
+      <template #dataBirth="scope">
+          {{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
+      </template>
+      <template #contractDuration="scope">
+          {{ scope.row.contractDuration ?scope.row.contractDuration.substring(0, 10) : ''}}
+      </template>
+       <template #joinJobDate="scope">
+          {{ scope.row.joinJobDate ?scope.row.joinJobDate.substring(0, 10) : ''}}
+      </template>
+       <template #inJobDate="scope">
+          {{ scope.row.inJobDate ?scope.row.inJobDate.substring(0, 10) : ''}}
+      </template>
     </avue-crud>
 
     <!-- 培训计划 -->
diff --git a/src/views/changeJobManagement/trainingRecordManagement.vue b/src/views/changeJobManagement/trainingRecordManagement.vue
index 20cdad6..79d0416 100644
--- a/src/views/changeJobManagement/trainingRecordManagement.vue
+++ b/src/views/changeJobManagement/trainingRecordManagement.vue
@@ -48,6 +48,9 @@
           @click="handleFinish('one', scope.row)"
           >完成</el-button
         >
+      </template>
+         <template #distributeTime="scope">
+        {{ scope.row.distributeTime ? scope.row.distributeTime.substring(0, 10) : '' }}
       </template>
     </avue-crud>
 
diff --git a/src/views/workLicense/personnelEquipment.vue b/src/views/workLicense/personnelEquipment.vue
index 9ea9770..d7be29e 100644
--- a/src/views/workLicense/personnelEquipment.vue
+++ b/src/views/workLicense/personnelEquipment.vue
@@ -25,7 +25,13 @@
         <el-button type="primary" @click="handleMaintain">设备维护</el-button>
       </template>
       <template #menu-right>
-        <!-- <el-button type="primary" @click="handleImport">导 入</el-button> -->
+        <el-button type="primary" @click="handleImport">导 入</el-button>
+      </template>
+      <template #equipmentDate="scope">
+          {{ scope.row.equipmentDate ?scope.row.equipmentDate.substring(0, 10) : ''}}
+      </template>
+       <template #deviceDueDate="scope">
+          {{ scope.row.deviceDueDate ?scope.row.deviceDueDate.substring(0, 10) : ''}}
       </template>
     </avue-crud>
     <!-- 设备维护 -->
diff --git a/src/views/workLicense/workLicense.vue b/src/views/workLicense/workLicense.vue
index 4c952ca..9c144b6 100644
--- a/src/views/workLicense/workLicense.vue
+++ b/src/views/workLicense/workLicense.vue
@@ -15,22 +15,41 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
-     
       :row-class-name="rowClassName"
     >
-     <!-- :span-method="spanMethod" -->
+      <!-- :span-method="spanMethod" -->
       <template #menu-left>
         <el-button type="danger" @click="handleDeletes">批量删除</el-button>
         <el-button type="primary" @click="handleMaintain">证书维护</el-button>
       </template>
       <template #menu-right>
-        <!-- <el-button type="primary" @click="handleImport">导 入</el-button> -->
+        <el-button type="primary" @click="handleImport">导 入</el-button>
       </template>
-      <template #menu="{ row }"> 
+      <template #menu="{ row }">
         <!-- <el-button type="text" @click="handleDeletes(row)">删除</el-button> -->
       </template>
 
-      <template #heatTreat="scope"> </template>
+      <template #dataBirth="scope">
+        {{ scope.row.dataBirth ? scope.row.dataBirth.substring(0, 10) : '' }}
+      </template>
+
+      <template #certificateDate="scope">
+        {{ scope.row.certificateDate ? scope.row.certificateDate.substring(0, 10) : '' }}
+      </template>
+
+      <template #airworthinessDate="scope">
+        {{ scope.row.airworthinessDate ? scope.row.airworthinessDate.substring(0, 10) : '' }}
+      </template>
+
+      <template #airworthinessDateExpire="scope">
+        {{ scope.row.airworthinessDateExpire ? scope.row.airworthinessDateExpire.substring(0, 10) : '' }}
+      </template>
+      <template #astronautDate="scope">
+        {{ scope.row.astronautDate ? scope.row.astronautDate.substring(0, 10) : '' }}
+      </template>
+        <template #astronautDateExpire="scope">
+        {{ scope.row.astronautDateExpire ? scope.row.astronautDateExpire.substring(0, 10) : '' }}
+      </template>
     </avue-crud>
     <!-- 证书维护 -->
     <maintain-dialog
@@ -39,7 +58,7 @@
       @closeDialog="closeDialog"
       :maintain-list="maintainList"
     ></maintain-dialog>
-   <!-- 导入 -->
+    <!-- 导入 -->
     <basic-import
       v-if="isShowImport"
       title="导入"
@@ -61,7 +80,7 @@ import basicImport from '@/components/basic-import/main.vue';
 export default {
   components: {
     maintainDialog,
-    basicImport
+    basicImport,
   },
   data() {
     return {
@@ -126,8 +145,8 @@ export default {
             labelWidth: 140,
             overflow: true,
             search: true,
-            fixed:'left',
-            searchLabelWidth:50,
+            fixed: 'left',
+            searchLabelWidth: 50,
             rules: [
               {
                 required: true,
@@ -388,7 +407,7 @@ export default {
     };
   },
   methods: {
-     // 点击导入按钮
+    // 点击导入按钮
     handleImport() {
       this.isShowImport = true;
     },
@@ -495,7 +514,6 @@ export default {
       //   const currentName = row.name;
       //   let rowspan = 1;
       //   let isTopRow = true;
-
       //   // 向上查找是否是连续相同 name 的起始行
       //   for (let i = rowIndex - 1; i >= 0; i--) {
       //     if (rows[i].name === currentName) {
@@ -505,7 +523,6 @@ export default {
       //       break;
       //     }
       //   }
-
       //   // 如果不是顶部行，则隐藏（rowspan=0）
       //   if (!isTopRow) {
       //     return {
@@ -521,7 +538,6 @@ export default {
       //       break;
       //     }
       //   }
-
       //   return {
       //     rowspan: rowspan,
       //     colspan: 1,