楼盘类型，楼盘项目类型

src/config/api.js

@@ -1,5 +1,7 @@
-// const commPrefix = '/api/admin'
-const commPrefix = '/api-xs/admin'
+const commPrefix = '/api/admin'
+// const commPrefix = '/api-xs/admin'
+// const commPrefix = '/api-demo/admin'
+// const commPrefix = '/api-nj/admin'
 
 const apis = {
   system: {
@@ -69,6 +71,24 @@ const apis = {
     },
 
   },
+  buildingType: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/tdBuildingType`
+    },
+    add: {
+      method: 'post',
+      url: `${commPrefix}/tdBuildingType`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/tdBuildingType`
+    },
+    delete: {
+      method: 'delete',
+      url: `${commPrefix}/tdBuildingType/:id`
+    }
+  },
   dynamic: {
     list: {
       method: 'get',

src/store/modules/building.js

@@ -7,7 +7,8 @@ export default {
     buildings: {},
     detail: {},
     cityNameList:[],
-    selectRackingBuildings: []
+    selectRackingBuildings: [],
+    buildingTypeList: []
   },
   mutations: {
     updateList (state, payload) {
@@ -22,6 +23,9 @@ export default {
     updateRackingBuildings (state, payload) {
       state.selectRackingBuildings = payload
     },
+    updateBuildingTypeList (state, payload) {
+      state.buildingTypeList = payload
+    }
 
   },
   actions: {
@@ -160,5 +164,55 @@ export default {
         })
       })
     },
+    getBuildingTypeList({ commit }, payload) { // 楼盘类型列表
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.buildingType.list,
+          params: payload
+        }).then((data) => {
+          commit('updateBuildingTypeList', data)
+          resolve(data)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    addBuildingType({ commit }, payload) { // 楼盘类型添加
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.buildingType.add,
+          data: payload
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    updateBuildingType({ commit }, payload) { // 楼盘类型修改
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.buildingType.update,
+          data: payload
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    deleteBuildingType({ commit }, payload) { // 楼盘类型修改
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.buildingType.delete,
+          urlData: { id: payload.buildingTypeId }
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    }
+
   }
 }

src/views/building/edit.vue

@@ -11,6 +11,30 @@
         <el-form-item label="别名">
           <el-input v-model="building.name"></el-input>
         </el-form-item>
+        <el-form-item label="项目类型">
+          <el-button @click="showBuildingTag" icon="el-icon-circle-plus-outline" type="text"></el-button>
+          <el-row>
+            <el-col :span="12"  v-for="(item, index) in buildingProjectTypeData" :key="item.buildingTypeId">
+              <el-card shadow="never">
+                <div slot="header" class="clearfix">
+                  <span>{{ item.buildingTypeName }}</span>
+                  <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="text" @click="closeCard(index)"></el-button>
+                </div>
+                <el-form ref="form" label-width="80px">
+                  <el-form-item label="价格">
+                    <el-input v-model="item.price" placeholder="元/㎡"></el-input>
+                  </el-form-item>
+                  <el-form-item label="装修标准">
+                    <el-input v-model="item.decoration"></el-input>
+                  </el-form-item>
+                  <el-form-item label="产权年限">
+                    <el-input v-model="item.rightsYear"></el-input>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-form-item>
         <el-form-item label="均价">
           <el-input v-model="building.price"></el-input>
         </el-form-item>
@@ -306,6 +330,15 @@
         </el-form>
       </el-dialog>
     </el-tab-pane>
+
+    <el-dialog
+            title="项目类型"
+            :visible.sync="showBuildingTagDialog"
+            width="30%"
+            :before-close="handleClose">
+      <el-checkbox v-for="(item, index) in buildingProjectTypeChecked" v-model="item.checked" :key="item.buildingTypeId" @change="appendProject(index)">{{ item.buildingTypeName }}</el-checkbox>
+    </el-dialog>
+
   </el-tabs>
 </template>
 
@@ -375,13 +408,19 @@ export default {
             coordinate: e.lnglat.lat + "," + e.lnglat.lng
           });
         }
