企业付款记录

apps/tenant/serializers.py

@@ -8,6 +8,8 @@ from rest_framework_jwt.settings import api_settings
 from apps.log.models import BizLog
 from utils import get_remote_addr
 from apps.tenant.employee.models import Employee
+from apps.tenant.models import Pay
+from apps.base import Formater
 
 User = get_user_model()
 jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
@@ -51,3 +53,17 @@ class TenantJWTSerializer(JSONWebTokenSerializer):
             msg = u'必须包含“{username field}”和“password.'
             msg = msg.format(username_field=self.username_field)
             raise serializers.ValidationError(msg)
+
+class PaySerializer(serializers.ModelSerializer):
+    status_text = serializers.CharField(source='get_status_display', read_only=True)
+    pay_channel_text = serializers.CharField(source='get_pay_channel_display', read_only=True)
+    tenant = serializers.DateTimeField(source='tenant.company_name', read_only=True)
+    username = serializers.CharField(source='user.employee.name', read_only=True)
+    amount = serializers.SerializerMethodField()
+
+    def get_amount(self, obj):
+        return Formater.formatAmountShow(obj.amount)
+
+    class Meta:
+        model = Pay
+        fields = '__all__'

apps/tenant/views.py

@@ -19,6 +19,7 @@ from apps.tenant.config.models import Config
 from utils.exceptions import CustomError
 from apps.base import Formater
 from apps.WechatApplet.models import WechatApplet
+from apps.tenant.serializers import PaySerializer
 
 class TenantLoginView(ObtainJSONWebToken):
     serializer_class = TenantJWTSerializer
@@ -159,3 +160,9 @@ class CompanyViewSet(CustomModelViewSet):
             traceback.print_exc()
             return response_error(u'验证失败', request)
         return response_ok()
+
+    @action(methods=['get'], detail=True)
+    def get_renew_record(self, request, pk):
+        payment = Pay.objects.filter(tenant_id=pk)
+        data = PaySerializer(payment, many=True).data
+        return response_ok(data)

ly_baoxiu_admin/settings.py

@@ -122,7 +122,7 @@ WSGI_APPLICATION = 'ly_baoxiu_admin.wsgi.application'
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
 DATABASES = {
-    'default2': {
+    'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'baoxiu',
         'USER': 'baoxiu',
@@ -130,14 +130,14 @@ DATABASES = {
         'HOST': '139.9.148.181',
         'PORT': 3306,
     },
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'ly_report_repair',
-        'USER': 'carwin',
-        'PASSWORD': 'carwin!@#',
-        'HOST': '192.168.2.45',
-        'PORT': 3306,
-    },
+    # 'default': {
+    #     'ENGINE': 'django.db.backends.mysql',
+    #     'NAME': 'ly_report_repair',
+    #     'USER': 'carwin',
+    #     'PASSWORD': 'carwin!@#',
+    #     'HOST': '192.168.2.45',
+    #     'PORT': 3306,
+    # },
     # 'default': {
     #     'ENGINE': 'django.db.backends.mysql',
     #     'NAME': 'baoxiu',

uis/tenant/company/detail.html

@@ -20,7 +20,7 @@
             margin-bottom: 20px;
         }
         /*企业营业执照样式*/
-        .imgStyle{
+        .imgStyle {
             width: 100px;
             height: 100px;
         }
@@ -35,7 +35,9 @@
     </ul>
     <div class="layui-tab-content" style="background-color: #fff;">
         <div id="tenant_detail" class="layui-tab-item layui-show"></div>
-        <div id="invest_record" class="layui-tab-item"></div>
+        <div id="invest_record" class="layui-tab-item">
+            <table id="datagrid" style="width: 100%"></table>
+        </div>
 
         <script id="tenant_detail_demo" type="text/html">
             <div class="layui-tab-item layui-show">
@@ -79,23 +81,12 @@
                     {{# if(d.image){ }}
                     <li class="tenant-li">
                         <h3>企业营业执照：</h3>
-                        <img src="{{d.image}}" class="imgStyle" />
+                        <img src="{{ d.image }}" class="imgStyle"/>
                     </li>
                     {{# } }}
                 </ui>
             </div>
         </script>
-        <script id="invest_record_demo" type="text/html">
-            <div class="layui-tab-item layui-show">
-                <ul class="layui-timeline">
-                    <li class="layui-timeline-item">
-                        <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
-                        <div class="layui-timeline-content layui-text">
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </script>
     </div>
 </div>
 
@@ -107,8 +98,10 @@
         base: '../../../layuiadmin/' //静态资源所在路径
     }).extend({
         index: 'lib/index',
-    }).use(['index',  'laytpl'], function () {
+    }).use(['index', 'table', 'laytpl'], function () {
         var $ = layui.$
+            , admin = layui.admin
+            , table = layui.table
             , laytpl = layui.laytpl;
         var data = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
 
@@ -117,18 +110,24 @@
         laytpl(getTpl).render(data, function (html) {
             tenant_detail.innerHTML = html;
         });
-        // admin.req({
-        //     url: '/tenant/repair_order/get_repair_order_record/'
-        //     , data: {order_id: data.id}
-        //     , type: 'get'
-        //     , done: function (res) {
-        //        var getTpl2 = invest_record_demo.innerHTML
-        //            , invest_record = document.getElementById('invest_record');
-        //          laytpl(getTpl2).render(res.data, function (html) {
-        //          invest_record.innerHTML = html;
-        //         });
-        //     }
-        // });
+        admin.req({
+            url: '/tenant/company/' + data.id + '/get_renew_record/'
+            , done: function (res) {
+                table.render({
+                    elem: '#datagrid'
+                    , data: res.data
+                    , cols: [[
+                        {field: 'pay_no', title: '支付订单', width: 170}
+                        , {field: 'status_text', title: '支付状态', width: 100}
+                        , {field: 'amount', title: '支付金额', align: 'right', width: 100}
+                        , {field: 'create_time', title: '支付时间', width: 180}
+                        , {field: 'pay_channel_text', title: '支付方式', width: 100}
+                        , {field: 'username', title: '支付人员', width: 100}
+                    ]]
+                    , page: true
+                });
+            }
+        });
     });
 </script>
 </body>