Browse Source

Merge branch 'release_v1.0.1' of http://git.qmth.com.cn/sop/web into release_v1.0.1

刘洋 1 year ago
parent
commit
0efe2367b1

+ 1 - 1
src/views/my-workbenches/workbenches/notice/index.vue

@@ -137,7 +137,7 @@ const fields = ref([
   },
   },
 
 
   {
   {
-    prop: 'title',
+    prop: 'query',
     label: '标题关键字',
     label: '标题关键字',
     labelWidth: 100,
     labelWidth: 100,
     colSpan: 5,
     colSpan: 5,

+ 2 - 2
src/views/work-hours/work-hours-manage/work-attendance/detail-dialog.vue

@@ -115,10 +115,10 @@
         }"
         }"
       >
       >
         <template #signIn="{ col, row }">
         <template #signIn="{ col, row }">
-          {{ row.signInTime ? timestampFilter(row[col.colKey], 'tt') + row.signInAddress : '异常' }}
+          {{ row.signInTime ? timestampFilter(row[col.colKey], 'tt') + (row.signInAddress?row.signInAddress:'') : '异常' }}
         </template>
         </template>
         <template #signOut="{ col, row }">
         <template #signOut="{ col, row }">
-          {{ row.signOutTime ? timestampFilter(row[col.colKey], 'tt') + row.signOutAddress : '异常' }}
+          {{ row.signOutTime ? timestampFilter(row[col.colKey], 'tt') + (row.signOutAddress?row.signOutAddress:'') : '异常' }}
         </template>
         </template>
         <template #workHours="{ col, row }">
         <template #workHours="{ col, row }">
           {{ row.signOutTime && row.signInTime ? ((row.signOutTime - row.signInTime) / 1000 / 60 / 60).toFixed(2) : '' }}
           {{ row.signOutTime && row.signInTime ? ((row.signOutTime - row.signInTime) / 1000 / 60 / 60).toFixed(2) : '' }}