lyh 1 年間 前
コミット
cf68008fd1

+ 14 - 1
apps/vehicle_order/filters.py

@@ -2,7 +2,7 @@
 
 import django_filters
 
-from .models import VhicleDriveReserve
+from .models import VhicleDriveReserve, VhicleInquiry
 
 
 class VhicleDriveReserveFilter(django_filters.FilterSet):
@@ -15,3 +15,16 @@ class VhicleDriveReserveFilter(django_filters.FilterSet):
     class Meta:
         model = VhicleDriveReserve
         fields = '__all__'
+
+
+class VhicleInquiryFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
+    tel = django_filters.CharFilter(field_name='tel', lookup_expr='icontains')
+    shop = django_filters.CharFilter(field_name='shop')
+    status = django_filters.CharFilter(field_name='status')
+    id = django_filters.CharFilter(field_name='id')
+
+    class Meta:
+        model = VhicleInquiry
+        fields = '__all__'
+

+ 5 - 5
apps/vehicle_order/models.py

@@ -41,16 +41,16 @@ class VhicleDriveReserve(models.Model):
 
 
 class VhicleInquiry(models.Model):
-    WAIT_DRIVE = 1
-    FINISHED = 2
+    WAIT_VISIT = 1
+    VISITED = 2
     STATUS_CHOICES = (
-        (WAIT_DRIVE, u'待回访'),
-        (FINISHED, u'已回访'),
+        (WAIT_VISIT, u'待回访'),
+        (VISITED, u'已回访'),
     )
     model = models.ForeignKey(Model, verbose_name=u'车型', on_delete=models.PROTECT)
     shop = models.ForeignKey(Shop, verbose_name=u'门店', on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u"添加时间", auto_now_add=True, editable=False)
-    status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u'状态', default=WAIT_DRIVE)
+    status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u'状态', default=WAIT_VISIT)
     customer = models.ForeignKey(Customer, verbose_name=u'客户', on_delete=models.PROTECT, editable=False)
     name = models.CharField(max_length=100, verbose_name=u'名称', null=True)
     tel = models.CharField(max_length=20, verbose_name=u'电话', null=True)

+ 19 - 1
apps/vehicle_order/serializers.py

@@ -9,7 +9,7 @@ from utils.exceptions import CustomError
 from apps.base import Formater
 from apps.images.models import Images
 
-from .models import VhicleDriveReserve
+from .models import VhicleDriveReserve, VhicleInquiry
 
 class VhicleDriveReserveSerializer(serializers.ModelSerializer):
     shop_name = serializers.CharField(source='shop.name', read_only=True)
@@ -37,3 +37,21 @@ class VhicleDriveReserveSerializer(serializers.ModelSerializer):
         model = VhicleDriveReserve
         fields = '__all__'
 
+
+class VhicleInquirySerializer(serializers.ModelSerializer):
+    shop_name = serializers.CharField(source='shop.name', read_only=True)
+    brand_name = serializers.CharField(source='model.series.brand.name', read_only=True)
+    series_name = serializers.CharField(source='model.series.name', read_only=True)
+    model_name = serializers.CharField(source='model.name', read_only=True)
+    customer_name = serializers.CharField(source='customer.name', read_only=True)
+    status_text = serializers.CharField(source='get_status_display', read_only=True)
+    create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
+    displace_text = serializers.SerializerMethodField()
+
+    def get_displace_text(self, obj):
+        return obj.displace and u'是' or u'否'
+
+    class Meta:
+        model = VhicleInquiry
+        fields = '__all__'
+

+ 1 - 0
apps/vehicle_order/urls.py

@@ -11,4 +11,5 @@ urlpatterns = [
 
 router = SimpleRouter()
 router.register(r'drive_reserve', VhicleDriveReserveViewSet)
+router.register(r'inquiry', VhicleInquiryViewSet)
 urlpatterns += router.urls

+ 20 - 2
apps/vehicle_order/views.py

@@ -27,9 +27,27 @@ class VhicleDriveReserveViewSet(CustomModelViewSet):
         order = VhicleDriveReserve.objects.filter(id=pk).first()
         status = request.GET.get('status')
         with transaction.atomic():
-            if order.status != VhicleDriveReserve.WAIT_DRIVE:
-                raise CustomError(u'当前状态不允许修改!')
             order.status = int(status)
             order.save()
             tenant_log(self.request.user, BizLog.UPDATE, u'修改试驾单状态[%s],id=%d' % (VhicleDriveReserve.STATUS_CHOICES[order.status-1][1], order.id))
+        return response_ok()
+
+
+class VhicleInquiryViewSet(CustomModelViewSet):
+    queryset = VhicleInquiry.objects.filter(delete=False)
+    serializer_class = VhicleInquirySerializer
+
+    def filter_queryset(self, queryset):
+        f = VhicleInquiryFilter(self.request.GET, queryset=queryset)
+        return f.qs
+
+    @action(methods=['post'], detail=True)
+    def visit(self, request, pk):
+        order = VhicleInquiry.objects.filter(id=pk).first()
+        with transaction.atomic():
+            if order.status != VhicleInquiry.WAIT_VISIT:
+                raise CustomError(u'当前状态不允许修改!')
+            order.status = VhicleInquiry.VISITED
+            order.save()
+            tenant_log(self.request.user, BizLog.UPDATE, u'新车询价单回访,id=%d' % (order.id))
         return response_ok()

+ 1 - 1
uis/views/index.html

@@ -70,7 +70,7 @@
               </a>
               <dl class="layui-nav-child">
                 <dd data-name="button">
-                  <a lay-href="customer/index.html">询价管理</a>
+                  <a lay-href="vehicle_order/inquiry.html">询价管理</a>
                 </dd>
                 <dd data-name="button">
                   <a lay-href="vehicle_order/drive_reserve.html">试驾预约</a>

+ 0 - 8
uis/views/vehicle_order/drive_reserve.html

@@ -135,10 +135,6 @@
       var data = obj.data;
       table.editdata = data;
         if(obj.event === 'finish'){
-            if (data.status !== 1){
-                 layer.msg('当前状态不允许修改');
-                return;
-            }
          layer.confirm('确定订单已完成吗?', function(index){
              layer.close(index);
             admin.req({
@@ -154,10 +150,6 @@
             });
         });
       }else if(obj.event === 'revoke'){
-             if (data.status !== 1){
-                 layer.msg('当前状态不允许修改');
-                return;
-            }
          layer.confirm('确定取消预约单吗?', function(index){
              layer.close(index);
             admin.req({

+ 159 - 0
uis/views/vehicle_order/inquiry.html

@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>活动管理</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+  <link rel="stylesheet" type="text/css" href="../../layuiadmin/style/formSelects-v4.css"/>
+    <style type="text/css">
+    .LAY-btns .layui-nav {padding-left:0;padding-right:10px;top:-4px;margin: 0 10px;border: 0;background-color: #009688;}
+    .LAY-btns .layui-nav .layui-nav-item{line-height: 30px;}
+    .LAY-btns .layui-nav .layui-nav-child{top:34px;}
+    .LAY-btns .layui-nav .layui-nav-bar{display: none;}
+    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a{color:#333;background-color:#fff;}
+    .LAY-btns .layui-nav .layui-nav-child dd.layui-this a:hover {background-color: #f2f2f2;color: #000;}
+    .seach_items {float:right;margin-left: 10px;}
+  </style>
+</head>
+<body>
+
+  <div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body" pad15>
+        <div class="layui-row layui-col-space15">
+          <div class="layui-col-md12">
+            <div class="LAY-btns" style="margin-bottom: 10px;">
+
+                <form class="layui-form" lay-filter="query-form-element">
+                    <div class="seach_items">
+                        <button class="layui-btn" lay-submit lay-filter="query-form-element"><i class="layui-icon layui-icon-search"></i>查询</button>
+                    </div>
+                    <div class="seach_items">
+                        <input type="text"  name="tel" autocomplete="off" class="layui-input" placeholder="电话"/>
+                    </div>
+
+                    <div class="seach_items">
+                        <input type="text"  name="name" autocomplete="off" class="layui-input" placeholder="询价人"/>
+                    </div>
+                    <div class="seach_items">
+                         <select  name="shop" id="seach_shop">
+                            <option value="">门店</option>
+                        </select>
+                    </div>
+                    <div class="seach_items">
+                       <select  name="status">
+                            <option value="">状态</option>
+                            <option value="1">待回访</option>
+                            <option value="2">已回访</option>
+                        </select>
+                    </div>
+
+                </form>
+                <div style="clear: both;"></div>
+            </div>
+            <table class="layui-hide" id="datagrid" lay-filter="datagrid-operate"></table>
+
+            <script type="text/html" id="datagrid-operate-bar">
+                <div class="layui-btn-group">
+                    <a class="layui-btn layui-btn-xs" lay-event="visit">已回访</a>
+                </div>
+            </script>
+          </div>
+        </div>
+        </div>
+    </div>
+  </div>
+
+  <script src="../../layuiadmin/layui/layui.js?t=1"></script>
+  <script>
+  layui.config({
+    base: '../../../layuiadmin/' //静态资源所在路径
+  }).extend({
+    index: 'lib/index' //主入口模块
+     ,formSelects: 'formSelects-v4'
+  }).use(['index', 'table', 'form', 'formSelects'], function(){
+    var $ = layui.$
+        ,table = layui.table
+        ,admin = layui.admin
+        ,form = layui.form;
+
+    admin.req({
+        url: '/store/search/',
+        done: function (res) {
+            var shops = res.data;
+            var shop_node = $('#seach_shop');
+            for (var i in shops) {
+                var pid = shops[i].id;
+                var value = shops[i].name;
+                shop_node.append("<option value='" + pid + "'>" + value + "</option>");
+            }
+            form.render();
+        }
+    });
+
+    table.render({
+      elem: '#datagrid'
+      ,url: '/vehicle_order/inquiry/'
+      ,cols: [[
+        {field:'shop_name', title:'门店',width: 100}
+       ,{field:'status_text', title:'状态',width: 100}
+       ,{field:'customer_name', title:'客户',width: 100}
+       ,{field:'brand_name', title:'品牌',width: 100}
+       ,{field:'series_name', title:'车系',width: 100}
+       ,{field:'model_name', title:'车型',width: 150}
+       ,{field:'name', title:'询价人',width: 100}
+       ,{field:'tel', title:'电话',width: 120}
+       ,{field:'area', title:'地区',width: 150}
+       ,{field:'create_time', title:'创建时间',width: 150}
+       ,{field:'notes', title:'备注',width: 150}
+        ,{width:80, align:'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}
+      ]]
+      ,page: true
+      ,height: 'full-108'
+      , done: function () {
+        layui.index.removeNoPermButtons()
+      }
+    });
+    form.on('submit(query-form-element)', function(data){
+      //layer.msg(JSON.stringify(data.field));
+      table.reload('datagrid', {
+          where: data.field
+          ,page:{curr:1}
+      });
+      layer.closeAll();
+      return false;
+    });
+    //监听工具条
+    table.on('tool(datagrid-operate)', function(obj){
+      var data = obj.data;
+      table.editdata = data;
+        if(obj.event === 'visit'){
+            if (data.status !== 1){
+                 layer.msg('该询价已回访');
+                return;
+            }
+         layer.confirm('确定询价已回访吗?', function(index){
+             layer.close(index);
+            admin.req({
+                url: '/vehicle_order/inquiry/'+data.id + '/visit/'
+                ,type: 'post'
+                ,done: function(res){
+                    if(res.code === 1){
+                        layer.msg(res.msg);
+                        return;
+                    }
+                    table.reload('datagrid',{});
+                }
+            });
+        });
+      }
+    });
+  });
+  </script>
+</body>
+</html>
+