Browse Source

查询条件

魏熙美 5 years ago
parent
commit
0deb327ce4

+ 1
- 1
src/config/api.js View File

61
     getCityName: {
61
     getCityName: {
62
       method: 'get',
62
       method: 'get',
63
       url: `${commPrefix}/tdCity?leveltype=2`
63
       url: `${commPrefix}/tdCity?leveltype=2`
64
-    },
64
+    }
65
 
65
 
66
   },
66
   },
67
   dynamic: {
67
   dynamic: {

+ 33
- 2
src/views/activity/list.vue View File

11
               <el-option v-for="site in buildings" :label="site.buildingName" :value="site.buildingId" :key="site.buildingId"></el-option>
11
               <el-option v-for="site in buildings" :label="site.buildingName" :value="site.buildingId" :key="site.buildingId"></el-option>
12
            </el-select>
12
            </el-select>
13
           </li>
13
           </li>
14
+          <li>
15
+             <select-building v-model="filterData.buildingId"></select-building>
16
+          </li>
17
+           <li>
18
+                <el-date-picker
19
+                        v-model="filterData.time"
20
+                        type="datetime"
21
+                        placeholder="活动时间">
22
+                </el-date-picker>
23
+           </li>
24
+            <li>
25
+                <el-select v-model="filterData.isEnlist" placeholder="是否报名">
26
+                    <el-option
27
+                            v-for="item in enlistOptions"
28
+                            :key="item.enlist"
29
+                            :label="item.label"
30
+                            :value="item.enlist">
31
+                    </el-option>
32
+                </el-select>
33
+            </li>
14
 
34
 
15
         </ul>
35
         </ul>
16
         <el-button
36
         <el-button
104
         pageNum:1,
124
         pageNum:1,
105
         pageSize:10,
125
         pageSize:10,
106
         total:0,
126
         total:0,
107
-        top:''
127
+        top:'',
128
+        time: '',
129
+        isEnlist: ''
108
       },
130
       },
