查询条件

src/config/api.js

@@ -61,7 +61,7 @@ const apis = {
     getCityName: {
       method: 'get',
       url: `${commPrefix}/tdCity?leveltype=2`
-    },
+    }
 
   },
   dynamic: {

src/views/activity/list.vue

@@ -11,6 +11,26 @@
               <el-option v-for="site in buildings" :label="site.buildingName" :value="site.buildingId" :key="site.buildingId"></el-option>
            </el-select>
           </li>
+          <li>
+             <select-building v-model="filterData.buildingId"></select-building>
+          </li>
+           <li>
+                <el-date-picker
+                        v-model="filterData.time"
+                        type="datetime"
+                        placeholder="活动时间">
+                </el-date-picker>
+           </li>
+            <li>
+                <el-select v-model="filterData.isEnlist" placeholder="是否报名">
+                    <el-option
+                            v-for="item in enlistOptions"
+                            :key="item.enlist"
+                            :label="item.label"
+                            :value="item.enlist">
+                    </el-option>
+                </el-select>
+            </li>
 
         </ul>
         <el-button
@@ -104,9 +124,20 @@ export default {
         pageNum:1,
         pageSize:10,
         total:0,
-        top:''
+        top:'',
+        time: '',
+        isEnlist: ''
       },
-      
+      enlistOptions: [
+          {
+              label: '已报名',
+              enlist: 1
+          },
+          {
+              label: '未报名',
+              enlist: 0
+          }
+      ],
       buildingForm: {
         pageNum: 1,
         pageSize: 100

src/views/building/list.vue

@@ -7,11 +7,59 @@
         </div>
         <ul>
           <li>
-            <el-input v-model="code" placeholder="楼盘编号"></el-input>
+            <el-input v-model="from.code" placeholder="楼盘编号"  style="width: 120px;"></el-input>
           </li>
           <li>
-            <el-input v-model="name" placeholder="楼盘名称"></el-input>
+            <el-input v-model="from.name" placeholder="楼盘名称"></el-input>
           </li>
+          <li>
+            <el-date-picker
+                    v-model="from.startDate"
+                    type="datetime"
+                    placeholder="开盘时间">
+            </el-date-picker>
+          </li>
+          <li>
+            <el-select v-model="from.buildingStatus" placeholder="楼盘状态"  style="width: 120px;">
+              <el-option
+                      v-for="item in statusOptions"
+                      :key="item.buildingStatus"
+                      :label="item.label"
+                      :value="item.buildingStatus">
+              </el-option>
+            </el-select>
+          </li>
+          <li>
+            <el-select v-model="from.marketStatus" placeholder="销售状态">
+              <el-option
+                      v-for="item in marketStatusOptions"
+                      :key="item.marketStatus"
+                      :label="item.label"
+                      :value="item.marketStatus">
+              </el-option>
+            </el-select>
+          </li>
+          <li>
+            <el-select v-model="from.cityId" placeholder="城市">
+              <el-option
+                      v-for="item in cityList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+              </el-option>
+            </el-select>
+          </li>
+          <li>
+            <el-select v-model="from.isMain" placeholder="首页推荐">
+              <el-option
+                      v-for="item in mainOption"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+              </el-option>
+            </el-select>
+          </li>
+
         </ul>
         <el-button
           size="mini"
@@ -97,8 +145,8 @@
       small
       style="margin-top:10px;"
       layout="prev, pager, next"
-      :current-page.sync="currentPage"
-      :pageSize="pageSize"
+      :current-page.sync="from.currentPage"
+      :pageSize="from.pageSize"
       :total="buildings.total || 0"
       @current-change="getList"
     >
@@ -114,10 +162,48 @@ import { mapState } from 'vuex'
 export default {
   data() {
     return {
-      pageSize: 20,
-      currentPage: 1,
-      code: '',
-      name: ''
+      from: {
+        pageSize: 20,
+        currentPage: 1,
+        code: '',
+        name: '',
+        startDate: '',
+        buildingStatus: '',
+        marketStatus: '',
+        cityId: '',
+        isMain: ''
+      },
+      cityList: [], // 城市列表
+      mainOption: [ // 是否首页推荐
+        {
+          label: '首页推荐',
+          value: 1
+        },
+        {
+          label: '未首页推荐',
+          value: 0
+        }
+      ],
+      statusOptions: [
+        {
+          label: '已发布',
+          buildingStatus: 1
+        },
+        {
+          label: '未发布',
+          buildingStatus: 0
+        }
+      ],
+      marketStatusOptions: [
+        {
+          label: '已销售',
+          marketStatus: 1
+        },
+        {
+          label: '未销售',
+          marketStatus: 0
+        }
+      ]
     }
   },
   computed: {
@@ -158,12 +244,7 @@ export default {
     //   }
     // },
     getList () {
-      this.getBuildings({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        code: this.code,
-        name: this.name
-      })
+      this.getBuildings(this.from)
     },
     search () {
       this.currentPage = 1
@@ -221,10 +302,18 @@ export default {
           this.getList()
         })
       })
+    },
+    getCityName() { // 查询城市
+      this.$store.dispatch('building/getCityName').then((res) => {
+        this.cityList = res
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message)
+      })
     }
   },
   created () {
     this.getList()
+    this.getCityName()
   }
 }
 </script>

