页面修改

src/components/tradePavilion/brandManagement.vue

@@ -15,16 +15,22 @@
             size="small" clearable>
           </el-input>
           <span style="margin-left: 10px">商铺性质</span>
-          <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.ProjectType"
-            size="small" clearable>
-          </el-input>
+          <el-select class="w100" @change="msg.pageIndex=1,getList()" style="margin-left: 10px;"
+            v-model="msg.ProjectType" size="small" placeholder="请选择商铺性质">
+            <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>
+          <span style="margin-left: 10px">电量</span>
+          <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.DianLiang"
+            size="small" clearable>
+          </el-input>
         </div>
       </div>
       <div style="display: flex;flex-direction: row;align-items: center;flex-wrap: wrap">
@@ -64,15 +70,6 @@
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </div>
-        <div class="block" style="margin-top: 15px;margin-left: 10px">
-          <span>电量</span>
-          <el-select class="w100" @change="msg.pageIndex=1,getList()" style="margin-left: 5px;" v-model="msg.DianLiang"
-            size="small" placeholder="请选择">
-            <el-option label="不限" :value="-1"></el-option>
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
-          </el-select>
-        </div>
         <div class="block" style="margin-top: 15px;margin-left: 10px">
           <span>排烟量</span>
           <el-select class="w100" @change="msg.pageIndex=1,getList()" style="margin-left: 5px;" v-model="msg.PaiYan"
@@ -125,7 +122,7 @@
             <span>{{scope.row.BuiltUpArea}} 至 {{scope.row.EndBuiltUpArea}} 平</span>
           </template>
         </el-table-column>
-        <el-table-column prop="ProjectName" label="商铺性质" width="80">
+        <el-table-column prop="ProjectName" label="商铺性质" width="150">
         </el-table-column>
         <el-table-column prop="BrandType" label="品牌定位" width="160">
         </el-table-column>
@@ -157,12 +154,12 @@
           pageIndex: 1,
           pageSize: 20,
           BrandName: '', //品牌名
-          ProjectType: '', //商铺性质
+          ProjectType: 0, //商铺性质
           Plumbing: -1, //上下水（0-否1-有）
           Caliber: -1, //管径（0-否1-有）
           Sewage: -1, //排污（0-否1-有）
           RanQi: -1, //燃气（0-否1-有）
-          DianLiang: -1, //电量（0-否1-有）
+          DianLiang: "", //电量（0-否1-有）
           PaiYan: -1, //排烟量（0-否1-有）
           KongTiao: -1, //空调（0-否1-有）
           XinFeng: -1, //新风（0-否1-有）
@@ -171,16 +168,31 @@
         dataList: [],
         pageCount: 0,
         loading: false,
-        BrandClassList: [],
+        BrandClassList: [], //品牌分类列表
+        ProjectTypeList: [], //商铺性质列表
       }
     },
     created() {
-      this.getBrandClassList()
+      this.getBrandClassList();
+      this.getProjectType();
     },
     mounted() {
       this.getList();
     },
     methods: {
+      //获取商铺性质
+      getProjectType() {
+        this.apipost(
+          "/api/Trade/GetProjectTypeEnumList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.ProjectTypeList = res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+        );
+      },
       getList() {
         this.apipost(
           "/api/Trade/GetBrandPageList", this.msg,