-      }
+      },
+      showBuildingTagDialog: false, // 默认不显示项目类型tag
+      // 项目类型 多选框
+      buildingProjectTypeChecked: [],
+      // 项目类型 选中之后
+      buildingProjectTypeData: [] // 项目类型
     };
   },
   computed: {
     ...mapBuildingState({
       detail: x => x.detail,
-      cityNameList: x => x.cityNameList
+      cityNameList: x => x.cityNameList,
+      buildingType: state => state.buildingTypeList
     }),
     ...mapState({
       dicts: x => x.dicts
@@ -410,7 +449,9 @@ export default {
       "getDetail",
       "getCityName",
       "addBuilding",
-      "editBuilding"
+      "editBuilding",
+      'getBuildingTypeList',
+      'deleteBuildingType'
     ]),
     ...mapApartmentActions([
       "getApartments",
@@ -534,11 +575,14 @@ export default {
           tagName: x
         };
       });
+
+
       const building = {
         ...this.building,
         img: imgs,
         propertyType: this.buildingProperty.join(","),
-        tag
+        tag,
+        buildingProjectType: this.buildingProjectTypeData
       };
       if (!building.buildingId) {
         // 新增
@@ -654,12 +698,53 @@ export default {
             };
           });
           this.tags = data.buildingTag.map(x => x.tagName);
+
+          // 项目类型
+          this.buildingProjectTypeData = data.buildingProjectType
+          this.buildingProjectTypeData.forEach((item, index) => {
+            this.buildingProjectTypeChecked.forEach((checkItem, index) => {
+              if (item.buildingId === checkItem.buildingId) {
+                checkItem.checked = true
+              }
+            })
+          })
         });
       }
-    }
+    },
+    handleClose(done) { // 关闭项目类型的多选弹框
+      done()
+    },
+    showBuildingTag() { // 显示项目类型弹窗
+      this.showBuildingTagDialog = true
+    },
+    buildingTypeList() {
+      this.getBuildingTypeList({ pageNum: 1, pageSize: 999 }).then((res) => {
+        this.buildingProjectTypeChecked = res.records.map((item, index) => {
+         return { buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName,checked: false }
+        })
+      })
+    },
+    appendProject(index) { // 添加项目类型弹框
+      const _self = this
+      const current = this.buildingProjectTypeChecked[index]
+      this.buildingProjectTypeData.push({ // 住宅
+        buildingId: _self.building.buildingId,
+        buildingTypeId: current.buildingTypeId,
+        buildingTypeName: current.buildingTypeName,
+        status: 1,
+        price: '', // 价格
+        decoration: '', // 装修标准
+        rightsYear: '' // 产权年限
+      })
+    },
+    closeCard(index) { // 关闭项目类型的多选
+      delete this.buildingProjectTypeData[index]
+      this.buildingProjectTypeData = this.buildingProjectTypeData.filter(e => e !== undefined)
+    },
   },
   mounted() {
     this.initData();
+    this.buildingTypeList()
   }
 };
 </script>

src/views/building/type/edi.vue

@@ -0,0 +1,67 @@
+<template>
+    <div id="root">
+        <el-form ref="form" :model="form" label-width="80px" class="demo-ruleForm">
+            <el-form-item label="类型名称">
+                <el-input v-model="form.buildingTypeName"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit">确定</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    import { createNamespacedHelpers } from 'vuex'
+
+    const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
+
+    export default {
+        name: "buildingTypeEdi",
+        data() {
+            return {
+                form: {
+                    buildingTypeId: '',
+                    buildingTypeName: ''
+                }
+            }
+        },
+        methods: {
+            ...mapBuildingActions([
+               'addBuildingType',
+               'updateBuildingType'
+            ]),
+            onSubmit() {
+                // 添加
+               if (this.form.buildingTypeId === '' || this.form.buildingTypeId === undefined) {
+                   this.form.status = 1
+                   this.form.ccreateDate = new Date()
+                   this.addBuildingType(this.form).then((res) => {
+                       this.$message.success('操作成功')
+                       this.$router.go(-1)
+                   }).catch((err) => {
+                       this.$message.error(err)
+                   })
+
+                   return
+               }
+
+               // 修改
+                this.updateBuildingType(this.form).then((res) => {
+                    this.$message.success('操作成功')
+                    this.$router.go(-1)
+                }).catch((err) => {
+                    this.$message.error(err)
+                })
+            }
+        }
+    }
+</script>
+
+<style scoped>
+    .demo-ruleForm {
+        width: 500px;
+        margin: auto;
+    }
+</style>