src/views/carouselFigure/advertisement.vue

@@ -5,12 +5,15 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
         </div>
-        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
+        &nbsp;
+        <select-building v-model="form.buildingId"></select-building>
+        &nbsp;
+        <el-select v-model="form.contentType" placeholder="类型" @change="getList">
           <el-option
-                  v-for="item in buildingList"
-                  :key="item.buildingId"
-                  :label="item.buildingName"
-                  :value="item.buildingId">
+                  v-for="item in contentTypeOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
           </el-option>
         </el-select>
       </div>
@@ -64,8 +67,8 @@
             small
             style="margin-top:10px;"
             layout="prev, pager, next"
-            :current-page.sync="currentPage"
-            :pageSize="pageSize"
+            :current-page.sync="form.currentPage"
+            :pageSize="form.pageSize"
             :total="carouselList.total || 0"
             @current-change="getList"
     >
@@ -99,6 +102,23 @@
           pageNum: 1,
           pageSize: 100
         },
+        form: {
+          pageNum: 1,
+          pageSize: 1000,
+          buildingId: '',
+          showType: 'screen',
+          contentType: '',
+        },
+        contentTypeOption: [
+          {
+            label: '资讯',
+            value: 'news'
+          },
+          {
+            label: '其他',
+            value: 'other'
+          }
+        ],
       };
     },
     computed: {
@@ -122,12 +142,7 @@
       },
 
       getList() {
-        this.getExtendContent({
-          pageNum: this.currentPage,
-          pageSize: this.pageSize,
-          buildingId: this.buildingId,
-          showType: 'screen'
-        });
+        this.getExtendContent(this.form);
       },
       getBuildingName(id) {
         return (

src/views/carouselFigure/list.vue

@@ -5,14 +5,36 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
         </div>
-        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
+        &nbsp;
+        <select-building v-model="form.buildingId"></select-building>
+        &nbsp;
+        <el-select v-model="form.contentType" placeholder="类型" @change="getList">
           <el-option
-                  v-for="item in buildingList"
-                  :key="item.buildingId"
-                  :label="item.buildingName"
-                  :value="item.buildingId">
+                  v-for="item in contentTypeOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
           </el-option>
         </el-select>
+        &nbsp;
+        <el-select v-model="form.showPosition" placeholder="发布位置" @change="getList">
+          <el-option
+                  v-for="item in showPositionOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+          </el-option>
+        </el-select>
+        &nbsp;
+        <el-select v-model="form.status" placeholder="状态" @change="getList">
+          <el-option
+                  v-for="item in statusOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+          </el-option>
+        </el-select>
+
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -105,6 +127,49 @@ export default {
         pageNum: 1,
         pageSize: 100
       },
+      form: {
+        pageNum: 1,
+        pageSize: 100,
+        buildingId: '',
+        showType: 'banner',
+        contentType: '',
+        showPosition: '',
+        status: ''
+      },
+      contentTypeOption: [
+        {
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        }
+      ],
+      showPositionOption: [
+        {
+          label: '商城',
+          value: 'mall'
+        },
+        {
+          label: '首页',
+          value: 'index'
+        },
+      ],
+      statusOption: [
+        {
+          label: '启用',
+          value: 1
+        },
+        {
+          label: '停用',
+          value: 0
+        }
+      ]
     };
   },
   computed: {
@@ -128,12 +193,7 @@ export default {
     },
 
     getList() {
-      this.getExtendContent({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        buildingId: this.buildingId,
-        showType: 'banner'
-      });
+      this.getExtendContent(this.form);
     },
     getBuildingName(id) {
       return (

src/views/customer/list.vue

@@ -4,20 +4,26 @@
       <div class="flex-h">
         <ul>
           <li>
-            <span>姓名</span>
-            <el-input v-model="form.name" ></el-input>
+            <el-input v-model="form.name" placeholder="姓名"></el-input>
           </li>
           <li>
-            <span>电话</span>
-            <el-input v-model="form.tel" ></el-input>
+            <el-input v-model="form.tel" placeholder="电话"></el-input>
           </li>
           <li>
-            <span>推荐人</span>
-            <el-input v-model="form.consultName" ></el-input>
+            <el-input v-model="form.consultName" placeholder="推荐人"></el-input>
           </li>
           <li>
-            <span>推荐人电话</span>
-            <el-input v-model="form.consultTel" ></el-input>
+            <el-input v-model="form.consultTel" placeholder="推荐人电话"></el-input>
+          </li>
+          <li>
+            <el-select v-model="form.sex" placeholder="性别">
+              <el-option
+                      v-for="item in sexOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+              </el-option>
+            </el-select>
           </li>
         </ul>
         <el-button
@@ -157,6 +163,16 @@
           consultTel: '',
           verifyStatus: '1' // 0未通过 1已通过 2已驳
         },
+        sexOptions: [ // 性别
+          {
+            label: '男',
+            value: 1
+          },
+          {
+            label: '女',
+            value: 2
+          }
+        ],
         list: [],
         total: 0,
         sex: "",

src/views/goods/list.vue

@@ -9,6 +9,26 @@
           <li>
             <el-input v-model="filterData.goodsName" placeholder="商品名称"></el-input>
           </li>
+          <li>
+            <el-select v-model="filterData.status" clearable placeholder="状态">
+              <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+              </el-option>
+            </el-select>
+          </li>
+          <li>
+            <select-building v-model="filterData.buildingId"></select-building>
+          </li>
+          <li>
+            <el-input v-model="filterData.priceLesser" placeholder="价格小" style="width: 100px;"/>
+          </li>
+
+          <li>
+            <el-input v-model="filterData.priceGreater" placeholder="价格大" style="width: 100px;"/>
+          </li>
 
         </ul>
         <el-button
@@ -87,14 +107,25 @@ export default {
   data() {
     return {
       filterData: {
-        goodsName: ""
+        goodsName: "",
+        status: '',
+        buildingId: '',
+        priceLesser: '',
+        priceGreater: ''
       },
       list: [],
       pageNavi: {
         current: 1,
         size: 20,
         total: 0
-      }
+      },
+      options: [{
+        value: 1,
+        label: '已上架'
+      }, {
+        value: 0,
+        label: '已下架'
+      }],
     };
   },
   computed: {},

src/views/news/index.vue

@@ -3,7 +3,7 @@
         <div class="operation-class">
            <el-button type="primary" @click="ediNewsType">新增</el-button>
             &nbsp;
-            <el-select v-model="form.buildingId" placeholder="项目" @change="getList">
+            <el-select v-model="form.buildingId" placeholder="项目" @change="getChangeList">
                 <el-option
                         v-for="item in buildingList"
                         :key="item.buildingId"
@@ -11,6 +11,24 @@
                         :value="item.buildingId">
                 </el-option>
             </el-select>
+            &nbsp;
+            <el-select v-model="form.newsTypeId" placeholder="资讯类型" @change="getList">
+                <el-option
+                        v-for="item in typeList"
+                        :key="item.newsTypeId"
+                        :label="item.newsTypeName"
+                        :value="item.newsTypeId">
+                </el-option>
+            </el-select>
+            &nbsp;
+            <el-select v-model="form.newsStatus" placeholder="状态" @change="getList">
+                 <el-option
+                            v-for="item in optionNewsStatus"
+                            :key="item.newsStatus"
+                            :label="item.name"
+                            :value="item.newsStatus">
+                 </el-option>
+            </el-select>
         </div>
         <div class="body">
             <el-table
@@ -104,19 +122,38 @@
                 form: {
                     buildingId: '',
                     pageNum: 1,
-                    pageSize: 10
+                    pageSize: 10,
+                    newsTypeId: '',
+                    newsStatus: ''
                 },
                 buildingForm: {
                     pageNum: 1,
                     pageSize: 100
                 },
                 total: 0,
-                list: []
+                list: [],
+                typeList: [],
+                typeForm: {
+                    buildingId: '',
+                    pageNum: 1,
+                    pageSize: 100
+                },
+                optionNewsStatus: [
+                    {
+                        name: '已发布',
+                        newsStatus: 0
+                    },
+                    {
+                        name: '未发布',
+                        newsStatus: 1
+                    }
+                ],
             }
         },
         created() {
           this.getList()
           this.getBuildList()
+          this.getTypeList()
         },
         methods: {
             formateDate(dt) {
@@ -142,6 +179,10 @@
                 this.form.pageNum = val
                 this.getList()
             },
+            getChangeList() { // 项目change事件
+                this.getList()
+                this.getTypeList()
+            },
             getList() {
               this.$store.dispatch('news/getList', this.form).then((res) => {
                 this.list = res.records
@@ -172,7 +213,16 @@
                 }).catch(() => {
                     console.log('news/updateType err')
                 })
-            }
+            },
+            getTypeList() {
+                this.typeForm.buildingId = this.form.buildingId
+                this.$store.dispatch('news/getTypeList', this.typeForm).then((res) => {
+                    this.typeList = res.records
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
+                    console.log('news/getTypeList err')
+                })
+            },
         }
     }
 </script>