Browse Source

订单审批

wushaodong 3 years ago
parent
commit
0434d68a10

+ 1 - 1
apps/notices/serializers.py

@@ -5,7 +5,7 @@ from .models import Notices
 
 
 class NoticesSerializer(serializers.ModelSerializer):
-    create_user_name = serializers.CharField(source='create_user.employee.name', read_only=True)
+    create_user_name = serializers.CharField(source='create_user.name', read_only=True)
     class Meta:
         model = Notices
         fields = '__all__'

+ 1 - 1
apps/order/serializers.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from utils.booleancharfield import BooleanCharField
 
 class ProductSerializer(serializers.ModelSerializer):
-    enable = BooleanCharField()
+    enable_text = BooleanCharField(source='enable')
     create_user_text = serializers.CharField(source='create_user.username', read_only=True)
     create_time_f = serializers.DateTimeField(source='create_time', format=settings.SHORT_DATETIME_FORMAT,
                                               read_only=True)

+ 9 - 10
apps/order/views.py

@@ -123,7 +123,7 @@ class ProductViewSet(CustomModelViewSet):
 
 
 class ProductListView(ListAPIView):
-    queryset = Product.objects.filter(enable=True)
+    queryset = Product.objects.filter(enable=True, main_image__isnull=False)
     serializer_class = ProductListSerializer
 
     def filter_queryset(self, queryset, ):
@@ -175,15 +175,14 @@ class OrderViewSet(CustomModelViewSet):
                 else:
                     edit_file.append(item)
             # 待审核,加载图片使用
-            if instance.status == order.ZERO:
-                images = OrderImages.objects.filter(order=instance)
-                for image in images:
-                    item2 = {
-                        'upload_id': image.image.id,
-                        'url': image.image.get_path(),
-                        'type': image.type,
-                    }
-                    edit_file2.append(item2)
+            images = OrderImages.objects.filter(order=instance)
+            for image in images:
+                item2 = {
+                    'upload_id': image.image.id,
+                    'url': image.image.get_path(),
+                    'type': image.type,
+                }
+                edit_file2.append(item2)
             result = {
                 'data': serializer.data,
                 'edit_values': edit_data,

+ 3 - 2
nostone_loan/settings.py

@@ -122,10 +122,11 @@ WSGI_APPLICATION = 'nostone_loan.wsgi.application'
 #         'USER': 'root',
 #         'PASSWORD': 'nostone@20211224',
 #         'HOST': '47.104.66.103',
-#         'PORT': 3306,
+#         'PORT': '',
 #     },
 # }
-
+# ERROR 2026 (HY000): SSL connection error: unknown error number
+# 需要关闭服务器mysql ssl认证  /etc/my.cnf 文件中添加 skip_ssl
 # 配置缓存为redis
 # windowns 系统,需要安装Redis-x64-3.0.503.msi,并启动服务。
 # CACHES = {

+ 0 - 177
uis/views/order/package.html

@@ -1,177 +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 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: 40px;
-        }
-
-        .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 {
-            display: inline-block;
-            margin-right: 5px;
-            margin-top: 5px;
-        }
-    </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;">
-                        <div style="float:left; margin-right: 5px; margin-top: 5px;">
-                            <button class="layui-btn" id="btn_add">
-                                <i class="layui-icon layui-icon-add-circle"></i>添加
-                            </button>
-                        </div>
-                        <div style="clear: both;"></div>
-                    </div>
-                    <table class="layui-hide" id="datagrid" lay-filter="datagrid-operate"></table>
-                    <script type="text/html" id="package-operate-bar">
-                        <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-xs" lay-event="package_edit"
-                            >修改</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', 'upload'], function () {
-        var $ = layui.$
-            , table = layui.table
-            , form = layui.form
-            , admin = layui.admin;
-
-        table.render({
-            elem: '#datagrid'
-            , url: '/order/package/'
-            , cols: [[
-                {field: 'amount', title: '充值金额', align: 'right',width: 200}
-                , {field: 'give_amount', title: '赠送金额', align: 'right', width: 100,}
-                , {field: 'create_user_text', title: '添加人', width: 200,}
-                , {field: 'create_time_f', title: '添加时间', width: 200,}
-                , {width: 100, align: 'center', fixed: 'right', toolbar: '#package-operate-bar'}
-            ]]
-            , page: true
-            , height: 'full-108'
-        });
-        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;
-        });
-        form.on('submit(form-change)', function (data) {
-            admin.req({
-                url: '/order/package/'
-                , data: data.field
-                , type: 'post'
-                , done: function (res) {
-                    layer.closeAll();
-                    table.reload('datagrid', {});
-                }
-            });
-            return false;
-        });
-        //监听工具条
-        table.on('tool(datagrid-operate)', function (obj) {
-            var data = obj.data;
-            table.editdata = data;
-            if (obj.event === 'package_edit') {
-                layer.open({
-                    type: 2,
-                    title: '修改',
-                    area: ['40%', '60%'],
-                    btn: ['保存', '取消'],
-                    yes: function (index, dom) {
-                        layui.onSubmitChild = function (data) {
-                            layer.close(index);
-                            table.reload('datagrid', {});
-                        };
-                        layui.submitChild();
-                    },
-                    btn2: function (index, layero) {
-                        layer.close(index);//关闭当前按钮
-                    },
-                    content: 'package_edit.html?id=' + data.id
-                });
-            }
-
-        });
-        $('#btn_add').on('click', function () {
-            layer.open({
-                type: 2,
-                title: '添加',
-                shadeClose: false,
-                area: ['40%', '60%'],
-                btn: ['保存', '取消'],
-                yes: function (index, dom) {
-                    layui.onSubmitChild = function (res) {
-                        layer.close(index);
-                        table.reload('datagrid', {});
-                    };
-                    layui.submitChild();
-                },
-                btn2: function (index, layero) {
-                    layer.close(index);//关闭当前按钮
-                },
-                content: 'package_edit.html'
-            });
-        });
-    });
-</script>
-</body>
-</html>
-

