wushaodong vor 4 Jahren
Ursprung
Commit
be4dd9ca85
3 geänderte Dateien mit 27 neuen und 0 gelöschten Zeilen
  1. 1 0
      apps/wxapp/urls.py
  2. 24 0
      apps/wxapp/views.py
  3. 2 0
      uis/tenant/device/edit.html

+ 1 - 0
apps/wxapp/urls.py

@@ -15,6 +15,7 @@ urlpatterns = [
     url(r'^poster/$', PosterView.as_view()),
     url(r'^dict/$', DictView.as_view()),
     url(r'^get_building/$', BuildingView.as_view()),
+    url(r'^get_device/$', DeviceView.as_view()),
     url(r'^notices/$', NoticesView.as_view()),  # 通知
     url(r'^notices/(?P<pk>[0-9]+)/$', NoticesDetailView.as_view()),  # 通知
 

+ 24 - 0
apps/wxapp/views.py

@@ -21,6 +21,7 @@ from apps.tenant.notices.filters import NoticesFilter
 from utils.permission import isLogin
 from utils.wx.WXBizDataCrypt import WXBizDataCrypt
 from apps.tenant.poster.serializer import PosterSerializer, Poster
+from apps.tenant.device.models import DeviceModel
 
 from .serializers import *
 
@@ -203,3 +204,26 @@ class BuildingView(APIView):
             data.append(build_dict)
 
         return response_ok(data)
+
+class DeviceView(APIView):
+    permission_classes = [isLogin, ]
+    def get(self, request):
+        param = request.GET.get('param')
+        data = []
+        rows = DeviceModel.objects.filter(tenant=request.user.employee.tenant)
+        if param:
+            rows = rows.filter(Q(name=param) | Q(device_no=param) | Q(device_model=param))
+        else:
+            rows = rows[:10]
+        for item in rows:
+            build_dict = {
+                'id': item.name,
+                'name':item.name,
+                'device_no':item.device_no,
+                'device_model':item.device_model,
+                'branch':item.branch,
+                'address':item.address,
+            }
+            data.append(build_dict)
+
+        return response_ok(data)

+ 2 - 0
uis/tenant/device/edit.html

@@ -57,6 +57,7 @@
                                 <input type="text" name="branch" placeholder="请输入大地点"
                                        autocomplete="off" class="layui-input" lay-verify="required">
                             </div>
+                            <div class="layui-word-aux">大概位置;如:北校区、生活区</div>
                         </div>
                         <div>
                             <label class="layui-form-label"><font color='red' size="4">*</font>小地点:</label>
@@ -64,6 +65,7 @@
                                 <input type="text" name="address" placeholder="请输入小地点"
                                        autocomplete="off" class="layui-input" lay-verify="required">
                             </div>
+                            <div class="layui-word-aux">详细位置;如:科研楼301、2号楼201</div>
                         </div>
 
                         <button id="id_save" class="layui-btn" lay-submit lay-filter="component-form-element"