Merge remote-tracking branch 'origin/master'

src/modules/customer/components/CreateFollow.vue

@@ -23,18 +23,16 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="联系人" prop="contact_id">
-        <el-select v-model="form.contact_id" placeholder="请选择联系人" size="small" style="width: 100%">
+        <app-user-search v-model="form.contact_id"></app-user-search>
+
+        <!-- <el-select v-model="form.contact_id" placeholder="请选择联系人" size="small" style="width: 100%">
           <el-option :label="item.name" :value="item.id" :key="item.id" v-for="item in contactList"></el-option>
-        </el-select>
+        </el-select> -->
       </el-form-item>
       <el-form-item label="跟进项目" prop="project_id">
         <el-select v-model="form.project_id" placeholder="请选择跟进项目" size="small" style="width: 100%">
-          <el-option
-            :label="item.tag === 1 ? '产业学院' : '1+X'"
-            :value="item.id"
-            :key="item.id"
-            v-for="item in projectList"
-          ></el-option>
+          <el-option label="产业学院" :value="1"></el-option>
+          <el-option label="1+X" :value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="跟进方式" prop="communication_mode">
@@ -101,7 +99,7 @@ export default {
         desc: [{ required: true, message: '请输入跟进记录', trigger: 'blur' }],
         project_status: [{ required: true, message: '请选择当前项目进展', trigger: 'blur' }]
       },
-      projectList: [],
+      // projectList: [],
       contactList: []
     }
   },