时间格式化

apps/customer/serializers.py

@@ -5,7 +5,7 @@ from apps.option.models import Option
 from django.conf import settings
 
 from utils.exceptions import CustomError
-from utils.booleancharfield import BooleanCharField, TimeCharField, DateCharField
+from utils.booleancharfield import BooleanCharField, DateCharField
 from utils.format import strftime,strfdate
 from .models import ReportCustomer,NewCustomer,Review
 from apps.order.models import Order
@@ -16,7 +16,8 @@ class ReportCustomerSerializer(serializers.ModelSerializer):
     source_text = serializers.CharField(source='source.name', read_only=True)
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
     check_user_text = serializers.CharField(source='check_user.name', read_only=True)
-    create_time_f = TimeCharField(source='create_time', read_only=True)
+    create_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT, read_only=True)
+    check_time_f = serializers.DateTimeField(source='check_time', format=settings.SHORT_DATETIME_FORMAT, read_only=True)
     project_text = serializers.SerializerMethodField()
     hit_customer = serializers.SerializerMethodField()
     hit_project = serializers.SerializerMethodField()
@@ -114,8 +115,11 @@ class NewCustomerSerializer(serializers.ModelSerializer):
     stage_progress_text = serializers.CharField(source='stage_progress.name', read_only=True)
     stage_progress_sort = serializers.CharField(source='stage_progress.sort', read_only=True)
     status_text = serializers.CharField(source='get_status_display', read_only=True)
-    create_time_f = TimeCharField(source='create_time', read_only=True)
-    end_time_f = TimeCharField(source='end_time', read_only=True)
+    create_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT,
+                                              read_only=True)
+    end_time_f = serializers.DateTimeField(source='end_time', format=settings.SHORT_DATETIME_FORMAT,
+                                              read_only=True)
+
     next_time_f = DateCharField(source='next_time', read_only=True)
 
     source_text = serializers.CharField(source='source.name', read_only=True)
@@ -176,8 +180,11 @@ class ReviewSerializer(serializers.ModelSerializer):
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
     check_user_text = serializers.CharField(source='check_user.name', read_only=True)
     check_status_text = serializers.CharField(source='get_check_status_display', read_only=True)
-    create_time_f = TimeCharField(source='create_time', read_only=True)
-    check_time_f = TimeCharField(source='check_time', read_only=True)
+    create_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT,
+                                           read_only=True)
+    check_time_f = serializers.DateTimeField(source='check_time', format=settings.SHORT_DATETIME_FORMAT,
+                                           read_only=True)
+
     next_time_f = DateCharField(source='customer.next_time', read_only=True)
     is_giveup_text = BooleanCharField(source='is_giveup', read_only=True)
 

decorate/settings.py

@@ -91,6 +91,8 @@ CORS_ALLOW_HEADERS = (
     'Pragma',
 )
 
+SHORT_DATETIME_FORMAT = '%Y-%m-%d %H:%M'
+
 ROOT_URLCONF = 'decorate.urls'
 AUTH_USER_MODEL = "account.User"
 AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.AllowAllUsersModelBackend']

uis/views/report_customer/index.html

@@ -124,8 +124,10 @@
                 , {field: 'project_text', title: '项目', width: 200}
                 , {field: 'notes', title: '备注', width: 200}
                 , {field: 'report_status_text', title: '报备状态', width: 100}
+                , {field: 'create_user_text', title: '报备人', width: 100}
+                , {field: 'create_time_f', title: '报备时间', width: 150}
                 , {field: 'check_user_text', title: '审核人', width: 100}
-                , {field: 'check_time', title: '审核时间', width: 160}
+                , {field: 'check_time_f', title: '审核时间', width: 160}
                 , {width: 130, align: 'center', fixed: 'right', toolbar: '#customer-operate-bar'}
             ]]
             , page: true