109
-      
131
+      enlistOptions: [
132
+          {
133
+              label: '已报名',
134
+              enlist: 1
135
+          },
136
+          {
137
+              label: '未报名',
138
+              enlist: 0
139
+          }
140
+      ],
110
       buildingForm: {
141
       buildingForm: {
111
         pageNum: 1,
142
         pageNum: 1,
112
         pageSize: 100
143
         pageSize: 100

+ 103
- 14
src/views/building/list.vue View File

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <el-input v-model="code" placeholder="楼盘编号"></el-input>
10
+            <el-input v-model="from.code" placeholder="楼盘编号"  style="width: 120px;"></el-input>
11
           </li>
11
           </li>
12
           <li>
12
           <li>
13
-            <el-input v-model="name" placeholder="楼盘名称"></el-input>
13
+            <el-input v-model="from.name" placeholder="楼盘名称"></el-input>
14
           </li>
14
           </li>
15
+          <li>
16
+            <el-date-picker
17
+                    v-model="from.startDate"
18
+                    type="datetime"
19
+                    placeholder="开盘时间">
20
+            </el-date-picker>
21
+          </li>
22
+          <li>
23
+            <el-select v-model="from.buildingStatus" placeholder="楼盘状态"  style="width: 120px;">
24
+              <el-option
25
+                      v-for="item in statusOptions"
26
+                      :key="item.buildingStatus"
27
+                      :label="item.label"
28
+                      :value="item.buildingStatus">
29
+              </el-option>
30
+            </el-select>
31
+          </li>
32
+          <li>
33
+            <el-select v-model="from.marketStatus" placeholder="销售状态">
34
+              <el-option
35
+                      v-for="item in marketStatusOptions"
36
+                      :key="item.marketStatus"
37
+                      :label="item.label"
38
+                      :value="item.marketStatus">
39
+              </el-option>
40
+            </el-select>
41
+          </li>
42
+          <li>
43
+            <el-select v-model="from.cityId" placeholder="城市">
44
+              <el-option
45
+                      v-for="item in cityList"
46
+                      :key="item.id"
47
+                      :label="item.name"
48
+                      :value="item.id">
49
+              </el-option>
50
+            </el-select>
51
+          </li>
52
+          <li>
53
+            <el-select v-model="from.isMain" placeholder="首页推荐">
54
+              <el-option
55
+                      v-for="item in mainOption"
56
+                      :key="item.value"
57
+                      :label="item.label"
58
+                      :value="item.value">
59
+              </el-option>
60
+            </el-select>
61
+          </li>
62
+
15
         </ul>
63
         </ul>
16
         <el-button
64
         <el-button
17
           size="mini"
65
           size="mini"
97
       small
145
       small
98
       style="margin-top:10px;"
146
       style="margin-top:10px;"
99
       layout="prev, pager, next"
147
       layout="prev, pager, next"
100
-      :current-page.sync="currentPage"
101
-      :pageSize="pageSize"
148
+      :current-page.sync="from.currentPage"
149
+      :pageSize="from.pageSize"
102
       :total="buildings.total || 0"
150
       :total="buildings.total || 0"
103
       @current-change="getList"
151
       @current-change="getList"
104
     >
152
     >
114
 export default {
162
 export default {
115
   data() {
163
   data() {
116
     return {
164
     return {
117
-      pageSize: 20,
118
-      currentPage: 1,
119
-      code: '',
120
-      name: ''
165
+      from: {
166
+        pageSize: 20,
167
+        currentPage: 1,
168
+        code: '',
169
+        name: '',
170
+        startDate: '',
171
+        buildingStatus: '',
172
+        marketStatus: '',
173
+        cityId: '',
174
+        isMain: ''
175
+      },
176
+      cityList: [], // 城市列表
177
+      mainOption: [ // 是否首页推荐
178
+        {
179
+          label: '首页推荐',
180
+          value: 1
181
+        },
182
+        {
183
+          label: '未首页推荐',
184
+          value: 0
185
+        }
186
+      ],
187
+      statusOptions: [
188
+        {
189
+          label: '已发布',
190
+          buildingStatus: 1
191
+        },
192
+        {
193
+          label: '未发布',
194
+          buildingStatus: 0
195
+        }
196
+      ],
197
+      marketStatusOptions: [
198
+        {
199
+          label: '已销售',
200
+          marketStatus: 1
201
+        },
202
+        {
203
+          label: '未销售',
204
+          marketStatus: 0
205
+        }
206
+      ]
121
     }
207
     }
122
   },
208
   },
123
   computed: {
209
   computed: {
158
     //   }
244
     //   }
159
     // },
245
     // },
160
     getList () {
246
     getList () {
161
-      this.getBuildings({
162
-        pageNum: this.currentPage,
163
-        pageSize: this.pageSize,
164
-        code: this.code,
165
-        name: this.name
166
-      })
247
+      this.getBuildings(this.from)
167
     },
248
     },
168
     search () {
249
     search () {
169
       this.currentPage = 1
250
       this.currentPage = 1
221
           this.getList()
302
           this.getList()
222
         })
303
         })
223
       })
304
       })
305
+    },
306
+    getCityName() { // 查询城市
307
+      this.$store.dispatch('building/getCityName').then((res) => {
308
+        this.cityList = res
309
+      }).catch((err) => {
310
+        this.$notify.error(err.msg || err.message)
311
+      })
224
     }
312
     }
225
   },
313
   },
226
   created () {
314
   created () {
227
     this.getList()
315
     this.getList()
316
+    this.getCityName()
228
   }
317
   }
229
 }
318
 }
230
 </script>
319
 </script>

+ 28
- 13
src/views/carouselFigure/advertisement.vue View File

5
         <div class="flex-item flex-h">
5
         <div class="flex-item flex-h">
6
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
6
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
7
         </div>
7
         </div>
8
-        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
8
+        &nbsp;
9
+        <select-building v-model="form.buildingId"></select-building>
10
+        &nbsp;
11
+        <el-select v-model="form.contentType" placeholder="类型" @change="getList">
9
           <el-option
12
           <el-option
10
-                  v-for="item in buildingList"
11
-                  :key="item.buildingId"
12
-                  :label="item.buildingName"
13
-                  :value="item.buildingId">
13
+                  v-for="item in contentTypeOption"
14
+                  :key="item.value"
15
+                  :label="item.label"
16
+                  :value="item.value">
14
           </el-option>
17
           </el-option>
15
         </el-select>
18
         </el-select>
16
       </div>
19
       </div>
64
             small
67
             small
65
             style="margin-top:10px;"
68
             style="margin-top:10px;"
66
             layout="prev, pager, next"
69
             layout="prev, pager, next"
67
-            :current-page.sync="currentPage"
68
-            :pageSize="pageSize"
70
+            :current-page.sync="form.currentPage"
71
+            :pageSize="form.pageSize"
69
             :total="carouselList.total || 0"