src/views/building/type/index.vue

@@ -0,0 +1,99 @@
+<template>
+   <div id="root">
+       <el-button type="primary" @click="toEdi">新增类型</el-button>
+       <el-table
+               :data="buildingType.records"
+               border
+               style="width: 100%;margin-top: 10px;">
+           <el-table-column
+                   align="center"
+                   prop="buildingTypeId"
+                   label="编号">
+           </el-table-column>
+           <el-table-column
+                   align="center"
+                   prop="buildingTypeName"
+                   label="类型名称">
+           </el-table-column>
+           <el-table-column
+                   align="center"
+                   prop="createDate"
+                   label="创建时间">
+               <template slot-scope="scope">
+                   {{ formateDate(scope.row.createDate) }}
+               </template>
+           </el-table-column>
+           <el-table-column
+                   align="center"
+                   prop="id"
+                   label="操作">
+               <template slot-scope="scope">
+                   <el-link type="primary" @click="deleteBuilding(scope.row)">删除</el-link>
+               </template>
+           </el-table-column>
+       </el-table>
+
+       <el-pagination
+               small
+               layout="prev, pager, next"
+               :current-page="form.pageNum"
+               :page-size="form.pageSize"
+               :total="buildingType.total"
+               @current-change="handleCurrrent">
+       </el-pagination>
+   </div>
+</template>
+
+<script>
+    import { createNamespacedHelpers } from 'vuex'
+    import dayjs from 'dayjs'
+
+    const { mapActions: mapBuildingActions, mapState: mapBuildingState } = createNamespacedHelpers('building')
+
+    export default {
+        name: "buildingType",
+        data() {
+            return {
+                list: [], // 列表
+                form: {
+                    pageNum: 1,
+                    pageSize: 3
+                },
+                total: 0,
+            }
+        },
+        computed: {
+            ...mapBuildingState({
+                buildingType: state => state.buildingTypeList
+            })
+        },
+        methods: {
+            ...mapBuildingActions([
+                'getBuildingTypeList',
+                'deleteBuildingType'
+            ]),
+            formateDate(dt) {
+                return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+            },
+            handleCurrrent(val) { // 当前页发生改变的时候
+                this.form.pageNum = val
+                this.getBuildingTypeList(this.form)
+            },
+            deleteBuilding(row) { // 删除
+                this.deleteBuildingType(row)
+                this.$message.success('操作成功')
+                this.getBuildingTypeList(this.form)
+            },
+            toEdi() {
+                this.$router.push({ name: 'buildingTypeEdi' })
+            }
+        },
+        mounted() {
+            this.getBuildingTypeList(this.form)
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/index.js

@@ -159,7 +159,25 @@ const pages = [
         meta: {
           menuShow: false,
         },
-      }
+      },
+      {
+        path: 'buildingTypeList',
+        name: 'buildingTypeList',
+        component: () => import('./building/type/index.vue'),
+        meta: {
+          menuShow: true,
+          title: '楼盘类型',
+        },
+      },
+      {
+        path: 'buildingTypeEdi',
+        name: 'buildingTypeEdi',
+        component: () => import('./building/type/edi.vue'),
+        meta: {
+          menuShow: false,
+          title: '楼盘类型编辑',
+        },
+      },
     ]
   },
   {