Browse Source

fix: change prize-enroll display datetime

DESKTOP-USV654P\pc 4 months ago
parent
commit
12891f517f
3 changed files with 5 additions and 3 deletions
  1. 1 1
      Makefile
  2. 2 1
      src/views/prize/enroll/data.config.ts
  3. 2 1
      src/views/prize/statistics/data.config.ts

+ 1 - 1
Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change drone"
+	git commit --no-verify -m "fix: change prize-enroll display datetime"
 
 checkPre:
 	git checkout pre

+ 2 - 1
src/views/prize/enroll/data.config.ts

@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { formatToDate } from '/@/utils/dateUtil';
 
 export const tableColumns: BasicColumn[] = [
   {
@@ -57,7 +58,7 @@ export const tableColumns: BasicColumn[] = [
     align: 'left',
     width: 180,
     customRender: ({ record }) => {
-      return record.issueDate ? record.issueDate : record.awardDate;
+      return record.issueDate ? formatToDate(record.issueDate) : formatToDate(record.awardDate);
     },
   },
   {

+ 2 - 1
src/views/prize/statistics/data.config.ts

@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { formatToDate } from '/@/utils/dateUtil';
 
 export const tableColumns: BasicColumn[] = [
   {
@@ -116,7 +117,7 @@ export const tableDetailColumns: BasicColumn[] = [
     align: 'left',
     width: 180,
     customRender: ({ record }) => {
-      return record.issueDate ? record.issueDate : record.awardDate;
+      return record.issueDate ? formatToDate(record.issueDate) : formatToDate(record.awardDate);
     },
   },
   {