wushaodong 1 年之前
父節點
當前提交
3b729a01da

+ 1 - 3
apps/vehicle/views.py

@@ -185,8 +185,6 @@ class VehicleModelViewSet(CustomModelViewSet):
     @action(methods=['post'], detail=True)
     def set_vehicle_img(self, request, pk):
         # 设置整车图片
-        if not self.request.user.has_perm('vehicle_model.edit_vehicle_model'):
-            raise CustomError(u"您没有[车型管理-修改]权限,无法执行该操作,请联系管理员分配权限!")
         image = request.FILES.get('images', None)
         vehicle_model = self.get_object()
 
@@ -196,7 +194,7 @@ class VehicleModelViewSet(CustomModelViewSet):
             raise CustomError(u'未找到上传文件!')
 
         with transaction.atomic():
-            image = Images.objects.employee_addnew(request.user, Images.VEHICLE_IMAGES, image)
+            image = Images.objects.employee_addnew(request.user, Images.VEHICLE_MODEL_THUMBNAIL, image)
             VehicleImg.objects.create(vehicle_model=vehicle_model, img=image)
             tenant_log(request.user, BizLog.DELETE, u'车型[%s]上传整车图片儿,id=%d' % (vehicle_model.name, vehicle_model.id))
 

+ 0 - 185
uis/views/vehicle_model/details.html

@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<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">
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-card-body" pad15>
-               <div class="layui-tab layui-tab-card">
-                   <ul class="layui-tab-title">
-                       <li class="layui-this">车型信息</li>
-                       <li>海报信息</li>
-                       <li>整车图片</li>
-                       <li>车型图片</li>
-                       <li>车型规格</li>
-                   </ul>
-                   <div class="layui-tab-content">
-                       <div class="layui-tab-item layui-show">
-                           <table class="layui-table">
-                               <tr>
-                                   <th style="width: 100px;">品牌名称</th>
-                                   <td id="brand_name" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">车系名称</th>
-                                   <td id="series_name" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">车型名称</th>
-                                   <td id="name" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">定金金额</th>
-                                   <td id="advance_pay_show" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">顶现金额</th>
-                                   <td id="equal_pay_show" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">指导价格</th>
-                                   <td id="price_show" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">本店价格</th>
-                                   <td id="shop_price_show" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">车型介绍</th>
-                                   <td id="describe" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">是否热门</th>
-                                   <td id="hot_text" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">推荐数</th>
-                                   <td id="recommend_count" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">成交数</th>
-                                   <td id="success_count" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">收藏数</th>
-                                   <td id="collection_count" class="cell"></td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">车型图片</th>
-                                   <td>
-                                       <img class="layui-upload-img" id="thumbnail" style="max-height: 250px;">
-                                   </td>
-                               </tr>
-                               <tr>
-                                   <th style="width: 100px;">备注</th>
-                                   <td id="notes" class="cell"></td>
-                               </tr>
-                           </table>
-                       </div>
-                       <div class="layui-tab-item">
-                           <img class="layui-upload-img" id="playbill" style="max-height: 250px;">
-                       </div>
-                       <div class="layui-tab-item">
-                           <div class="layui-upload-list" id="images" style="display: flex;flex-wrap: wrap;">
-                           </div>
-                       </div>
-                       <div class="layui-tab-item">
-                           <div class="layui-upload" id="div_upload">
-                           </div>
-                       </div>
-                       <div class="layui-tab-item">
-                           <table class="layui-hide" id="datagrid"></table>
-                       </div>
-                   </div>
-               </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="../../layuiadmin/layui/layui.js?t=1"></script>
-    <script>
-        layui.config({
-            base: '../../../layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'table','laydate', 'utils'], function () {
-            var $ = layui.$;
-            var table = layui.table;
-            var admin = layui.admin;
-            var options = null;
-
-            var id = layui.view.getParameterByName('id');
-            var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata));
-            $('#thumbnail').attr('src', editdata.thumbnail_url);
-            $('#playbill').attr('src', editdata.playbill_url);
-            $('.cell').each(function (index, element) {
-                element.innerHTML =  (editdata[element.id])
-            });
-
-            admin.req({
-                 url: '/vehicle/images/?vehicle_model=' + id,
-                done: function (res) {
-                   $('#images').html('');
-                   var data = res.data;
-                   for (var i in data){
-                       var html = '<div style="margin-top: 10px;"><a href="'+data[i].img_url+'" target="_blank"><img src="'+ data[i].img_url +'" class="layui-upload-img" style="margin-left: 5px;min-width: 80px; height: 100px;max-width: 200px;"></a></div>';
-                        $('#images').append(html)
-                   }
-                }
-             });
-
-            admin.req({
-                 url: '/option/search/?type=3'
-                 ,done: function(res){
-                     var data = res.data;
-                     options = res.data;
-                     for (var m in data){
-                         var div_id='show_image_'+data[m].id;
-                         var html  = '<span >'+data[m].name+'图片</span>' +
-                         '<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">' +
-                         '<div class="layui-upload-list" id="'+div_id+'" style="display: flex;flex-wrap: wrap;"></div></blockquote>';
-                         $('#div_upload').append(html)
-                     }
-                     loadUpload();
-                 }
-            });
-
-            var loadUpload = function(){
-                admin.req({
-                     url: '/vehicle/model_images/?vehicle_model=' + id,
-                    done: function (res) {
-                       for (var i in options){
-                          $('#show_image_' + options[i].id).html('');
-                        }
-
-                       var data = res.data;
-                       for (var i in data){
-                           var html = '<div style="margin-top: 10px;"><a href="'+data[i].img_url+'" target="_blank"><img src="'+ data[i].img_url +'" class="layui-upload-img" style="margin-left: 5px;min-width: 80px; height: 100px;max-width: 200px;"></a></div>';
-                            $('#show_image_'+ data[i].type).append(html)
-                       }
-                    }
-                 });
-            };
-
-            table.render({
-              elem: '#datagrid'
-              ,url: '/vehicle/model_specs/?vehicle_model=' + id
-              ,cols: [[
-                {field:'name_text', title:'名称',width: 150}
-               ,{field:'value', title:'值',width: 100}
-               ,{field:'notes', title:'备注',width: 200}
-              ]]
-              ,height: 'full-108'
-            });
-        })
-    </script>
-</body>
-</html>

