wushaodong 3 éve
szülő
commit
1054aeafec

+ 4 - 2
apps/account/models.py

@@ -40,9 +40,11 @@ class UserManager(BaseUserManager):
 
 class User(AbstractBaseUser, PermissionsMixin):
     EMPLOYEE = 1
-    CUSTOMER = 2
+    AGENT = 2
+    CUSTOMER = 3
     TYPE_CHOICES = (
         (EMPLOYEE, u'员工'),  # 内部员工
+        (AGENT, u'代理'),  # 代理
         (CUSTOMER, u'客户'),  # 客户
     )
     username = models.CharField(verbose_name=u'用户名', max_length=30, unique=True, db_index=True,
@@ -51,7 +53,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     is_active = models.BooleanField(verbose_name=u'是否可用', default=True, editable=False)
     date_joined = models.DateTimeField(verbose_name=u'注册时间', auto_now_add=True, editable=False)
-    type = models.PositiveSmallIntegerField(verbose_name=u"类型", choices=TYPE_CHOICES, editable=False, default=CUSTOMER)
+    type = models.PositiveSmallIntegerField(verbose_name=u"类型", choices=TYPE_CHOICES, default=CUSTOMER)
     name = models.CharField(max_length=20, verbose_name=u"姓名")
     gender = models.PositiveSmallIntegerField(choices=settings.GENDER_CHOICES, verbose_name=u"性别",
                                               default=settings.MALE)

+ 18 - 15
apps/account/serializers.py

@@ -65,17 +65,24 @@ class EmployeeSerializer(serializers.ModelSerializer):
 
     def create(self, validated_data):
         username = self.initial_data['username']
-        user = User.objects.filter(username=username).first()
+        user = User.objects.filter(username=username,).first()
         if user:
-            raise CustomError(u'账号[{0}]已存在。'.format(username))
-        # 代理商添加的账号,默认就是操作人所在的代理商
-        validated_data['is_active'] = self.initial_data['is_active'] == '1'
-        user = self.context['request'].user
-        validated_data['create_user'] = user
-        validated_data['type'] = User.EMPLOYEE
-        instance = super(EmployeeSerializer, self).create(validated_data)
-        instance.set_password(self.initial_data['password'])
-        instance.save()
+            # 用户可能先登录小程序,创建了user,此时在添加账号,user已经存在了。
+            if user.type <= User.AGENT:
+                raise CustomError(u'账号[{0}]已存在。'.format(username))
+            else:
+                validated_data['is_active'] = self.initial_data['is_active'] == '1'
+                validated_data['create_user'] = self.context['request'].user
+                instance = super(EmployeeSerializer, self).update(user, validated_data)
+                instance.set_password(self.initial_data['password'])
+                instance.save()
+        else:
+            validated_data['is_active'] = self.initial_data['is_active'] == '1'
+            user = self.context['request'].user
+            validated_data['create_user'] = user
+            instance = super(EmployeeSerializer, self).create(validated_data)
+            instance.set_password(self.initial_data['password'])
+            instance.save()
         return instance
 
     def update(self, instance, validated_data):
@@ -165,10 +172,7 @@ class WechatLoginSerializer(serializers.Serializer):
                 raise serializers.ValidationError(msg)
 
             payload = jwt_payload_handler(user)
-            try:
-                lead_hour = 24 - int(Config.get_value(Config.LEAVE_LEAD_TIME))
-            except:
-                lead_hour = 20
+
             return {
                 'user_id': user.id,
                 'token': jwt_encode_handler(payload),
@@ -176,7 +180,6 @@ class WechatLoginSerializer(serializers.Serializer):
                 'name': customer_wechat.customer.name or '',
                 'tel': customer_wechat.customer.username or '',
                 'face': customer_wechat.customer.face,
-                'lead_hour': lead_hour,
             }
 
         else:

+ 1 - 1
apps/account/views.py

@@ -71,7 +71,7 @@ class ChangePassword(APIView):
 
 class EmployeeViewSet(CustomModelViewSet):
     permission_classes = [isLogin, ]
-    queryset = User.objects.filter(type=User.EMPLOYEE)
+    queryset = User.objects.filter(type__lte=User.AGENT)
     serializer_class = EmployeeSerializer
 
     def filter_queryset(self, queryset):

+ 7 - 5
apps/commodity/models.py

@@ -10,9 +10,12 @@ from django.db.models.signals import post_save
 class Commodity(models.Model):
     name = models.CharField(max_length=20, verbose_name=u"名称")
     introduce = models.CharField(max_length=200, verbose_name=u'简介')
-    price = models.IntegerField(verbose_name=u'每餐单价', null=True, default=0)
-    days = models.IntegerField(verbose_name=u'天数', null=True, default=0)
-    amount = models.IntegerField(verbose_name=u'总金额', null=True, editable=False, default=0)
+    price = models.IntegerField(verbose_name=u'销售单价', null=True, default=0)
+    discount = models.IntegerField(verbose_name=u'折扣', null=True, default=100)
+    stock = models.IntegerField(verbose_name=u'库存', null=True, default=0)
+    publish_date = models.CharField(max_length=100, verbose_name=u'出版日期', null=True)
+    view_counts = models.IntegerField(verbose_name='浏览量', null=True, editable=False, default=0)
+    total_sales = models.IntegerField(verbose_name='总销量', null=True, editable=False, default=0)
     status = models.PositiveSmallIntegerField(choices=settings.SALES_STATUS_CHOICES, verbose_name=u"状态",
                                               default=settings.ONLINE)
     main_image = models.ForeignKey(Upload, verbose_name='主图', on_delete=models.SET_NULL, null=True,
@@ -24,8 +27,7 @@ class Commodity(models.Model):
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'添加人', related_name='commodity_create_user',
                                     editable=False, on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u'创建时间', auto_now_add=True, editable=False)
-    begin_date = models.DateField(verbose_name=u'起始日期')  # 餐费开始日期
-    end_date = models.DateField(verbose_name=u'终止日期') # 餐费终止日期
+    refresh_time = models.DateTimeField(verbose_name=u'刷新时间', auto_now_add=True)
 
     class Meta:
         db_table = 'commodity'

+ 7 - 9
apps/commodity/serializers.py

@@ -2,7 +2,7 @@
 
 from rest_framework import serializers
 from django.conf import settings
-
+from django.utils import timezone
 from apps.upload.models import Upload
 from .models import Commodity, CommodityImages
 from apps.base import Formater
@@ -16,7 +16,6 @@ class CommoditySerializer(serializers.ModelSerializer):
     list_image_url = serializers.CharField(source='list_image.picture', read_only=True)
     detail_image = serializers.SerializerMethodField()
     price = PriceShowCharField()
-    amount = PriceShowCharField(read_only=True)
     status_text = serializers.CharField(source='get_status_display', read_only=True)
 
     def get_detail_image(self, obj):
@@ -30,19 +29,19 @@ class CommoditySerializer(serializers.ModelSerializer):
     def create(self, validated_data):
         validated_data['create_user'] = self.context['request'].user
         validated_data['price'] = Formater.formatPrice(self.initial_data['price'])
-        validated_data['amount'] = Formater.formatPrice(self.initial_data['price']) * int(self.initial_data['days'])
+        validated_data['refresh_time'] = timezone.now()
 
         instance = super(CommoditySerializer, self).create(validated_data)
         return instance
 
     def update(self, instance, validated_data):
         validated_data['price'] = Formater.formatPrice(self.initial_data['price'])
-        validated_data['amount'] = Formater.formatPrice(self.initial_data['price']) * int(self.initial_data['days'])
+        validated_data['refresh_time'] = timezone.now()
         instance = super(CommoditySerializer, self).update(instance, validated_data)
         return instance
 
 class WxCommoditySerizlizer(serializers.ModelSerializer):
-    amount = PriceShowCharField()
+    price = PriceShowCharField()
     list_image = serializers.SerializerMethodField()
 
     def get_list_image(self, obj):
@@ -53,14 +52,13 @@ class WxCommoditySerizlizer(serializers.ModelSerializer):
 
     class Meta:
         model = Commodity
-        fields = ('id', 'name', 'introduce', 'amount', 'list_image', )
+        fields = ('id', 'name', 'introduce', 'price', 'list_image', )
 
 
 class WxCommodityDetailsSerializer(serializers.ModelSerializer):
-    amount = PriceShowCharField()
+    price = PriceShowCharField()
     main_image = serializers.SerializerMethodField()
     detail_images = serializers.SerializerMethodField()
-    price = PriceShowCharField()
 
     def get_main_image(self, obj):
         if obj.main_image:
@@ -78,5 +76,5 @@ class WxCommodityDetailsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Commodity
         fields = (
-            'id', 'name', 'amount', 'introduce', 'main_image', 'detail_images', 'price', 'days'
+            'id', 'name', 'price', 'introduce', 'main_image', 'detail_images', 'discount', 'stock'
         )

+ 56 - 0
apps/option/models.py

@@ -24,7 +24,31 @@ class Config(models.Model):
             return row.value
         return ''
 
+class Area(models.Model):
+    PROVINCE = 0
+    CITY = 1
+    COUNTY = 2
+    LEVEL_CHOICES = (
+        (PROVINCE, u'省级'),
+        (CITY, u'市级'),
+        (COUNTY, u'县区级'),
+    )
+
+    name = models.CharField(verbose_name=u'名称', max_length=50, blank=True, null=True)
+    level = models.IntegerField(verbose_name=u'层级', choices=LEVEL_CHOICES)
+    province_name = models.CharField(u'所属省', max_length=50, blank=True, null=True)
+    city_name = models.CharField(u'所属地市', max_length=50, blank=True, null=True)
+    province = models.ForeignKey('Area', verbose_name='所属省', related_name='province_children', on_delete=models.PROTECT,
+                                 blank=True, null=True)
+    city = models.ForeignKey('Area', verbose_name='所属地市', related_name='city_children', on_delete=models.PROTECT,
+                             blank=True, null=True)
+
+    class Meta:
+        verbose_name = u"行政区域"
+        db_table = "area"
+
 class School(models.Model):
+    area = models.ForeignKey(Area, verbose_name=u'行政区域', related_name='school_area', on_delete=models.PROTECT)
     name = models.CharField(verbose_name=u'名称', max_length=100, blank=True, null=True)
     notes = models.CharField(verbose_name=u'备注', max_length=200, null=True)
     enable = models.BooleanField(verbose_name=u"是否在用", default=True)
@@ -74,3 +98,35 @@ class Student(models.Model):
         verbose_name = u"学生"
         db_table = "student"
         ordering = ['-id']
+
+class CommodityLevel(models.Model):
+    name = models.CharField(verbose_name=u'名称', max_length=100, blank=True, null=True)
+    enable = models.BooleanField(verbose_name=u"是否在用", default=True)
+
+    def __unicode__(self):
+        return '%s' % (self.name)
+
+    class Meta:
+        verbose_name = u"商品级别"
+        db_table = "commodiey_level"
+        ordering = ['-id']
+
+class CommodityCategory(models.Model):
+    commodiey_level = models.ForeignKey(CommodityLevel, verbose_name=u'商品级别', related_name='commodiey_level', on_delete=models.PROTECT)
+    name = models.CharField(verbose_name=u'名称', max_length=100, blank=True, null=True)
+    enable = models.BooleanField(verbose_name=u"是否在用", default=True)
+
+    class Meta:
+        verbose_name = u"商品分类"
+        db_table = "commodiey_category"
+        ordering = ['-id']
+
+class CommoditySubject(models.Model):
+    commodiey_category = models.ForeignKey(CommodityCategory, verbose_name=u'商品分类', related_name='commodiey_category', on_delete=models.PROTECT)
+    name = models.CharField(verbose_name=u'名称', max_length=100, blank=True, null=True)
+    enable = models.BooleanField(verbose_name=u"是否在用", default=True)
+
+    class Meta:
+        verbose_name = u"商品科目"
+        db_table = "commodiey_subject"
+        ordering = ['-id']

+ 1 - 0
apps/option/urls.py

@@ -7,6 +7,7 @@ urlpatterns = [
     url(r'dict/$', DictView.as_view()),
     url(r'get_school/$', SchoolView.as_view()), # 学校管理
     url(r'school_tree/$', SchoolTreeView.as_view()),
+    url(r'area_tree/$', AreaTreeView.as_view()),
 ]
 
 router = SimpleRouter()

+ 34 - 0
apps/option/views.py

@@ -74,6 +74,40 @@ class SchoolTreeView(APIView):
 
         return response_ok(source_data)
 
+class AreaTreeView(APIView):
+    permission_classes = [isLogin, ]
+
+    # @cache_response()
+    def get(self, request):
+        area_data = []
+        provinces = Area.objects.filter(level=Area.PROVINCE, province_id__isnull=True).values('id', 'name')
+        for province in provinces:
+            province_item = {
+                'name': province['name'],
+                'value': province['id'],
+                'field': 'province',
+                'children': [],
+            }
+            citys = Area.objects.filter(level=Area.CITY, province_id=province['id'], city_id__isnull=True).values('id', 'name')
+            for city in citys:
+                city_item = {
+                    'name': city['name'],
+                    'value': city['id'],
+                    'field': 'city',
+                    'children': [],
+                }
+                province_item['children'].append(city_item)
+                countys = Area.objects.filter(level=Area.COUNTY, province_id=province['id'], city_id=city['id']).values('id', 'name')
+                for county in countys:
+                    county_item = {
+                        'name': county['name'],
+                        'value': county['id'],
+                        'field': 'county',
+                    }
+                    city_item['children'].append(county_item)
+            area_data.append(province_item)
+
+        return response_ok(area_data)
 
 class ConfigViewSet(CustomModelViewSet):
     permission_classes = [isLogin, ]

+ 13 - 15
uis/views/commodity/edit.html

@@ -36,35 +36,33 @@
                                           placeholder="请输入简介"></textarea>
                             </div>
                         </div>
+
                         <div class="layui-form-item">
-                            <label class="layui-form-label"><font color='red' size="4">*</font>起始日期:</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>销售价:</label>
                             <div class="layui-input-block">
-                                <input type="text" name="begin_date" class="layui-input" id="id_begin_date"
-                                       lay-verify="required"
-                                       placeholder="起始日期">
+                                <input type="text" name="price" lay-verify="number" placeholder="请输入销售价"
+                                       autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
-                            <label class="layui-form-label"><font color='red' size="4">*</font>终止日期:</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>折扣:</label>
                             <div class="layui-input-block">
-                                <input type="text" name="end_date" class="layui-input" id="id_end_date"
-                                       lay-verify="required"
-                                       placeholder="终止日期">
+                                <input type="text" name="discount" lay-verify="number" placeholder="请输入折扣"
+                                       value="100" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
-                            <label class="layui-form-label"><font color='red' size="4">*</font>每餐单价:</label>
+                            <label class="layui-form-label"><font color='red' size="4">*</font>库存:</label>
                             <div class="layui-input-block">
-                                <input type="text" name="price" lay-verify="number" placeholder="请输入每餐单价"
-                                       autocomplete="off" class="layui-input">
+                                <input type="text" name="stock" lay-verify="number" placeholder="请输入库存"
+                                       value="0" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
-                            <label class="layui-form-label"><font color='red' size="4">*</font>天数:</label>
+                            <label class="layui-form-label">出版日期:</label>
                             <div class="layui-input-block">
-                                <input type="text" name="days" lay-verify="number" placeholder="请输入天数"
-                                       value="0" class="layui-input">
-                                <div class="layui-word-aux">月用餐天数。</div>
+                                <input type="text" name="publish_date" placeholder="请输入出版日期"
+                                       class="layui-input">
                             </div>
                         </div>
 

+ 4 - 5
uis/views/commodity/index.html

@@ -137,14 +137,13 @@
             , cols: [[
                 {field: 'name', title: '商品名称', width: 150}
                 , {field: 'introduce', title: '简介', width: 200}
-                , {field: 'price', title: '每餐单价', width: 100}
-                , {field: 'days', title: '天数', width: 100}
-                , {field: 'amount', title: '金额', width: 100}
+                , {field: 'price', title: '销售价', width: 100}
+                , {field: 'discount', title: '折扣', width: 100}
+                , {field: 'stock', title: '库存', width: 100}
+                , {field: 'publish_date', title: '出版日期', width: 120}
                 , {field: 'main_image', title: '主图', templet: '#mainImage', width: 80}
                 , {field: 'list_image', title: '列表图', templet: '#listImage', width: 80}
                 , {field: 'detail_image', title: '详情图', templet: '#detailImage', width: 90}
-                , {field: 'begin_date', title: '起始日期', width: 110}
-                , {field: 'end_date', title: '终止日期', width: 110}
                 , {field: 'status_text', title: '状态', width: 100}
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {field: 'create_time_f', title: '添加时间', width: 150}

+ 9 - 24
uis/views/employee/edit.html

@@ -9,7 +9,6 @@
           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>
         #group_selecter dl {
             max-height: 200px;
@@ -73,9 +72,13 @@
                             </div>
 
                             <div class="layui-form-item">
-                                <label class="layui-form-label"><font color='red' size="4">*</font>管辖学校:</label>
+                                <label class="layui-form-label"><font color='red' size="4">*</font>类别:</label>
                                 <div class="layui-input-block">
-                                    <select name="schools" xm-select="schoolGroup"></select>
+                                    <select name="type" lay-verify="required" style="width: 40px;">
+                                        <option value="">请选择类别</option>
+                                        <option value="1">员工</option>
+                                        <option value="2">代理</option>
+                                    </select>
                                 </div>
                             </div>
 
@@ -106,12 +109,10 @@
         base: '../../../layuiadmin/' //静态资源所在路径
     }).extend({
         index: 'lib/index',
-        formSelects: 'formSelects-v4'
-    }).use(['index', 'form', 'utils', 'formSelects',], function () {
+    }).use(['index', 'form', 'utils',], function () {
         var $ = layui.$
             , admin = layui.admin
-            , form = layui.form
-            , formSelects = layui.formSelects
+            , form = layui.form;
 
         var id = layui.view.getParameterByName('id');
 
@@ -121,23 +122,7 @@
             form.val("component-form-element", editdata);
         }
         form.render(null, 'component-form-element');
-        // 管辖学校
-        formSelects.config('schoolGroup', {
-            beforeSuccess: function (eid, url, searchVal, result) {
-                if (id) {
-                    var groupIds = parent.layui.table.editdata.schools;
-                    for (var n in result.data) {
-                        var item = result.data[n];
-                        if (groupIds.indexOf(parseInt(item.value)) > -1)
-                            item.selected = 'selected';
-                    }
-                }
-                return result;
-            }
-        });
-        formSelects.data('schoolGroup', 'server', {
-            url: '/option/get_school/'
-        });
+
         form.on('submit(component-form-element)', function (data) {
             if (id) {
                 var url = '/account/employee/' + id + '/';

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

@@ -90,7 +90,7 @@
                 , {field: 'username', title: '账号', width: 120}
                 , {field: 'enable_text', title: '是否在用', width: 100}
                 , {field: 'position', title: '职位', width: 120}
-                , {field: 'school_text', title: '管辖学校', width: 200}
+                , {field: 'type_text', title: '类别', width: 200}
                 , {field: 'date_joined_f', title: '添加时间', width: 150}
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {width: 170, align: 'center', fixed: 'right', toolbar: '#datagrid-operate-bar'}

+ 2 - 2
uis/views/option/school.html

@@ -146,7 +146,7 @@
                     type: 2,
                     title: '修改',
                     shadeClose: false,
-                    area: ['40%', '50%'],
+                    area: ['40%', '70%'],
                     btn: ['保存', '取消'],
                     yes: function (index, dom) {
                         layui.onSubmitChild = function (data) {
@@ -208,7 +208,7 @@
             layer.open({
                 type: 2,
                 title: '添加',
-                area: ['40%', '50%'],
+                area: ['40%', '70%'],
                 btn: ['保存', '取消'],
                 yes: function (index, dom) {
                     layui.onSubmitChild = function (data) {

+ 54 - 3
uis/views/option/school_edit.html

@@ -23,6 +23,12 @@
                     <form class="layui-form" action="" lay-filter="component-form-element">
                         <div class="layui-row layui-col-space10 layui-form-item">
 
+                            <div class="layui-form-item">
+                                <label class="layui-form-label"><font color='red' size="4">*</font>行政区域:</label>
+                                <div class="layui-input-block">
+                                    <select name="area" xm-select="areaGroup" lay-verify="required"></select>
+                                </div>
+                            </div>
                             <div class="layui-col-lg6">
                                 <label class="layui-form-label"><font color='red' size="4">*</font>学校名称:</label>
                                 <div class="layui-input-block">
@@ -64,9 +70,10 @@
     }).extend({
         index: 'lib/index',
         formSelects: 'formSelects-v4'
-    }).use(['index', 'form', 'utils'], function () {
+    }).use(['index', 'form', 'formSelects'], function () {
         var $ = layui.$
             , admin = layui.admin
+            , formSelects = layui.formSelects
             , form = layui.form;
         var id = layui.view.getParameterByName('id');
 
@@ -74,9 +81,53 @@
             var editdata = JSON.parse(JSON.stringify(parent.layui.table.editdata)); // 框架有Bug所以这么转换
             form.val("component-form-element", editdata);
         }
-        form.on('submit(component-form-element)', function (data) {
+        formSelects.config('areaGroup', {
+            beforeSuccess: function (eid, url, searchVal, result) {
+                if (id) {
+                    var area = parent.layui.table.editdata.area ?? 0;
+                    for (var n in result.data) {
+                        var item = result.data[n];
+                        if (parseInt(area) == parseInt(item.value)) {
+                            item.selected = 'selected';
+                            break
+                        } else {
+                            var children1 =item.children
+                            for (var c in children1) {
+                                if (parseInt(area) == parseInt(children1[c].value)) {
+                                    children1[c].selected = 'selected';
+                                    break
+                                } else {
+                                    var children2 =children1[c].children
+                                    for (var i in children2) {
+                                        if (parseInt(area) == parseInt(children2[i].value)) {
+                                            children2[i].selected = 'selected';
+                                            break
+                                        }
+                                    }
+                                }
+                                 break
+                            }
+                             break
+                        }
+                    }
+                }
+                return result;
+            },
+        });
 
-            //layer.msg(JSON.stringify(data.field));
+        formSelects.render('areaGroup', {
+            max: 1,
+            quickBtns: [],
+            maxTips: function () {
+                layer.msg("只能选择一个行政区域", {icon: 2});
+            }
+        });
+        formSelects.btns('areaGroup', []);
+        formSelects.data('areaGroup', 'server', {
+            url: '/option/area_tree/'
+        });
+
+        form.on('submit(component-form-element)', function (data) {
             if (id) {
                 var url = '/option/school/' + id + '/';
                 var type = 'put';

+ 3 - 63
uis/views/option/student.html

@@ -62,36 +62,13 @@
                             <a class="layui-btn layui-btn-xs" lay-event="student_edit"
                             >修改</a>
                         </div>
-                        <div class="layui-btn-group">
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="clear_balance"
-                            >清空余额</a>
-                        </div>
                     </script>
                 </div>
             </div>
         </div>
     </div>
 </div>
-<div id="clear_balance" style="display: none">
-    <div class="layui-card-body" pad15>
-        <form class="layui-form" lay-filter="form-change">
-            <div class="layui-row layui-col-space10 layui-form-item">
-                <div class="layui-col-xs12 layui-col-sm12">
-                    <label class="layui-form-label"><font color='red' size="4">*</font>清空原因:</label>
-                    <div class="layui-input-block">
-                        <input type="text" class="layui-input" name="reason"
-                               lay-verify="required" placeholder="请输入清空原因">
-                    </div>
-                </div>
-                <div class="layui-form-item" style="text-align:right">
-                    <button class="layui-btn" lay-submit id="clear_balance_btn" lay-filter="form-change"
-                            style="display: none">保存
-                    </button>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
+
 <script src="../../layuiadmin/layui/layui.js?t=1"></script>
 <script type="text/html" id="toolbarDemo">
     <form class="layui-form" lay-filter="query-form-element">
@@ -115,11 +92,7 @@
             <input type="text" name="create_user_tel" autocomplete="off" class="layui-input"
                    placeholder="添加人电话"/>
         </div>
-        <div class="seach_items">
-            <div class="seach_items">
-                <input type="checkbox" name="is_balance" lay-skin="primary" title="有余额">
-            </div>
-        </div>
+
         <button class="layui-btn layui-btn-sm" lay-submit lay-filter="query-form-element">查询
         </button>
     </form>
@@ -151,7 +124,6 @@
                 , {field: 'enable_text', title: '是否在用', width: 100,}
                 , {field: 'create_user_text', title: '添加人', width: 200,}
                 , {field: 'create_time_f', title: '添加时间', width: 200,}
-                , {width: 150, align: 'center', fixed: 'right', toolbar: '#student-operate-bar'}
             ]]
             , page: true
             , height: 'full-108'
@@ -168,19 +140,7 @@
             layer.closeAll();
             return false;
         });
-        form.on('submit(form-change)', function (data) {
-            admin.req({
-                url: '/option/balance/clear_balance/?create_user=' + create_user
-                , data: data.field
-                , type: 'post'
-                , done: function (res) {
-                    layer.closeAll();
-                    table.reload('datagrid', {});
-                }
-            });
-            return false;
-        });
-        var create_user = ''
+
         //监听工具条
         table.on('tool(datagrid-operate)', function (obj) {
             var data = obj.data;
@@ -204,26 +164,6 @@
                     content: 'student_edit.html?id=' + data.id + '&express=' + data.express
                 });
             }
-            else if (obj.event === 'clear_balance') {
-                if (parseFloat(data.balance) <= 0) {
-                    layer.msg("余额为0,不能清空!", {icon: 2});
-                    return false
-                }
-                create_user = data.create_user
-                layer.open({
-                    type: 1,
-                    title: '清空余额',
-                    area: ['40%', '40%'],
-                    btn: ['保存', '取消'],
-                    yes: function (index, dom) {
-                        $('#clear_balance_btn').click();
-                    },
-                    btn2: function (index, layero) {
-                        layer.close(index);//关闭当前按钮
-                    },
-                    content: $('#clear_balance')
-                });
-            }
         });
     });
 </script>