代理商

apps/agent/serializers.py

@@ -3,6 +3,7 @@ import datetime
 from rest_framework import serializers
 from django.conf import settings
 from apps.agent.models import Agent,Store
+from utils.booleancharfield import BooleanCharField
 
 class AgentSerializer(serializers.ModelSerializer):
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
@@ -31,6 +32,8 @@ class StoreSerializer(serializers.ModelSerializer):
     create_user_text = serializers.CharField(source='create_user.name', read_only=True)
     status_text = serializers.CharField(source='get_status_display', read_only=True)
     check_user_text = serializers.CharField(source='check_user.name', read_only=True)
+    agent_text = serializers.CharField(source='agent.name', read_only=True)
+    enable_text = BooleanCharField(source='enable', read_only=True)
 
     class Meta:
         model = Store

uis/views/agent/index.html

@@ -83,7 +83,8 @@
                             >修改</a>
                         </div>
                         <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="agent_del" data-permission="agent.delete_agent"
+                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="agent_del"
+                               data-permission="agent.delete_agent"
                             >删除</a>
                         </div>
                     </script>
@@ -132,9 +133,9 @@
                         url: '/agent/agent/' + data.id + '/'
                         , type: 'delete'
                         , done: function (res) {
-                             if(res.code === 0){
+                            if (res.code === 0) {
                                 layer.msg('删除成功！', {icon: 1})
-                             }
+                            }
                             table.reload('agent_datagrid', {});
                         }
                     });
@@ -149,7 +150,7 @@
                     btn: ['保存', '取消'],
                     yes: function (index, dom) {
                         layui.onSubmitChild = function (res) {
-                            if(res.code === 0){
+                            if (res.code === 0) {
                                 layer.msg('修改成功！', {icon: 1})
                             }
                             layer.close(index);
@@ -182,7 +183,7 @@
                 btn: ['保存', '取消'],
                 yes: function (index, dom) {
                     layui.onSubmitChild = function (res) {
-                        if(res.code === 0){
+                        if (res.code === 0) {
                             layer.msg('添加成功！', {icon: 1})
                         }
                         layer.close(index);

uis/views/store/index.html

@@ -115,13 +115,15 @@
                 {field: 'name', title: '名称', width: 150}
                 , {field: 'address', title: '地址', width: 200}
                 , {field: 'create_user_text', title: '添加人', width: 140}
-                , {field: 'create_time', title: '添加时间', width: 180}
+                , {field: 'create_time', title: '添加时间', width: 160}
                 , {field: 'end_date', title: '到期日期', width: 150}
-                , {field: 'notes', title: '备注', width: 200}
+                , {field: 'agent_text', title: '代理商', width: 120}
+                , {field: 'enable_text', title: '是否在用', width: 100}
                 , {field: 'status_text', title: '状态', width: 100}
                 , {field: 'check_user_text', title: '审核人', width: 120}
                 , {field: 'check_time', title: '审核时间', width: 180}
-                , {width: 180, align: 'center', fixed: 'right', toolbar: '#store-operate-bar'}
+                , {field: 'notes', title: '备注', width: 200}
+                , {width: 170, align: 'center', fixed: 'right', toolbar: '#store-operate-bar'}
             ]]
             , page: true
             , height: 'full-108'