+ 0 - 91
uis/views/order/package_edit.html

@@ -1,91 +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-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>
-                                <label class="layui-form-label"><font color='red' size="4">*</font>充值金额:</label>
-                                <div class="layui-input-block">
-                                    <input type="text" name="amount" placeholder="请输入电话" lay-verify="number"
-                                           autocomplete="off" value="0" class="layui-input">
-                                </div>
-                            </div>
-                            <div>
-                                <label class="layui-form-label"><font color='red' size="4">*</font>赠送金额:</label>
-                                <div class="layui-input-block">
-                                    <input type="text" name="give_amount" placeholder="请输入电话" lay-verify="number"
-                                           autocomplete="off" value="0" class="layui-input">
-                                </div>
-                            </div>
-
-                            <button class="layui-btn" id="id_save" lay-submit lay-filter="component-form-element"
-                                    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' //主入口模块
-    }).use(['index', 'form', 'tree',], function () {
-        var $ = layui.$
-            , admin = layui.admin
-            , form = layui.form;
-
-        var id = layui.view.getParameterByName('id');
-        if (id) {
-            var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
-            //渲染select
-            form.val("component-form-element", editdata);
-        }
-        form.on('submit(component-form-element)', function (data) {
-            if (id) {
-                var url = '/order/package/' + id + '/';
-                var type = 'put';
-            } else {
-                url = '/order/package/';
-                type = 'post';
-            }
-            admin.req({
-                url: url
-                , data: data.field
-                , type: type
-                , done: function (res) {
-                    parent.layui.onSubmitChild(res);
-                }
-            });
-            return false;
-        });
-
-        parent.layui.submitChild = function () {
-            $("#id_save").click();
-        };
-    });
-</script>
-</body>
-</html>

+ 1 - 1
uis/views/product/index.html

@@ -130,7 +130,7 @@
                 {field: 'name', title: '商品名称', width: 300}
                 , {field: 'main_image', title: '主图', templet: '#mainImage', width: 80}
                 , {field: 'detail_image', title: '详情图', templet: '#detailImage', width: 90}
-                , {field: 'enable', title: '是否在售', width: 100}
+                , {field: 'enable_text', title: '是否在售', width: 100}
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {field: 'create_time_f', title: '添加时间', width: 150}
                 , {field: 'notes', title: '备注', width: 200}