Merge branch 'ldx' into dev

src/views/promotion/task/index.vue

@@ -70,6 +70,7 @@
             <el-select v-model="queryParams.zoneId"
               placeholder="请选择战区"
               clearable
+              filterable
               :disabled="cityManagerPrivilege"
               @change="getTaskList">
               <el-option v-for="item in zoneList"
@@ -84,6 +85,7 @@
               placeholder="请选择负责人"
               :disabled="cityManagerPrivilege"
               clearable
+              filterable
               @change="getTaskList">
               <el-option v-for="item in managerList"
                 :key="item.value"
@@ -91,7 +93,7 @@
                 :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="门店"
+          <el-form-item label="店铺名"
             prop="store">
             <el-input v-model="queryParams.storeName"
               clearable