72
             :total="carouselList.total || 0"
70
             @current-change="getList"
73
             @current-change="getList"
71
     >
74
     >
99
           pageNum: 1,
102
           pageNum: 1,
100
           pageSize: 100
103
           pageSize: 100
101
         },
104
         },
105
+        form: {
106
+          pageNum: 1,
107
+          pageSize: 1000,
108
+          buildingId: '',
109
+          showType: 'screen',
110
+          contentType: '',
111
+        },
112
+        contentTypeOption: [
113
+          {
114
+            label: '资讯',
115
+            value: 'news'
116
+          },
117
+          {
118
+            label: '其他',
119
+            value: 'other'
120
+          }
121
+        ],
102
       };
122
       };
103
     },
123
     },
104
     computed: {
124
     computed: {
122
       },
142
       },
123
 
143
 
124
       getList() {
144
       getList() {
125
-        this.getExtendContent({
126
-          pageNum: this.currentPage,
127
-          pageSize: this.pageSize,
128
-          buildingId: this.buildingId,
129
-          showType: 'screen'
130
-        });
145
+        this.getExtendContent(this.form);
131
       },
146
       },
132
       getBuildingName(id) {
147
       getBuildingName(id) {
133
         return (
148
         return (

+ 71
- 11
src/views/carouselFigure/list.vue View File

5
         <div class="flex-item flex-h">
5
         <div class="flex-item flex-h">
6
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
6
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
7
         </div>
7
         </div>
8
-        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
8
+        &nbsp;
9
+        <select-building v-model="form.buildingId"></select-building>
10
+        &nbsp;
11
+        <el-select v-model="form.contentType" placeholder="类型" @change="getList">
9
           <el-option
12
           <el-option
10
-                  v-for="item in buildingList"
11
-                  :key="item.buildingId"
12
-                  :label="item.buildingName"
13
-                  :value="item.buildingId">
13
+                  v-for="item in contentTypeOption"
14
+                  :key="item.value"
15
+                  :label="item.label"
16
+                  :value="item.value">
14
           </el-option>
17
           </el-option>
15
         </el-select>
18
         </el-select>
19
+        &nbsp;
20
+        <el-select v-model="form.showPosition" placeholder="发布位置" @change="getList">
21
+          <el-option
22
+                  v-for="item in showPositionOption"
23
+                  :key="item.value"
24
+                  :label="item.label"
25
+                  :value="item.value">
26
+          </el-option>
27
+        </el-select>
28
+        &nbsp;
29
+        <el-select v-model="form.status" placeholder="状态" @change="getList">
30
+          <el-option
31
+                  v-for="item in statusOption"
32
+                  :key="item.value"
33
+                  :label="item.label"
34
+                  :value="item.value">
35
+          </el-option>
36
+        </el-select>
37
+
16
       </div>
38
       </div>
17
       <div class="moreFilter"></div>
39
       <div class="moreFilter"></div>
18
     </div>
40
     </div>
105
         pageNum: 1,
127
         pageNum: 1,
106
         pageSize: 100
128
         pageSize: 100
107
       },
129
       },
130
+      form: {
131
+        pageNum: 1,
132
+        pageSize: 100,
133
+        buildingId: '',
134
+        showType: 'banner',
135
+        contentType: '',
136
+        showPosition: '',
137
+        status: ''
138
+      },
139
+      contentTypeOption: [
140
+        {
141
+          label: '活动',
142
+          value: 'activity'
143
+        },
144
+        {
145
+          label: '项目',
146
+          value: 'project'
147
+        },
148
+        {
149
+          label: '资讯',
150
+          value: 'news'
151
+        }
152
+      ],
153
+      showPositionOption: [
154
+        {
155
+          label: '商城',
156
+          value: 'mall'
157
+        },
158
+        {
159
+          label: '首页',
160
+          value: 'index'
161
+        },
162
+      ],
163
+      statusOption: [
164
+        {
165
+          label: '启用',
166
+          value: 1
167
+        },
168
+        {
169
+          label: '停用',
170
+          value: 0
171
+        }
172
+      ]
108
     };
173
     };
109
   },
174
   },
110
   computed: {
175
   computed: {
128
     },
193
     },
129
 
194
 