+ 0 - 9
uis/views/vehicle_model/index.html

@@ -52,7 +52,6 @@
 
             <script type="text/html" id="datagrid-operate-bar">
                 <div class="layui-btn-group">
-                    <a class="layui-btn layui-btn-xs" lay-event="detail">查看</a>
                     <a class="layui-btn layui-btn-xs" lay-event="edit" >修改</a>
                     <a class="layui-btn layui-btn-xs" lay-event="upload" >整车图片</a>
                     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del" >删除</a>
@@ -130,14 +129,6 @@
           },
           content: 'edit.html?id='+data.id
         });
-      }else if(obj.event === 'detail'){
-        layer.open({
-          type: 2,
-          title: '查看',
-          shadeClose: true,
-          area: ['70%', '90%'],
-          content: 'details.html?id='+data.id
-        });
       }else if(obj.event === 'del'){
          layer.confirm('确定要删除吗?', function(index){
                 layer.close(index);

+ 0 - 213
uis/views/vehicle_model/specs.html

@@ -1,213 +0,0 @@
-<!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">
-   <style type="text/css">
-        .table-overlay .layui-table-body{overflow: visible;}
-        .table-overlay .layui-table-cell{height: auto; overflow: visible;}
-    </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">
-                    <form class="layui-form" action="" lay-filter="component-form-element">
-                        <fieldset class="layui-elem-field layui-field-title">
-                            <legend>规格参数<button type="button" id="btn-add" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button></legend>
-                        </fieldset>
-                            <div id="consumableDataTable" class="table-overlay">
-                                <table id="consumable_layTable" lay-filter="consumable_layTable" class="layui-hide"></table>
-                            </div>
-                        <button class="layui-btn" id="btn_save" lay-submit lay-filter="component-form-element" style="display: none">确定</button>
-                     </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="../../layuiadmin/layui/layui.js"></script>
-<script>
-layui.link('../../../layuiadmin/style/autocomplete.css');
-layui.config({
-    base: '../../../layuiadmin/', //静态资源所在路径
-     autocomplete: 'autocomplete'
-}).extend({
-    index: 'lib/index' //主入口模块
-}).use(['index', 'form', 'table', 'laydate', 'utils', 'autocomplete'], function() {
-    var $ = layui.$;
-    var admin = layui.admin;
-    var form = layui.form;
-    var table = layui.table;
-    var id = layui.view.getParameterByName('id');
-
-    var consumable_tbWidth = $("#consumableDataTable").width();
-    var consumable_layTable = "consumable_layTable";
-    var consumable_tableIns = table.render({
-        elem: '#consumable_layTable',
-        id: consumable_layTable,
-        data: [],
-        width: consumable_tbWidth,
-        page: false,
-        limit: 1000,
-        loading: true,
-        even: true, //不开启隔行背景
-        cols: [[
-            {title: '序号', type: 'numbers'},
-            {field: 'name', title: '名称', width: 100},
-            {field: 'value', title: '值', width: 300,  templet: function (d) {
-                    return '<input id="value' + d.num + '" value="' + d.value + '" type="text" lay-verify="required" autocomplete="off" class="layui-input">';
-                }},
-            {field: 'notes', title: '备注', width: 200},
-            {
-                field: 'id', minWidth: 80, title: '操作', templet: function (d) {
-                    return '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del" lay-id="' + d.num + '"><i class="layui-icon layui-icon-delete"></i>删除</a>';
-                }
-            }
-        ]],
-    });
-
-    admin.req({
-        url: '/vehicle/model_specs/?vehicle_model=' + id,
-        done: function (res) {
-            var data = res.data;
-            var roldData = table.cache[consumable_layTable];
-            var k=0;
-            for (var i in data) {
-                k = k + 1;
-                var newRow = {
-                    id: data[i].name,
-                    name: data[i].name_text,
-                    notes: data[i].notes,
-                    value: data[i].value,
-                    num: k
-                };
-                roldData.push(newRow);
-            }
-            consumable_tableIns.reload({
-                data: roldData
-            });
-
-        }
-    });
-
-
-    table.on('tool(consumable_layTable)', function (obj) {
-        var data = obj.data;
-        var event = obj.event;
-        switch (event) {
-            case "del":
-                obj.del();
-                layer.msg('删除成功', {icon: 6});
-                break;
-        }
-    });
-
-    var getconsumableData = function () {
-        var rows = table.cache[consumable_layTable];
-        var data = [];
-        for (var n in rows) {
-            if (rows[n] == false) {
-                continue;
-            }
-            var value = $('#value'+rows[n].num).val();
-            var item = {
-                num: rows[n].num,
-                id: rows[n].id,
-                name: rows[n].name,
-                notes: rows[n].notes,
-                value: value
-            };
-            data.push(item);
-        }
-        return data;
-    };
-    form.on('submit(component-form-element)', function (data) {
-        var rows = table.cache[consumable_layTable];
-        var save_data = [];
-        for (var n in rows) {
-            if (rows[n] == false) {
-                continue;
-            }
-            var value = $('#value'+rows[n].num).val();
-            var item = {
-                key: rows[n].id,
-                value: value
-            };
-            save_data.push(item);
-        }
-        admin.req({
-            url: '/vehicle/model/' + id + '/set_specs/'
-            ,type: 'post'
-            , data: {data: JSON.stringify(save_data)}
-            , done: function (res) {
-                parent.layui.onSubmitChild(res.data);
-            }
-        });
-        return false;
-    });
-    $('#btn-add').on('click', function () {
-        layer.open({
-            type: 2,
-            title: '添加产品',
-            area: ['90%', '98%'],
-            btn: ['确定', '取消'],
-            yes: function (index, dom) {
-                layui.onSubmitChild = function (data) {
-                    if(data.length === 0) {
-                        layer.msg('请先选择记录!');
-                        return;
-                    }
-                    var oldData = getconsumableData();
-                    var k=0;
-                    if (oldData.length > 0){
-                        k = oldData[oldData.length-1].num;
-                    }
-                    for (var i in data) {
-                        for(var m in oldData){
-                            if(oldData[m].id === data[i].id){
-                                layer.msg('规格['+data[i].name+']已添加!', {icon: 5});
-                                return;
-                            }
-                        }
-                        k = k + 1;
-                        var newRow = {
-                            id: data[i].id,
-                            name: data[i].name,
-                            notes: data[i].notes,
-                            num: k,
-                            value:''
-                        };
-                        oldData.push(newRow);
-                    }
-                    consumable_tableIns.reload({
-                        data: oldData
-                    });
-
-                    layer.msg('添加成功!', {icon: 6});
-                };
-                layui.submitChild();
-            },
-            btn2: function (index, layero) {
-                layer.close(index);//关闭当前按钮
-            },
-            content: '../option/search.html'
-        });
-    });
-    parent.layui.submitChild = function () {
-      $("#btn_save").click();
-    };
-});
-
-  </script>
-</body>
-</html>

+ 0 - 132
uis/views/vehicle_model/upload_model.html

@@ -1,132 +0,0 @@
-<!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">
-</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">
-                    <form class="layui-form" action="" lay-filter="component-form-element">
-                        <div class="layui-upload" id="div_upload">
-                        </div>
-                        <button class="layui-btn" id="upload_save" lay-submit lay-filter="component-form-element" style="display: none">开始上传</button>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-  <script src="../../layuiadmin/layui/layui.js"></script>
-  <script>
-   var main_id = null;
-   var options = null;
-  layui.link('../../../layuiadmin/style/autocomplete.css');
-  layui.config({
-    base: '../../../layuiadmin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index',
-    autocomplete: 'autocomplete'
-  }).use(['index','utils', 'form', 'element', 'upload'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,element = layui.element
-    ,form = layui.form
-    ,upload = layui.upload;
-
-    var id = layui.view.getParameterByName('id');
-    main_id = id;
-
-    form.render(null, 'component-form-element');
-    element.render('breadcrumb', 'breadcrumb');
-
-    admin.req({
-         url: '/option/search/?type=3'
-         ,done: function(res){
-             var data = res.data;
-             options = res.data;
-             for (var m in data){
-                 var button_id='upload_image_'+data[m].id;
-                 var div_id='show_image_'+data[m].id;
-                 var html  = '<button type="button" class="layui-btn" id="'+button_id+'">上传'+data[m].name+'图片</button>' +
-                         '<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">已上传图片:' +
-                         '<div class="layui-upload-list" id="'+div_id+'" style="display: flex;flex-wrap: wrap;"></div></blockquote>';
-                 $('#div_upload').append(html)
-             }
-             loadUpload();
-            refresh();
-         }
-    });
-    //refresh();
-
-    //多图片上传
-    var loadUpload = function () {
-        for (var i in options){
-          upload.render({
-            elem: '#upload_image_' + options[i].id
-            ,url:  '/vehicle/model/'+id+'/set_model_img/'
-            ,field: 'images'
-            ,exts: 'jpg|png|jpeg|bmp'
-            ,acceptMime: '.jpg,.png,.jpeg,.bmp'
-            ,multiple: true
-            ,data: {type: options[i].id}
-            ,done: function (res) {
-                if (res.code != 0) {
-                    layer.msg(res.msg);
-                }else{
-                    refresh();
-                }
-            },
-            error: function () {
-                layer.msg('保存失败');
-            }
-          });
-      }
-    };
-    parent.layui.submitChild = function () {
-      $("#upload_save").click();
-    };
-  });
-
-  function refresh () {
-      var $ = layui.$;
-
-      layui.admin.req({
-        url: '/vehicle/model_images/?vehicle_model=' + main_id,
-        done: function (res) {
-         for (var i in options){
-              $('#show_image_' + options[i].id).html('');
-          }
-           var data = res.data;
-           for (var i in data){
-               var html = '<div style="margin-top: 10px;"><a href="'+data[i].img_url+'" target="_blank"><img src="'+ data[i].img_url +'" class="layui-upload-img" style="margin-left: 5px;min-width: 80px; height: 100px;max-width: 200px;"></a>' +
-                      '<div align="center" style="margin-top: 3px;"><button type="button" class="layui-btn layui-btn-danger layui-btn-xs" onclick="delImage('+data[i].id+')">删除</button></div></div>';
-                $('#show_image_'+ data[i].type).append(html)
-           }
-        }
-    });
-  }
-
-  function delImage(id) {
-      layui.admin.req({
-         url: '/vehicle/model_images/'+id + '/'
-         ,type: 'delete'
-         ,done: function(res){
-             refresh();
-         }
-      });
-  }
-
-  </script>
-</body>
-</html>

+ 0 - 105
uis/views/vehicle_model/upload_poster.html

@@ -1,105 +0,0 @@
-<!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>
-        img{
-            width: 40%;
-            height: 30%;
-        }
-    </style>
-</head>
-<body>
-
-  <div class="layui-fluid">
-    <div class="layui-row layui-col-space15">
-      <div class="layui-col-md6">
-        <div class="layui-card">
-
-          <div class="layui-card-body">
-            <form class="layui-form" action="" lay-filter="component-form-element">
-              <div class="layui-row layui-col-space10 layui-form-item">
-               <div class="layui-col-lg6">
-                  <label class="layui-form-label">海报图片:</label>
-                  <div class="layui-input-block">
-                      <button type="button" class="layui-btn-sm" id="upload_image">上传图片</button><br><br>
-                      <img class="layui-upload-img" id="show_image">
-                  </div>
-               </div>
-                <button class="layui-btn" id="id_save" lay-submit lay-filter="component-form-element" style="display: none">保存</button>
-                  <button class="layui-btn" type="button" id="upload_save" style="display: none"></button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-
-  <script src="../../layuiadmin/layui/layui.js"></script>
-  <script>
-  layui.config({
-    base: '../../../layuiadmin/' //静态资源所在路径
-  }).extend({
-    index: 'lib/index',
-    formSelects: 'formSelects-v4'
-  }).use(['index', 'form', 'utils', 'upload'], function(){
-    var $ = layui.$
-    ,admin = layui.admin
-    ,upload = layui.upload
-    ,form = layui.form;
-    var id = layui.view.getParameterByName('id');
-    var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
-    if(editdata.playbill_url){
-        $('#show_image').attr('src', editdata.playbill_url);
-    }
-
-    form.render(null, 'component-form-element');
-
-    var form_data = {field:{}};
-    upload.render({
-         elem: '#upload_image',
-         url: '/vehicle/model/' +id + '/upload_playbill/',
-         auto: false,
-         field: 'image',
-         bindAction: '#upload_save',
-         choose: function(obj) {
-             obj.preview(
-                 function(index, file, result) {
-                     $('#show_image').attr('src', result);
-                 }
-             );
-         },
-        done: function (res) {
-            if (res.code != 0) {
-                layer.msg(res.msg);
-            }else {
-                parent.layui.onSubmitChild(res.data);
-            }
-        },
-        error: function () {
-            layer.msg('上传失败');
-        }
-    });
-
-    form.on('submit(component-form-element)', function (data) {
-         form_data = data;
-         $('#upload_save').click();
-        return false;
-    });
-
-    parent.layui.submitChild = function () {
-      $("#id_save").click();
-    };
-  });
-  </script>
-</body>
-</html>