From 4b769d36aec10200008c2799b8f1fbbb0de487a7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 9 Apr 2020 19:15:57 +0800
Subject: [PATCH] clearable

---
 test_client/src/views/crm/consumer.vue | 6 +++---
 test_server/crm/views.py               | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index ed5cf99..c5b594f 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -163,7 +163,7 @@
           <el-input v-model="consumer.username" placeholder="手机号" />
         </el-form-item>
         <el-form-item label="单位" prop="company">
-          <el-select v-model="consumer.company" placeholder="单位" style="width:100%">
+          <el-select v-model="consumer.company" placeholder="单位" style="width:100%" clearable>
     <el-option
       v-for="item in companyData"
       :key="item.value"
@@ -184,8 +184,8 @@
     </el-option>
   </el-select>
         </el-form-item>
-  <el-form-item label="工作类别" prop="subjects">
-      <el-select v-model="consumer.workscope" placeholder="工作类别" style="width:100%" >
+  <el-form-item label="工作类别" prop="workscope">
+      <el-select v-model="consumer.workscope" placeholder="工作类别" style="width:100%" clearable>
     <el-option
       v-for="item in workscopeData"
       :key="item.value"
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 628614f..13c40ec 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -285,6 +285,7 @@ class ConsumerRegister(APIView):
                         if avatar and nickname:
                             consumer.avatar = avatar
                             consumer.nickname = nickname
+                        consumer.is_delete = False
                         consumer.save()
                         return Response(status=status.HTTP_200_OK)
                     else:
@@ -293,6 +294,7 @@ class ConsumerRegister(APIView):
                         if avatar and nickname:
                             consumer.avatar = avatar
                             consumer.nickname = nickname
+                        consumer.is_delete = False
                         consumer.save()
                         return Response(status=status.HTTP_200_OK)
                 else: