lyh 1 жил өмнө
parent
commit
1dbb18a5b3

+ 19 - 0
apps/maint_order/filters.py

@@ -0,0 +1,19 @@
+# coding=utf-8
+
+import django_filters
+
+from .models import MaintOrderReserve
+
+
+class MaintOrderReserveFilter(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 = MaintOrderReserve
+        fields = '__all__'
+
+

+ 5 - 4
apps/maint_order/models.py

@@ -12,12 +12,12 @@ from apps.images.models import Images
 
 
 class MaintOrderReserve(models.Model):
-    WAIT_DRIVE = 1
+    RESERVEING = 1
     FINISHED = 2
     REVOKE = 3
     STATUS_CHOICES = (
-        (WAIT_DRIVE, u'待试驾'),
-        (FINISHED, u'已试驾'),
+        (RESERVEING, u'预约中'),
+        (FINISHED, u'已完成'),
         (REVOKE, u'已取消'),
     )
     type = models.ForeignKey(Option, verbose_name=u'服务类型', on_delete=models.PROTECT)
@@ -25,7 +25,7 @@ class MaintOrderReserve(models.Model):
     number = models.CharField(max_length=100, verbose_name=u'车牌号', null=True)
     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=RESERVEING)
     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)
@@ -36,4 +36,5 @@ class MaintOrderReserve(models.Model):
     class Meta:
         db_table = 'maint_order_reserve'
         verbose_name = u'保养预约'
+        ordering = ("-id",)
         default_permissions = ()

+ 24 - 0
apps/maint_order/serializers.py