130
     getList() {
195
     getList() {
131
-      this.getExtendContent({
132
-        pageNum: this.currentPage,
133
-        pageSize: this.pageSize,
134
-        buildingId: this.buildingId,
135
-        showType: 'banner'
136
-      });
196
+      this.getExtendContent(this.form);
137
     },
197
     },
138
     getBuildingName(id) {
198
     getBuildingName(id) {
139
       return (
199
       return (

+ 24
- 8
src/views/customer/list.vue View File

4
       <div class="flex-h">
4
       <div class="flex-h">
5
         <ul>
5
         <ul>
6
           <li>
6
           <li>
7
-            <span>姓名</span>
8
-            <el-input v-model="form.name" ></el-input>
7
+            <el-input v-model="form.name" placeholder="姓名"></el-input>
9
           </li>
8
           </li>
10
           <li>
9
           <li>
11
-            <span>电话</span>
12
-            <el-input v-model="form.tel" ></el-input>
10
+            <el-input v-model="form.tel" placeholder="电话"></el-input>
13
           </li>
11
           </li>
14
           <li>
12
           <li>
15
-            <span>推荐人</span>
16
-            <el-input v-model="form.consultName" ></el-input>
13
+            <el-input v-model="form.consultName" placeholder="推荐人"></el-input>
17
           </li>
14
           </li>
18
           <li>
15
           <li>
19
-            <span>推荐人电话</span>
20
-            <el-input v-model="form.consultTel" ></el-input>
16
+            <el-input v-model="form.consultTel" placeholder="推荐人电话"></el-input>
17
+          </li>
18
+          <li>
19
+            <el-select v-model="form.sex" placeholder="性别">
20
+              <el-option
21
+                      v-for="item in sexOptions"
22
+                      :key="item.value"
23
+                      :label="item.label"
24
+                      :value="item.value">
25
+              </el-option>
26
+            </el-select>
21
           </li>
27
           </li>
22
         </ul>
28
         </ul>
23
         <el-button
29
         <el-button
157
           consultTel: '',
163
           consultTel: '',
158
           verifyStatus: '1' // 0未通过 1已通过 2已驳
164
           verifyStatus: '1' // 0未通过 1已通过 2已驳
159
         },
165
         },
166
+        sexOptions: [ // 性别
167
+          {
168
+            label: '男',
169
+            value: 1
170
+          },
171
+          {
172
+            label: '女',
173
+            value: 2
174
+          }
175
+        ],
160
         list: [],
176
         list: [],
161
         total: 0,
177
         total: 0,
162
         sex: "",
178
         sex: "",

+ 33
- 2
src/views/goods/list.vue View File

9
           <li>
9
           <li>
10
             <el-input v-model="filterData.goodsName" placeholder="商品名称"></el-input>
10
             <el-input v-model="filterData.goodsName" placeholder="商品名称"></el-input>
11
           </li>
11
           </li>
12
+          <li>
13
+            <el-select v-model="filterData.status" clearable placeholder="状态">
14
+              <el-option
15
+                      v-for="item in options"
16
+                      :key="item.value"
17
+                      :label="item.label"
18
+                      :value="item.value">
19
+              </el-option>
20
+            </el-select>
21
+          </li>
22
+          <li>
23
+            <select-building v-model="filterData.buildingId"></select-building>
24
+          </li>
25
+          <li>
26
+            <el-input v-model="filterData.priceLesser" placeholder="价格小" style="width: 100px;"/>
27
+          </li>
28
+
29
+          <li>
30
+            <el-input v-model="filterData.priceGreater" placeholder="价格大" style="width: 100px;"/>
31
+          </li>
12
 
32
 
13
         </ul>
33
         </ul>
14
         <el-button
34
         <el-button
87
   data() {
107
   data() {
88
     return {
108
     return {
89
       filterData: {
109
       filterData: {
90
-        goodsName: ""
110
+        goodsName: "",
111
+        status: '',
112
+        buildingId: '',
113
+        priceLesser: '',
114
+        priceGreater: ''
91
       },
115
       },
92
       list: [],
116
       list: [],
93
       pageNavi: {
117
       pageNavi: {
94
         current: 1,
118
         current: 1,
95
         size: 20,
119
         size: 20,
96
         total: 0
120
         total: 0
97
-      }
121
+      },
122
+      options: [{
123
+        value: 1,
124
+        label: '已上架'
125
+      }, {
126
+        value: 0,
127
+        label: '已下架'
128
+      }],
98
     };
129
     };
99
   },
130
   },
100
   computed: {},
131
   computed: {},

+ 54
- 4
src/views/news/index.vue View File

3
         <div class="operation-class">
3
         <div class="operation-class">
4
            <el-button type="primary" @click="ediNewsType">新增</el-button>
4
            <el-button type="primary" @click="ediNewsType">新增</el-button>
5
             &nbsp;
5
             &nbsp;
6
-            <el-select v-model="form.buildingId" placeholder="项目" @change="getList">
6
+            <el-select v-model="form.buildingId" placeholder="项目" @change="getChangeList">
7
                 <el-option
7
                 <el-option
8
                         v-for="item in buildingList"
8
                         v-for="item in buildingList"
9
                         :key="item.buildingId"
9
                         :key="item.buildingId"
11
                         :value="item.buildingId">
11
                         :value="item.buildingId">
12
                 </el-option>
12
                 </el-option>
13
             </el-select>
13
             </el-select>
14
+            &nbsp;
15
+            <el-select v-model="form.newsTypeId" placeholder="资讯类型" @change="getList">
16
+                <el-option
17
+                        v-for="item in typeList"
18
+                        :key="item.newsTypeId"
19
+                        :label="item.newsTypeName"
20
+                        :value="item.newsTypeId">
21
+                </el-option>
22
+            </el-select>
23
+            &nbsp;
24
+            <el-select v-model="form.newsStatus" placeholder="状态" @change="getList">
25
+                 <el-option
26
+                            v-for="item in optionNewsStatus"
27
+                            :key="item.newsStatus"
28
+                            :label="item.name"
29
+                            :value="item.newsStatus">
30
+                 </el-option>
31
+            </el-select>
14
         </div>
32
         </div>
15
         <div class="body">
33
         <div class="body">
16
             <el-table
34
             <el-table
104
                 form: {
122
                 form: {
105
                     buildingId: '',
123
                     buildingId: '',
106
                     pageNum: 1,
124
                     pageNum: 1,
107
-                    pageSize: 10
125
+                    pageSize: 10,
126
+                    newsTypeId: '',
127
+                    newsStatus: ''
108
                 },
128
                 },
109
                 buildingForm: {
129
                 buildingForm: {
110
                     pageNum: 1,
130
                     pageNum: 1,
111
                     pageSize: 100
131
                     pageSize: 100
112
                 },
132
                 },
113
                 total: 0,
133
                 total: 0,
114
-                list: []
134
+                list: [],
135
+                typeList: [],
136
+                typeForm: {
137
+                    buildingId: '',
138
+                    pageNum: 1,
139
+                    pageSize: 100
140
+                },
141
+                optionNewsStatus: [
142
+                    {
143
+                        name: '已发布',
144
+                        newsStatus: 0
145
+                    },
146
+                    {
147
+                        name: '未发布',
148
+                        newsStatus: 1
149
+                    }
150
+                ],
115
             }
151
             }
