From 284aa1f12167785678b6ac68965e01322555bd48 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 19 Jan 2026 11:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=B2=97=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicData/jobTransferManagement.vue |  6 ++--
 src/views/workLicense/personnelEquipment.vue  | 31 ++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue
index b9dbcb5..a73018e 100644
--- a/src/views/basicData/jobTransferManagement.vue
+++ b/src/views/basicData/jobTransferManagement.vue
@@ -489,8 +489,8 @@ export default {
             width: 200,
 
             dicData: [
-              { value: 0, label: '未婚' },
-              { value: 1, label: '已婚' },
+              { value: '0', label: '未婚' },
+              { value: '1', label: '已婚' },
             ],
           },
           {
@@ -579,6 +579,8 @@ export default {
             labelWidth: 150,
             search: false,
             width: 200,
+             addDisplay: false,
+            editDisplay: false,
             type: 'date',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
diff --git a/src/views/workLicense/personnelEquipment.vue b/src/views/workLicense/personnelEquipment.vue
index 0dcee88..bb65ba7 100644
--- a/src/views/workLicense/personnelEquipment.vue
+++ b/src/views/workLicense/personnelEquipment.vue
@@ -33,6 +33,10 @@
        <template #deviceDueDate="scope">
           {{ scope.row.deviceDueDate ?scope.row.deviceDueDate.substring(0, 10) : ''}}
       </template>
+      <template #dataBirth="scope">
+          {{ scope.row.dataBirth ?scope.row.dataBirth.substring(0, 10) : ''}}
+      </template>
+      
     </avue-crud>
     <!-- 设备维护 -->
     <equipmentDialog
@@ -86,12 +90,6 @@ export default {
       inDateArr: [],
       form: {},
       deviceData: [],
-      deviceList: [
-        { label: '设备名称一', value: '1' },
-        { label: '设备名称二', value: '2' },
-        { label: '设备名称三', value: '3' },
-        { label: '设备名称四', value: '4' },
-      ],
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -228,18 +226,27 @@ export default {
             search: false,
           },
 
+          // {
+          //   label: '设备型号',
+          //   prop: 'macSpec',
+          //   span: 24,
+          //   width: 150,
+          //   labelWidth: 140,
+          //   overflow: true,
+          //   search: false,
+          // },
           {
-            label: '设备型号',
-            prop: 'macSpec',
+            label: '设备名称',
+            prop: 'deviceName',
             span: 24,
             width: 150,
             labelWidth: 140,
             overflow: true,
             search: false,
           },
-          {
-            label: '设备名称',
-            prop: 'deviceName',
+           {
+            label: '设备编号',
+            prop: 'deviceCode',
             span: 24,
             width: 150,
             labelWidth: 140,
@@ -256,7 +263,7 @@ export default {
             search: false,
           },
           {
-            label: '设备有效期',
+            label: '设备有效期(天)',
             prop: 'equipmentValidityPeriod',
             span: 24,
             width: 150,