@@ -0,0 +1,24 @@
+# coding=utf-8
+
+from django.conf import settings
+
+from rest_framework import serializers
+
+from utils.exceptions import CustomError
+
+from apps.base import Formater
+from .models import MaintOrderReserve
+
+class MaintOrderReserveSerializer(serializers.ModelSerializer):
+    shop_name = serializers.CharField(source='shop.name', read_only=True)
+    brand_name = serializers.CharField(source='series.brand.name', read_only=True)
+    series_name = serializers.CharField(source='series.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)
+    date = serializers.DateField(format='%Y-%m-%d')
+
+    class Meta:
+        model = MaintOrderReserve
+        fields = '__all__'
+

+ 14 - 0
apps/maint_order/urls.py

@@ -0,0 +1,14 @@
+# coding=utf-8
+
+from django.conf.urls import url, include
+from rest_framework.routers import SimpleRouter
+
+from .views import *
+
+urlpatterns = [
+
+]
+
+router = SimpleRouter()
+router.register(r'reserve', MaintOrderReserveViewSet)
+urlpatterns += router.urls

+ 33 - 0
apps/maint_order/views.py

@@ -0,0 +1,33 @@
+# coding=utf-8
+
+from django.db import transaction
+
+from rest_framework.decorators import action
+
+from utils import response_ok
+from utils.custom_modelviewset import CustomModelViewSet
+from apps.account import tenant_log
+from apps.foundation.models import BizLog
+
+from .filters import *
+from .serializers import *
+from .models import *
+
+
+class MaintOrderReserveViewSet(CustomModelViewSet):
+    queryset = MaintOrderReserve.objects.filter(delete=False)
+    serializer_class = MaintOrderReserveSerializer
+
+    def filter_queryset(self, queryset):
+        f = MaintOrderReserveFilter(self.request.GET, queryset=queryset)
+        return f.qs
+
+    @action(methods=['post'], detail=True)
+    def change_status(self, request, pk):
+        order = MaintOrderReserve.objects.filter(id=pk).first()
+        status = request.GET.get('status')
+        with transaction.atomic():
+            order.status = int(status)
+            order.save()
+            tenant_log(self.request.user, BizLog.UPDATE, u'修改试驾单状态[%s],id=%d' % (MaintOrderReserve.STATUS_CHOICES[order.status-1][1], order.id))
+        return response_ok()

+ 1 - 0
apps/product/models.py

@@ -36,4 +36,5 @@ class ProductImg(models.Model):
     class Meta:
         db_table = 'product_img'
         verbose_name = u'商品图片'
+        ordering = ('-id',)
         default_permissions = ()

+ 1 - 0
apps/product_order/models.py

@@ -32,4 +32,5 @@ class ProductOrder(models.Model):
     class Meta:
         db_table = 'product_order'
         verbose_name = u'商品订单'
+        ordering = ('-id',)
         default_permissions = ()

+ 1 - 0
apps/store/models.py

@@ -50,4 +50,5 @@ class StoreBrand(models.Model):
     class Meta:
         db_table = 'store_brand'
         verbose_name = u'门店品牌'
+        ordering = ('-id',)
         default_permissions = ()

+ 1 - 0
apps/usedvehicle/models.py

@@ -51,4 +51,5 @@ class UsedVehicleImg(models.Model):
     class Meta:
         db_table = 'usedvehicle_img'
         verbose_name = u'二手车图片'
+        ordering = ('-id',)
         default_permissions = ()

+ 1 - 0
apps/vehicle/models.py

@@ -106,5 +106,6 @@ class VehicleImg(models.Model):
     class Meta:
         db_table = 'vehicle_img'
         verbose_name = u'整车图片'
+        ordering = ('-id',)
         default_permissions = ()
 

+ 4 - 0
apps/vehicle_order/models.py

@@ -37,6 +37,7 @@ class VhicleDriveReserve(models.Model):
     class Meta:
         db_table = 'vehicle_drive_reserve'
         verbose_name = u'试驾预约'
+        ordering = ("-id",)
         default_permissions = ()
 
 
@@ -62,6 +63,7 @@ class VhicleInquiry(models.Model):
     class Meta:
         db_table = 'vehicle_inquiry'
         verbose_name = u'新车询价'
+        ordering = ("-id",)
         default_permissions = ()
 
 
@@ -87,6 +89,7 @@ class UsedVhicleInquiry(models.Model):
     class Meta:
         db_table = 'usedvehicle_inquiry'
         verbose_name = u'二手车询价'
+        ordering = ("-id",)
         default_permissions = ()
 
 
@@ -111,4 +114,5 @@ class UsedVhicleEstimate(models.Model):
     class Meta:
         db_table = 'usedvehicle_estimate'
         verbose_name = u'二手车预估'
+        ordering = ("-id",)
         default_permissions = ()

+ 1 - 1
shop/settings.py

@@ -54,7 +54,7 @@ INSTALLED_APPS = [
     'apps.store',
     'apps.product_order',
     'apps.vehicle_order',
-    # 'apps.package_order',
+    'apps.maint_order',
     # 'apps.pay',
     # 'apps.poster',
     # 'apps.activity',

+ 1 - 0
shop/urls.py

@@ -33,6 +33,7 @@ urlpatterns = [
     url(r'^customer/', include('apps.customer.urls')),
     url(r'^product_order/', include('apps.product_order.urls')),
     url(r'^vehicle_order/', include('apps.vehicle_order.urls')),
+    url(r'^maint_order/', include('apps.maint_order.urls')),
     # url(r'^api/', include('apps.api.urls')),
 ]
 

+ 1 - 1
uis/views/index.html

@@ -98,7 +98,7 @@
               </a>
               <dl class="layui-nav-child">
                 <dd data-name="button">
-                  <a lay-href="customer/index.html">预约保养</a>
+                  <a lay-href="miant_order/reserve.html">预约保养</a>
                 </dd>
               </dl>
             </li>

+ 171 - 0
uis/views/miant_order/reserve.html

@@ -0,0 +1,171 @@
+<!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>
+                            <option value="3">已取消</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="finish">完成</a>
+                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="revoke">取消</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: '/maint_order/reserve/'
+      ,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:'name', title:'预约人',width: 100}
+       ,{field:'tel', title:'电话',width: 120}
+       ,{field:'date', title:'预约日期',width: 150}
+       ,{field:'create_time', title:'创建时间',width: 150}
+       ,{field:'notes', title:'备注',width: 150}
+        ,{width:120, 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 === 'finish'){
+         layer.confirm('确定订单已完成吗?', function(index){
+             layer.close(index);
+            admin.req({
+                url: '/maint_order/reserve/'+data.id + '/change_status/?status=2'
+                ,type: 'post'
+                ,done: function(res){
+                    if(res.code === 1){
+                        layer.msg(res.msg);
+                        return;
+                    }
+                    table.reload('datagrid',{});
+                }
+            });
+        });
+      }else if(obj.event === 'revoke'){
+         layer.confirm('确定取消预约单吗?', function(index){
+             layer.close(index);
+            admin.req({
+                url: '/maint_order/reserve/'+data.id + '/change_status/?status=3'
+                ,type: 'post'
+                ,done: function(res){
+                    if(res.code === 1){
+                        layer.msg(res.msg);
+                        return;
+                    }
+                    table.reload('datagrid',{});
+                }
+            });
+        });
+        }
+    });
+  });
+  </script>
+</body>
+</html>
+