116
         },
152
         },
117
         created() {
153
         created() {
118
           this.getList()
154
           this.getList()
119
           this.getBuildList()
155
           this.getBuildList()
156
+          this.getTypeList()
120
         },
157
         },
121
         methods: {
158
         methods: {
122
             formateDate(dt) {
159
             formateDate(dt) {
142
                 this.form.pageNum = val
179
                 this.form.pageNum = val
143
                 this.getList()
180
                 this.getList()
144
             },
181
             },
182
+            getChangeList() { // 项目change事件
183
+                this.getList()
184
+                this.getTypeList()
185
+            },
145
             getList() {
186
             getList() {
146
               this.$store.dispatch('news/getList', this.form).then((res) => {
187
               this.$store.dispatch('news/getList', this.form).then((res) => {
147
                 this.list = res.records
188
                 this.list = res.records
172
                 }).catch(() => {
213
                 }).catch(() => {
173
                     console.log('news/updateType err')
214
                     console.log('news/updateType err')
174
                 })
215
                 })
175
-            }
216
+            },
217
+            getTypeList() {
218
+                this.typeForm.buildingId = this.form.buildingId
219
+                this.$store.dispatch('news/getTypeList', this.typeForm).then((res) => {
220
+                    this.typeList = res.records
221
+                }).catch((err) => {
222
+                    this.$notify.error(err.msg || err.message);
223
+                    console.log('news/getTypeList err')
224
+                })
225
+            },
176
         }
226
         }
177
     }
227
     }
178
 </script>
228
 </script>