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

apps/agent/serializers.py

@@ -5,11 +5,17 @@ from django.conf import settings
 from apps.agent.models import Agent,Store
 
 class AgentSerializer(serializers.ModelSerializer):
+    create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
 
     class Meta:
         model = Agent
         fields = '__all__'
 
+    def create(self, validated_data):
+        validated_data['create_user'] = self.context['request'].user
+        instance = super(AgentSerializer, self).create(validated_data)
+        return instance
+
 
 class AgentComboboxSerializer(serializers.ModelSerializer):
     class Meta:

apps/customer/serializers.py

@@ -1,13 +1,29 @@
 # coding=utf-8
 from rest_framework import serializers
 
+from apps.option.models import Option
+from apps.option.serializers import OptionSerializer
 from .models import ReportCustomer
 
 class ReportCustomerSerializer(serializers.ModelSerializer):
     gender_text = serializers.CharField(source='get_gender_display', read_only=True)
     report_status_text = serializers.CharField(source='get_report_status_display', read_only=True)
-    check_time= serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
+    check_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
+    project = serializers.SerializerMethodField()
+
+    def get_project(self, obj):
+        return OptionSerializer(obj.project, many=True).data
 
     class Meta:
         model = ReportCustomer
-        fields = '__all__'
+        fields = '__all__'
+
+    def create(self, validated_data):
+        print(111111111,int(self.initial_data['project']))
+        # validated_data['project'] = self.initial_data['project']
+        instance = super(ReportCustomerSerializer, self).create(validated_data)
+        return instance
+
+    # def update(self, instance, validated_data):
+    #     if instance.project == self.initial_data['project']
+

apps/option/serializers.py

@@ -8,14 +8,14 @@ from utils.exceptions import CustomError
 class OptionSerializer(serializers.ModelSerializer):
     type_name = serializers.CharField(source='get_type_display', read_only=True)
     enable_text = serializers.SerializerMethodField()
-    end_stage = serializers.SerializerMethodField()
+    end_stage_text = serializers.SerializerMethodField()
 
     def get_enable_text(self,obj):
         if obj.enable:
             return '是'
         return '否'
 
-    def get_end_stage(self,obj):
+    def get_end_stage_text(self,obj):
         if obj.end_stage:
             return '是'
         return '否'

uis/views/option/edit.html

@@ -24,7 +24,8 @@
                             <div class="layui-col-lg6">
                                 <label class="layui-form-label"><font color='red' size="4">*</font>分类：</label>
                                 <div class="layui-input-block">
-                                    <select id="id_type" lay-verify="required" name="type" style="width: 40px;">
+                                    <select id="id_type" lay-verify="required" name="type" style="width: 40px;"
+                                            lay-filter="onTypeChange">
                                     </select>
                                 </div>
                             </div>
@@ -39,10 +40,28 @@
                             <div class="layui-col-lg6">
                                 <label class="layui-form-label">排序：</label>
                                 <div class="layui-input-block">
-                                    <input type="text" name="sort" placeholder="请输入排序" autocomplete="off"
+                                    <input type="text" name="sort" placeholder="请输入排序" lay-verify="number"
+                                           autocomplete="off"
                                            class="layui-input">
                                 </div>
                             </div>
+
+                            <div class="layui-col-lg6 layui-hide" id="id_track_day">
+                                <label class="layui-form-label">跟踪天数：</label>
+                                <div class="layui-input-block">
+                                    <input type="text" name="track_day" placeholder="请输入跟踪天数" lay-verify="number"
+                                           autocomplete="off"
+                                           class="layui-input">
+                                </div>
+                            </div>
+
+                            <div class="layui-col-lg6 layui-hide" id="id_end_stage">
+                                <label class="layui-form-label" style="width: 13.5%">是否最终阶段：</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" name="end_stage" lay-skin="switch" lay-text="是|否" checked=""
+                                           value="1">
+                                </div>
+                            </div>
                             <div class="layui-col-lg6">
                                 <label class="layui-form-label">是否在用：</label>
                                 <div class="layui-input-block">
@@ -101,9 +120,20 @@
             if (id) {
                 var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
                 form.val("component-form-element", editdata);
+                onTypeChange(editdata.type)
             }
         };
-
+        form.on('select(onTypeChange)', function (data) {
+            onTypeChange(data.value)
+        });
+        var onTypeChange = function (value) {
+            if (value == 3) {
+                $('#id_track_day').removeClass('layui-hide')
+            } else if (value == 4) {
+                $('#id_track_day').removeClass('layui-hide')
+                $('#id_end_stage').removeClass('layui-hide')
+            }
+        }
         form.on('submit(component-form-element)', function (data) {
             //layer.msg(JSON.stringify(data.field));
             if (id) {

uis/views/option/index.html

@@ -121,7 +121,7 @@
                 , {field: 'sort', title: '排序', width: 100, sort: true}
                 , {field: 'enable_text', title: '是否在用', width: 100}
                 , {field: 'track_day', title: '跟踪天数', width: 100}
-                , {field: 'end_stage', title: '是否最终阶段', width: 120}
+                , {field: 'end_stage_text', title: '是否最终阶段', width: 120}
                 , {field: 'notes', title: '备注', width: 300}
                 , {width: 140, align: 'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
             ]]