Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/agent/serializers.py

@@ -7,6 +7,8 @@ from utils.booleancharfield import BooleanCharField
 
 class AgentSerializer(serializers.ModelSerializer):
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
+    create_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT,
+                                              read_only=True)
 
     class Meta:
         model = Agent
@@ -34,6 +36,9 @@ class StoreSerializer(serializers.ModelSerializer):
     check_user_text = serializers.CharField(source='check_user.name', read_only=True)
     agent_text = serializers.CharField(source='agent.name', read_only=True)
     enable_text = BooleanCharField(source='enable', 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)
 
     class Meta:
         model = Store

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)
@@ -180,8 +184,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/agent/index.html

@@ -115,7 +115,7 @@
                 , {field: 'area', title: '区域', width: 200}
                 , {field: 'address', title: '地址', width: 200}
                 , {field: 'create_user_text', title: '添加人', width: 100}
-                , {field: 'create_time', title: '添加时间', width: 180}
+                , {field: 'create_time_f', title: '添加时间', width: 180}
                 , {field: 'notes', title: '备注', width: 200}
                 , {width: 150, align: 'center', fixed: 'right', toolbar: '#agent-operate-bar'}
             ]]

uis/views/customer/index.html

@@ -75,9 +75,6 @@
                 <div class="layui-col-md12">
                     <div class="LAY-btns" style="margin-bottom: 10px;">
                         <div style="float: left">
-                            <button class="layui-btn" id="customer_order"><i
-                                    class="layui-icon layui-icon-add-circle"></i>预约量房
-                            </button>
                             <button class="layui-btn" id="btn_list"><i
                                     class="layui-icon layui-icon-download-circle"></i>导出
                             </button>
@@ -96,6 +93,16 @@
                                 <input type="text" name="name" autocomplete="off" class="layui-input"
                                        placeholder="姓名"/>
                             </div>
+                            <div class="seach_items">
+                                <select name="source" id="id_source" style="width: 40px;">
+                                    <option value="">请选择来源</option>
+                                </select>
+                            </div>
+                            <div class="seach_items">
+                                <select name="project" id="id_project" style="width: 40px;">
+                                    <option value="">请选择项目</option>
+                                </select>
+                            </div>
                         </form>
                         <div style="clear: both;"></div>
                     </div>
@@ -137,12 +144,33 @@
             , form = layui.form
             , admin = layui.admin;
 
+        admin.req({
+            url: '/customer/dict/',
+            done: function (res) {
+                var data = res.data.source;
+                var source_node = $('#id_source');
+                for (var i in data) {
+                    var pid = data[i].id;
+                    var name = data[i].name;
+                    source_node.append("<option value='" + pid + "'>" + name + "</option>");
+                }
+
+                var  project_data = res.data.project;
+                var project_node = $('#id_project');
+                for (var i in project_data) {
+                    var pid1 = project_data[i].id;
+                    var name1 = project_data[i].name;
+                    project_node.append("<option value='" + pid1 + "'>" + name1 + "</option>");
+                }
+                form.render('select');
+            }
+        });
         table.render({
             elem: '#customer_log'
             , url: '/customer/stage_count/'
             , cols: [[
                 {field: 'stage', title: '阶段', width: 100}
-                , {field: 'total_count', title: "总人数", width: 80, sort: true}
+                , {field: 'total_count', title: "总数", width: 80, sort: true}
                 , {field: 'today_count', title: '今日', width: 80, sort: true}
                 , {field: 'overdue_count', title: '逾期', width: 80, sort: true}
             ]]

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

uis/views/store/index.html

@@ -115,13 +115,13 @@
                 {field: 'name', title: '名称', width: 150}
                 , {field: 'address', title: '地址', width: 200}
                 , {field: 'create_user_text', title: '添加人', width: 140}
-                , {field: 'create_time', title: '添加时间', width: 160}
+                , {field: 'create_time_f', title: '添加时间', width: 160}
                 , {field: 'end_date', title: '到期日期', width: 150}
                 , {field: 'agent_text', title: '代理商', width: 120}
                 , {field: 'enable_text', title: '是否在用', width: 100}
                 , {field: 'status_text', title: '状态', width: 100}
                 , {field: 'check_user_text', title: '审核人', width: 120}
-                , {field: 'check_time', title: '审核时间', width: 180}
+                , {field: 'check_time_f', title: '审核时间', width: 180}
                 , {field: 'notes', title: '备注', width: 200}
                 , {width: 170, align: 'center', fixed: 'right', toolbar: '#store-operate-bar'}
             ]]