11

src/components/tradePavilion/VehicleManagement.vue

@@ -40,6 +40,13 @@
               top: 1px;
             "></span>
         </div>
+        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+          <el-select v-model="msg.ProjectType" size="small" placeholder="请选择项目区域" filterable clearable
+            @change="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()">
+            <el-option v-for="item in ProjectTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
+        </div>
         <div class="searchInput" style="width: 250px; margin-bottom: 10px">
           <el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
             style="display: inline-block; width: 225px; height: 30px" placeholder="开发商" v-model="msg.Developers"
@@ -104,17 +111,17 @@
             </el-image>
           </template>
         </el-table-column>
+        <el-table-column prop="ProjectType" label="项目区域">
+          <template slot-scope="scope">
+            {{ getProject(scope.row.ProjectType) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="Address" width="200" label="项目地址">
         </el-table-column>
         <el-table-column prop="Developers" width="200" label="开发商">
         </el-table-column>
         <el-table-column prop="OpenTime" width="180" label="开业时间">
         </el-table-column>
-        <el-table-column prop="ProjectType" label="项目类型">
-          <template slot-scope="scope">
-            {{ getProject(scope.row.ProjectType) }}
-          </template>
-        </el-table-column>
         <el-table-column prop="IsRecommend" label="是否推荐" width="120">
           <template slot-scope="scope">
             <el-switch v-model="scope.row.IsRecommend" :active-value="1" :inactive-value="0"
@@ -391,7 +398,6 @@
           }
         });
       },
-
       //获取项目类型
       getProject(type) {
         let str = "";

src/components/tradePavilion/brandManagement.vue

@@ -19,18 +19,16 @@
           </el-input>
           <span style="margin-left: 10px">商铺区域</span>
           <el-select class="w100" @change="(msg.pageIndex = 1), getList()" style="margin-left: 10px"
-            v-model="msg.ProjectType" size="small" placeholder="请选择商铺区域">
+            v-model="msg.ProjectType" size="small" placeholder="请选择商铺区域" filterable>
             <el-option label="不限" :value="0"></el-option>
             <el-option :label="x.Name" :value="x.Id" v-for="(x, y) in ProjectTypeList" :key="y"></el-option>
           </el-select>
           <span style="margin-left: 10px">品牌分类</span>
-          <el-select class="w100" @change="(msg.pageIndex = 1), getList()" style="margin-left: 10px"
-            v-model="msg.BrandClassId" size="small" placeholder="请选择">
-            <el-option label="不限" :value="0"></el-option>
-            <el-option :label="x.ClassName" :value="x.ID" v-for="(x, y) in BrandClassList" :key="y"></el-option>
-          </el-select>
+          <el-cascader   style="margin-left: 10px" v-model="msg.BrandClassId" size="small" placeholder="请选择"
+            :options="BrandClassTree" :props="{checkStrictly: true, emitPath: false}" filterable
+            @change="(msg.pageIndex = 1), getList()">
+          </el-cascader>
           <span style="margin-left: 10px">认证用户</span>
-
           <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable
             @change="(msg.pageIndex = 1), getList()" placeholder="请选择">
             <el-option label="不限" :value="0"></el-option>
@@ -270,7 +268,7 @@
         isIndeterminate: false,
         pageCount: 0,
         loading: false,
-        BrandClassList: [], //品牌分类列表
+        BrandClassTree: [], //品牌分类列表
         ProjectTypeList: [], //商铺性质列表
         readonly: false,
         downLoadLoading: false, //导出Loading
@@ -286,7 +284,7 @@
       } else {
         this.getuserList();
       }
-      this.getBrandClassList();
+      this.getBrandClassTree();
       this.getProjectType();
       this.getDown();
     },
@@ -434,12 +432,12 @@
           }
         });
       },
-      getBrandClassList() {
-        this.apipost("/api/Trade/GetBrandClassList", {
+      getBrandClassTree() {
+        this.apipost("/api/Trade/GetBrandClassTree", {
           BrandCategory: 3
         }, (res) => {
           if (res.data.resultCode == 1) {
-            this.BrandClassList = res.data.data;
+            this.BrandClassTree = res.data.data;
           } else {
             this.Error(res.data.message);
           }

src/components/tradePavilion/editVehicle.vue

@@ -132,6 +132,12 @@
             <a v-if="addMsg.VideoUrl != ''" class="blue noline" :href="addMsg.VideoUrl" target="_blank">视频链接</a>
           </div>
         </el-form-item>
+        <el-form-item label="项目区域" prop="ProjectType">
+          <el-select style="width: 220px" v-model="addMsg.ProjectType" size="small" placeholder="请选择" filterable>
+            <el-option v-for="item in ProjectTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="项目地址" prop="Address">
           <el-input v-model="addMsg.Address" style="width: 690px" size="small" placeholder="请输入项目地址"></el-input>
         </el-form-item>
@@ -145,12 +151,6 @@
             type="datetime" placeholder="请选择开业时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="项目地址" prop="ProjectType">
-          <el-select style="width: 220px" v-model="addMsg.ProjectType" size="small" placeholder="请选择">
-            <el-option v-for="item in ProjectTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="店铺数量" prop="ShopNum">
           <el-input v-model="addMsg.ShopNum" @keyup.native="checkInteger(addMsg, 'ShopNum')" style="width: 690px"
             size="small" placeholder="请输入店铺数量">