合并online分支 试试冲突

src/views/categroyManager/vipNewActive.vue

@@ -21,6 +21,7 @@
                       prop="organ">
           <el-select v-model.trim="vipform.organ"
                      multiple
+
                      filterable
                      @visible-change="$forceUpdate()"
                      @change="onOrganChange"
@@ -35,6 +36,7 @@
         <el-form-item label="课程形式"
                       prop="stauts">
           <el-select v-model.trim="vipform.stauts"
+
                      @visible-change="$forceUpdate()"
                      clearable
                      multiple>