search phone
This commit is contained in:
parent
7c4ad07827
commit
d720e993a4
|
@ -33,7 +33,7 @@
|
||||||
</el-select> -->
|
</el-select> -->
|
||||||
<el-input
|
<el-input
|
||||||
v-model="search"
|
v-model="search"
|
||||||
placeholder="姓名"
|
placeholder="姓名或手机号"
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
@keyup.enter.native="handleSearch"
|
@keyup.enter.native="handleSearch"
|
||||||
|
|
|
@ -82,7 +82,7 @@ class ConsumerViewSet(ModelViewSet):
|
||||||
ordering = ['company','-create_time']
|
ordering = ['company','-create_time']
|
||||||
filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
|
filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
|
||||||
filterset_fields = ('company',)
|
filterset_fields = ('company',)
|
||||||
search_fields = ('^name',)
|
search_fields = ('^name','^username')
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
queryset = self.queryset
|
queryset = self.queryset
|
||||||
|
@ -211,12 +211,13 @@ class ConsumerViewSet(ModelViewSet):
|
||||||
subjects = sheet['d'+str(m)].value
|
subjects = sheet['d'+str(m)].value
|
||||||
workscope = sheet['e'+str(m)].value
|
workscope = sheet['e'+str(m)].value
|
||||||
if Consumer.objects.filter(username = username).exists():
|
if Consumer.objects.filter(username = username).exists():
|
||||||
consumerdict[username]=m
|
obj = Consumer.objects.filter(username = username).first()
|
||||||
else:
|
else:
|
||||||
obj = Consumer()
|
obj = Consumer()
|
||||||
obj.name = name
|
|
||||||
obj.username = username
|
obj.username = username
|
||||||
|
obj.name = name
|
||||||
obj.company = companyobj
|
obj.company = companyobj
|
||||||
|
obj.is_delete = False
|
||||||
if workscope:
|
if workscope:
|
||||||
workscope = workscope.replace(' ', '')
|
workscope = workscope.replace(' ', '')
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue