|
@@ -1234,6 +1234,8 @@ class DeviceManagement(View):
|
|
order_number = request_dict.get('orderNumber')
|
|
order_number = request_dict.get('orderNumber')
|
|
name = request_dict.get('name')
|
|
name = request_dict.get('name')
|
|
email = request_dict.get('email')
|
|
email = request_dict.get('email')
|
|
|
|
+ serial_number = request_dict.get('serialNumber')
|
|
|
|
+ uid = request_dict.get('uid')
|
|
page = int(request_dict.get('pageNo', 1))
|
|
page = int(request_dict.get('pageNo', 1))
|
|
page_size = int(request_dict.get('pageSize', 10))
|
|
page_size = int(request_dict.get('pageSize', 10))
|
|
|
|
|
|
@@ -1255,6 +1257,12 @@ class DeviceManagement(View):
|
|
# 查询设备列表
|
|
# 查询设备列表
|
|
customer_device_qs = CustomCustomerDevice.objects.filter(c_id__in=c_id_list).order_by('-created_time')
|
|
customer_device_qs = CustomCustomerDevice.objects.filter(c_id__in=c_id_list).order_by('-created_time')
|
|
|
|
|
|
|
|
+ # 通过serial_number和uid进行过滤
|
|
|
|
+ if serial_number:
|
|
|
|
+ customer_device_qs = customer_device_qs.filter(serial_number__icontains=serial_number)
|
|
|
|
+ if uid:
|
|
|
|
+ customer_device_qs = customer_device_qs.filter(uid=uid)
|
|
|
|
+
|
|
# 分页处理
|
|
# 分页处理
|
|
paginator = Paginator(customer_device_qs, page_size)
|
|
paginator = Paginator(customer_device_qs, page_size)
|
|
customer_device_page = paginator.get_page(page)
|
|
customer_device_page = paginator.get_page(page)
|