设备

apps/tenant/device/filters.py

@@ -9,7 +9,7 @@ class DeviceFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(field_name='name', lookup_expr='icontains')
     device_no = django_filters.CharFilter(field_name='device_no', lookup_expr='icontains')
     device_model = django_filters.CharFilter(field_name='device_model', lookup_expr='icontains')
-    status = django_filters.CharFilter(field_name='status',)
+    status = django_filters.CharFilter(field_name='status')
 
     class Meta:
         model = DeviceModel

apps/tenant/device/resources.py

@@ -6,7 +6,7 @@ class DeviceImporter(ExcelImporter):
     fields = {
         u'名称': (True, ExcelImporter.formatUnicode),
         u'编号': (True, ExcelImporter.formatUnicode),
-        u'设备型号': (True, ExcelImporter.formatUnicode),
+        u'型号': (True, ExcelImporter.formatUnicode),
         u'小地点': (True, ExcelImporter.formatUnicode),
         u'大地点': (True, ExcelImporter.formatUnicode),
     }

apps/tenant/device/views.py

@@ -61,7 +61,7 @@ class DeviceImportView(APIView):
                         data = {}
                         data['name'] = row[u'名称']
                         data['device_no'] = row[u'编号']
-                        data['device_model'] = row[u'设备型号']
+                        data['device_model'] = row[u'型号']
                         data['branch'] = row[u'小地点']
                         data['address'] = row[u'大地点']
                         data['create_user'] = request.user

uis/tenant/company/index.html

@@ -20,7 +20,7 @@
         }
 
         .LAY-btns .layui-nav .layui-nav-item {
-            line-height: 30px;
+            line-height: 40px;
         }
 
         .LAY-btns .layui-nav .layui-nav-child {
@@ -156,6 +156,7 @@
             layer.closeAll();
             return false;
         });
+
         //监听工具条
         table.on('tool(datagrid-operate)', function (obj) {
             var data = obj.data;
@@ -188,11 +189,11 @@
         });
 
         $('#pay_wechat').on('click', function () {
-           pay_order(1)
+            pay_order(1)
         });
 
         $('#pay_alipay').on('click', function () {
-            pay_order( 2)
+            pay_order(2)
         });
         $('#btn_wxapp_code').on('click', function () {
             layer.open({