Forráskód Böngészése

fix: 表单textarea加底部padding&表格字段和值格式修改

wyf 6 hónapja
szülő
commit
8d9ccb22c0

+ 3 - 0
src/components/BasicForm.vue

@@ -76,4 +76,7 @@
   :deep(.el-cascader) {
     width: 100%;
   }
+  :deep(.el-textarea__inner) {
+    padding-bottom: 20px;
+  }
 </style>

+ 5 - 3
src/views/security-confidentiality/vehicle-management/VehicleManagement.vue

@@ -39,7 +39,9 @@
             <span>{{ scope.row.carNum ? scope.row.carNum : '--' }}</span>
           </template>
           <template #carOwnerName="scope">
-            <span>{{ scope.row.carOwnerName || '--' }}</span>
+            <span>{{
+              scope.row.carOwnerName && scope.row.staffNo ? scope.row.carOwnerName + '-' + scope.row.staffNo : '--'
+            }}</span>
           </template>
           <template #deptName="scope">
             <span>{{ scope.row.deptName || '--' }}</span>
@@ -47,8 +49,8 @@
           <template #entryLocation="scope">
             <span>{{ scope.row.entryLocation || '--' }}</span>
           </template>
-          <template #eventTime="scope">
-            <span>{{ scope.row.eventTime || '--' }}</span>
+          <template #entryTime="scope">
+            <span>{{ scope.row.entryTime || '--' }}</span>
           </template>
           <template #images="scope">
             <ImageViewer :file-list="scope.row.images" />

+ 2 - 2
src/views/security-confidentiality/vehicle-management/configs/tables.ts

@@ -35,8 +35,8 @@ export const VEHICLE_TABEL_COLUMNS = [
     minWidth: '120px',
   },
   {
-    prop: 'eventTime',
-    slot: 'eventTime',
+    prop: 'entryTime',
+    slot: 'entryTime',
     label: '进入时间',
     align: 'center',
     minWidth: '120px',