房间管理

src/router/index.js

@@ -34,6 +34,11 @@ Vue.use(Router)
 // export const constantRoutes  = () => mergeMenu(sysMenu, userMenu)
 
 export const constantRoutes = [
+    {
+        path: '/lifeLine/',
+        component: () => import('@/views/login/index'),
+        hidden: true
+    },
     {
         path: '/login',
         component: () => import('@/views/login/index'),

src/views/parkAssets/parkRoom/index.vue

@@ -72,7 +72,7 @@
             </el-col>
             <el-col :span="22">
               <el-checkbox-group
-                v-model="state"
+                v-model="saleStatus"
               >
                 <el-checkbox
                   v-for="item in dc_data.SALE_STATUS"
@@ -88,10 +88,10 @@
             </el-col>
             <el-col :span="22">
               <el-checkbox-group
-                v-model="roomUse"
+                v-model="soldStatus"
               >
                 <el-checkbox
-                  v-for="item in dc_data.HOUSE_USAGE"
+                  v-for="item in dc_data.SOLD_STATUS"
                   :key="item.value"
                   :label="item.value"
                 >{{ item.label }}</el-checkbox>
@@ -99,23 +99,23 @@
             </el-col>
           </el-row>
           <el-row class="lineheight20">
-            <el-col :span="2">
-              <div style="margin-top: 6px">面积：</div>
-            </el-col>
             <el-col :span="4">
-              <el-input v-model="queryParam.sizeStart" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />
-            </el-col>
-            <el-col :span="1" style="text-align:center">
-              <div style="margin-top: 6px">至</div>
+              <div style="margin-top: 6px">套内面积（㎡）：</div>
             </el-col>
             <el-col :span="4">
-              <el-input v-model="queryParam.sizeEnd" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />
+              <el-input v-model="queryParam.actualInternalArea" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />
             </el-col>
-            <el-col :span="6">
-              <div style="margin-top: 6px">出租指导价（元/㎡/月）：</div>
+            <!--            <el-col :span="1" style="text-align:center">-->
+            <!--              <div style="margin-top: 6px">至</div>-->
+            <!--            </el-col>-->
+            <!--            <el-col :span="4">-->
+            <!--              <el-input v-model="queryParam.sizeEnd" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />-->
+            <!--            </el-col>-->
+            <el-col :span="4">
+              <div style="margin-top: 6px">建筑面积（㎡）：</div>
             </el-col>
             <el-col :span="4">
-              <el-input v-model="queryParam.guidePrice" size="small" placeholder="请输入指导价" class="ch-input-size" @keyup.enter.native="handleSearch()" />
+              <el-input v-model="queryParam.actualBuildArea" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />
             </el-col>
           </el-row>
           <el-row class="lineheight20">
@@ -129,9 +129,7 @@
           <el-row class="lineheight20">
 
             <el-col :span="24">
-              <!--            <el-input v-model="queryParam.manageName" size="small" placeholder="请输入绑定人员名称" class="ch-input-size" @keyup.enter.native="handleSearch()" />-->
               <el-button size="small" class="ch-button-export" style="float: right; margin-top: 4px" @click="handleExcel"><i class="el-icon-menu" />&nbsp;导出EXCEL</el-button>
-              <!--            <el-button size="small" class="ch-button" style="float: right;  margin-right: 10px; margin-top: 4px" @click="bindUser()"><i class="el-icon-menu" />&nbsp;绑定管理专员</el-button>-->
               <el-button size="small" class="ch-button" style="float: right;  margin-right: 10px; margin-top: 4px" @click="handleAdd()"><i class="el-icon-menu" />&nbsp;新增房间</el-button>
               <el-button size="small" class="ch-button" style="float: right;margin-top: 4px" @click="handleSearch()"><i class="el-icon-menu" />&nbsp;查询</el-button>
               <el-button size="small" class="ch-button-warning" style="float: right;margin-top: 4px" @click="handleReset()"><i class="el-icon-menu" />&nbsp;重置</el-button>
@@ -142,29 +140,20 @@
           <el-col :span="24">
             <el-table ref="singleTable" v-loading="loading" :data="AllData" highlight-current-row @current-change="handleRowSelectChange">
               <el-table-column label="编号" type="index" width="60" />
-              <el-table-column label="楼栋号|地块号" prop="buildName" />
-              <el-table-column label="区域" prop="region" />
-              <el-table-column label="楼层" prop="floor" />
-              <el-table-column label="房号" prop="roomNo">
-                <template scope="scope">
-                  <span @click="handleView(scope.row)">{{ scope.row.roomNo }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="面积(㎡)" prop="size" />
-              <el-table-column label="朝向" prop="direction" />
-              <el-table-column label="用途" prop="roomUse" header-align="center" align="center" width="80" />
-              <el-table-column label="出租指导价" prop="guidePrice" />
-              <el-table-column label="当前状态" prop="currentState" />
-              <el-table-column label="租赁状态" prop="state" width="80" />
-              <!--              <el-table-column label="绑定人员" prop="manageName" />-->
-              <el-table-column label="最后更新时间" prop="updatedAt" />
-              <el-table-column label="可用状态" prop="isEnable" />
-              <el-table-column label="可用状态变更时间" prop="isEnableUpdatedAt" />
-              <el-table-column label="创建时间" prop="createdAt" />
+              <el-table-column label="单元/楼栋号" prop="buildName" />
+              <el-table-column label="所在层" prop="floor" />
+              <el-table-column label="户室号" prop="roomNo" />
+              <el-table-column label="套内面积（㎡）" prop="actualInternalArea" />
+              <el-table-column label="建筑面积(㎡)" prop="actualBuildArea" />
+              <el-table-column label="用途" prop="roomUse" />
+              <el-table-column label="装修情况" prop="decorationSituationStr" />
+              <el-table-column label="可售状态" prop="saleStatusStr" />
+              <el-table-column label="已售状态" prop="soleStatusStr" />
               <el-table-column label="操作" header-align="center">
                 <template scope="scope">
-                  <el-button size="mini" type="primary" class="editButton" @click="handleEdit(scope.row)">编辑</el-button>
-                  <!--                  <el-button v-if="scope.row.id != '1'" size="mini" type="info" @click="handleDel(scope.row)" class="deleButton">删除</el-button>-->
+                  <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
+                  <el-button size="mini" type="text" @click="handleDel(scope.row)">删除</el-button>
+                  <el-button size="mini" type="text" @click="handleView(scope.row)">编辑</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -189,12 +178,13 @@
       :title="dialogTitle"
       :visible.sync="dialogVisible"
       :before-close="dialogChose"
-      :model="groupfrom"
+      :model="houseForm"
       width="75%"
       top="50px"
+      append-to-body
       @open="dlgOpen"
     >
-      <el-form ref="commitForm" :model="groupfrom" style="width: 100%;padding: 5px" :rules="commitRules">
+      <el-form ref="commitForm" :model="houseForm" style="width: 100%;padding: 5px" :rules="commitRules">
         <el-row>
           <el-col style="padding-bottom: 10px">
             <!--            <span class="card_title">基本信息</span>-->
@@ -203,66 +193,86 @@
                 <el-col :span="2" class="col-txt"><span>*父级</span></el-col>
                 <el-col :span="22" class="col-input">
                   <el-form-item prop="findids">
-                    <el-cascader v-model="groupfrom.findids" :disabled="isView" style="width: 100%;" :options="options" @change="getRegionAndFloor" />
+                    <el-cascader v-model="houseForm.findids" :disabled="isView" style="width: 100%;" :options="options" @change="" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>*区域</span></el-col>
+                <el-col :span="2" class="col-txt"><span>*户室号</span></el-col>
                 <el-col :span="10" class="col-input">
-                  <el-form-item prop="region">
-                    <el-select v-model="groupfrom.region" placeholder="" filterable :disabled="isView">
-                      <el-option
-                        v-for="item in regionOption"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
+                  <el-form-item prop="roomNo">
+                    <el-input v-model="houseForm.roomNo" :disabled="isView" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="2" class="col-txt"><span>*楼层</span></el-col>
+                <el-col :span="2" class="col-txt"><span>*所在层</span></el-col>
                 <el-col :span="10" class="col-input">
                   <el-form-item prop="floor">
-                    <el-select v-model="groupfrom.floor" placeholder="" filterable :disabled="isView">
-                      <el-option
-                        v-for="item in floorOption"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
+                    <el-input v-model="houseForm.floor" :disabled="isView" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>*房号</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>*预测套内面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item prop="roomNo">
-                    <el-input v-model="groupfrom.roomNo" :disabled="isView" />
+                    <el-input v-model="houseForm.predictionInternalArea" :disabled="isView" />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="2" class="col-txt"><span>平面图房号</span></el-col>
-                <el-col :span="10" class="col-input">
-                  <el-form-item>
-                    <el-input v-model="groupfrom.imgNo" :disabled="isView" />
+                <el-col :span="3" class="col-txt"><span>*预测分摊面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="roomNo">
+                    <el-input v-model="houseForm.predictionShareArea" :disabled="isView" />
                   </el-form-item>
                 </el-col>
               </el-row>
-
               <el-row>
-                <el-col :span="2" class="col-txt"><span>*面积(㎡)</span></el-col>
-                <el-col :span="10" class="col-input">
-                  <el-form-item prop="size">
-                    <el-input v-model="groupfrom.size" :disabled="isView" />
+                <el-col :span="3" class="col-txt"><span>*预测建筑面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="roomNo">
+                    <el-input v-model="houseForm.predictionBuildArea" :disabled="isView" />
                   </el-form-item>
                 </el-col>
-
-                <el-col :span="2" class="col-txt"><span>用途</span></el-col>
+                <el-col :span="3" class="col-txt"><span>*预测土地面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="roomNo">
+                    <el-input v-model="houseForm.predictionLandArea" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="3" class="col-txt"><span>*实测套内面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="actualInternalArea">
+                    <el-input v-model="houseForm.actualInternalArea" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="3" class="col-txt"><span>*实测分摊面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="actualShareArea">
+                    <el-input v-model="houseForm.actualShareArea" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="3" class="col-txt"><span>*实测建筑面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="actualBuildlArea">
+                    <el-input v-model="houseForm.actualBuildlArea" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="3" class="col-txt"><span>*实测土地面积(㎡)</span></el-col>
+                <el-col :span="9" class="col-input">
+                  <el-form-item prop="actualLandArea">
+                    <el-input v-model="houseForm.actualLandArea" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="2" class="col-txt"><span>用途:</span></el-col>
                 <el-col :span="10" class="col-input">
-                  <el-form-item>
-                    <el-select v-model="groupfrom.roomUse" placeholder="请选择" :disabled="isView">
+                  <el-form-item prop="roomUse">
+                    <el-select v-model="houseForm.roomUse" placeholder="" filterable :disabled="isView">
                       <el-option
                         v-for="item in dc_data.HOUSE_USAGE"
                         :key="item.value"
@@ -272,15 +282,20 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="2" class="col-txt"><span>*户编号</span></el-col>
+                <el-col :span="10" class="col-input">
+                  <el-form-item prop="roomNumber">
+                    <el-input v-model="houseForm.roomNumber" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
               </el-row>
-
               <el-row>
-                <el-col :span="2" class="col-txt"><span>物业性质:</span></el-col>
+                <el-col :span="2" class="col-txt"><span>装修情况:</span></el-col>
                 <el-col :span="10" class="col-input">
                   <el-form-item>
-                    <el-select v-model="groupfrom.propertyNature" placeholder="" filterable :disabled="isView">
+                    <el-select v-model="houseForm.decorationSituation" placeholder="" filterable :disabled="isView">
                       <el-option
-                        v-for="item in dc_data.PROPERTY_NATURE"
+                        v-for="item in dc_data.DECORATION_SITUATION"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -288,12 +303,20 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="2" class="col-txt"><span>*朝向</span></el-col>
+                <el-col :span="2" class="col-txt"><span>2.2M以</span></el-col>
+                <el-col :span="10" class="col-input">
+                  <el-form-item prop="roomNumber">
+                    <el-input v-model="houseForm.twoPointTwo" :disabled="isView" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="2" class="col-txt"><span>户型</span></el-col>
                 <el-col :span="10" class="col-input">
-                  <el-form-item prop="direction">
-                    <el-select v-model="groupfrom.direction" placeholder="" filterable :disabled="isView">
+                  <el-form-item :disabled="isView">
+                    <el-select v-model="houseForm.decorationSituation" placeholder="" filterable :disabled="isView">
                       <el-option
-                        v-for="item in dc_data.MNP_BUILDING_CX"
+                        v-for="item in dc_data.DECORATION_SITUATION"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -303,52 +326,7 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="5" class="col-txt"><span>*出租指导价（元/㎡/月）</span></el-col>
-                <el-col :span="7" class="col-input">
-                  <el-form-item :disabled="isView" prop="guidePrice">
-                    <el-input v-model="groupfrom.guidePrice" :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6" class="col-txt"><span>出租指导价（元/㎡/月）区间</span></el-col>
-                <el-col :span="2" class="col-input">
-                  <el-form-item>
-                    <el-input v-model="groupfrom.guidePriceIntervalStart" :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="2" class="col-input">
-                  <div style="text-align: center;">
-                    <span>至</span>
-                  </div></el-col>
-                <el-col :span="2" class="col-input">
-                  <el-form-item>
-                    <el-input v-model="groupfrom.guidePriceIntervalEnd" :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="3" class="col-txt"><span>*承重（kg/㎡）</span></el-col>
-                <el-col :span="9" class="col-input">
-                  <el-form-item :disabled="isView" prop="bearing">
-                    <el-input v-model="groupfrom.bearing" :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="3" class="col-txt"><span>*层高（m）</span></el-col>
-                <el-col :span="9" class="col-input">
-                  <el-form-item :disabled="isView" prop="floorHeight">
-                    <el-input v-model="groupfrom.floorHeight" :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="2" class="col-txt"><span>*用电</span></el-col>
-                <el-col :span="10" class="col-input">
-                  <el-form-item :disabled="isView" prop="electricity">
-                    <el-input v-model="groupfrom.electricity" :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="2" class="col-txt"><span>房型图:</span></el-col>
+                <el-col :span="2" class="col-txt"><span>户型图:</span></el-col>
                 <el-col :span="20" class="col-input">
                   <el-form-item>
                     <el-upload
@@ -358,7 +336,7 @@
                       list-type="picture-card"
                       :file-list="fileList"
                       :limit="9"
-                      :http-request="uploadFile"
+                      :http-request="uploadHouseTypePicture"
                       :on-preview="handlePictureCardPreview"
                       :on-remove="handleRemove"
                       :on-exceed="handleExceed"
@@ -372,77 +350,21 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="2" class="col-txt"><span>室内外环境:</span></el-col>
-                <el-col :span="20" class="col-input">
-                  <el-form-item>
-                    <el-upload
-                      ref="upload1"
-                      action
-                      accept="image/png,image/gif,image/jpg,image/jpeg"
-                      list-type="picture-card"
-                      :file-list="fileList1"
-                      :limit="6"
-                      :on-preview="handlePictureCardPreview"
-                      :http-request="uploadFile1"
-                      :on-remove="handleRemove1"
-                      :on-exceed="handleExceed"
-                      :disabled="isView"
-                    >
-                      <i class="el-icon-plus" />
-                      <div slot="tip" class="el-upload__tip">
-                        只能上传jpg/png文件，限制上传6张
-                      </div>
-                    </el-upload>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="2" class="col-txt"><span>*装修情况:</span></el-col>
-                <el-col :span="22" class="col-input">
-                  <el-form-item prop="decorationSituation">
-                    <!--                    <el-input v-model="groupfrom.decorationSituation" type="textarea" maxlength="2000" show-word-limit :disabled="isView" />-->
-                    <el-select v-model="groupfrom.decorationSituation" placeholder="请选择" size="small" :disabled="isView">
-                      <el-option
-                        v-for="item in dc_data.DECORATION_SITUATION"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
               <el-row>
                 <el-col :span="2" class="col-txt"><span>备注:</span></el-col>
                 <el-col :span="22" class="col-input">
                   <el-form-item>
-                    <el-input v-model="groupfrom.remark" type="textarea" maxlength="2000" show-word-limit :disabled="isView" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="3" class="col-txt"><span>当前可用状态:</span></el-col>
-                <el-col :span="21" class="col-input">
-                  <el-form-item>
-                    <el-select v-model="groupfrom.isEnable" placeholder="请选择" size="small" :disabled="isView">
-                      <el-option
-                        v-for="item in dc_data.HOUSE_ENABLE"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
+                    <el-input v-model="houseForm.remark" type="textarea" maxlength="2000" show-word-limit :disabled="isView" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="2" class="col-txt"><span>租赁状态:</span></el-col>
+                <el-col :span="2" class="col-txt"><span>可售状态:</span></el-col>
                 <el-col :span="22" class="col-input">
                   <el-form-item>
-                    <el-select v-model="groupfrom.state" placeholder="请选择" size="small" :disabled="isView">
+                    <el-select v-model="houseForm.saleStatus" placeholder="请选择" size="small" :disabled="isView">
                       <el-option
-                        v-for="item in dc_data.HOUSE_STATUS"
+                        v-for="item in dc_data.SALE_STATUS"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -478,13 +400,14 @@ import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
 import BaseDept from '@/views/base/baseDept'
 import Constant from '@/static/utils/constant'
+import { upload } from '@/static/utils/channel'
 
 export default {
     name: 'User',
     mixins: [Base, BaseData, BaseDept],
     data() {
         return {
-            dc_key: ['HOUSE_USAGE', 'DECORATION_SITUATION', 'SALE_STATUS'],
+            dc_key: ['HOUSE_USAGE', 'DECORATION_SITUATION', 'SALE_STATUS', 'SOLD_STATUS'],
             // 查询参数
             queryParam: {
                 groupName: '',
@@ -495,7 +418,7 @@ export default {
             },
             options: [],
             formLP: {},
-            groupfrom: {
+            houseForm: {
                 isEnable: [],
                 state: [],
                 roomUse: [],
@@ -521,33 +444,30 @@ export default {
             LeaderData: [],
             commitRules: {
                 findids: [{ required: true, trigger: 'blur', message: '请选择父级' }],
-                region: [{ required: true, trigger: 'blur', message: '请选择区域' }],
-                floor: [{ required: true, trigger: 'blur', message: '请选择楼层' }],
-                roomNo: [{ required: true, trigger: 'blur', message: '请选择房号' }],
-                size: [{ required: true, trigger: 'blur', message: '请输入面积' }],
-                direction: [{ required: true, trigger: 'blur', message: '请选择朝向' }],
-                guidePrice: [{ required: true, trigger: 'blur', message: '请输入指导价' }],
-                decorationSituation: [{ required: true, trigger: 'blur', message: '请选择装修情况' }],
-                bearing: [{ required: true, trigger: 'blur', message: '请输入承重' }],
-                floorHeight: [{ required: true, trigger: 'blur', message: '请输入层高' }],
-                electricity: [{ required: true, trigger: 'blur', message: '请输入用电' }]
+                roomNo: [{ required: true, trigger: 'blur', message: '请输入户室号' }],
+                floor: [{ required: true, trigger: 'blur', message: '请输入所在层' }],
+                predictionInternalArea: [{ required: true, trigger: 'blur', message: '请输入预测套内面积' }],
+                predictionShareArea: [{ required: true, trigger: 'blur', message: '请输入预测分摊面积' }],
+                predictionBuildArea: [{ required: true, trigger: 'blur', message: '请输入预测建筑面积' }],
+                predictionLandArea: [{ required: true, trigger: 'blur', message: '请输入预测土地面积' }],
+                actualInternalArea: [{ required: true, trigger: 'blur', message: '请输入实测分摊面积' }],
+                actualShareArea: [{ required: true, trigger: 'blur', message: '请输入实测分摊面积' }],
+                actualBuildArea: [{ required: true, trigger: 'blur', message: '请输入实测建筑面积' }],
+                actualLandArea: [{ required: true, trigger: 'blur', message: '请输入实测土地面积' }],
+                roomUse: [{ required: true, trigger: 'blur', message: '请输入用途' }],
+                roomNumber: [{ required: true, trigger: 'blur', message: '请输入户编号' }],
             },
 
             roomId: '',
-            usage: [],
-            arr: [],
             roomUse: [],
-            state: [],
+            saleStatus: [],
+            soldStatus: [],
             decorationSituation: [],
-            propertyNature: [],
-            regionOption: [],
-            floorOption: [],
-            decorationSituationLength: '',
-            remarkLength: '',
+            isView: false,
+            fileList: [],
             // 图片预览及其他
             dialogImageUrl: '',
             dialogImageVisible: false,
-            isView: false,
         }
     },
     mounted() {
@@ -560,19 +480,6 @@ export default {
         this.getHandleUserList()
     },
     methods: {
-        // 点击多选标签
-        checkedBox(i) {
-            if (this.arr.includes(i)) {
-                // includes()方法判断是否包含某一元素,返回true或false表示是否包含元素，对NaN一样有效
-                // filter()方法用于把Array的某些元素过滤掉，filter()把传入的函数依次作用于每个元素，然后根据返回值是true还是false决定保留还是丢弃该元素：生成新的数组
-                this.arr = this.arr.filter(function(ele) {
-                    return ele != i
-                })
-            } else {
-                this.arr.push(i)
-            }
-            this.queryParam.floorDiscName = this.arr.join(',')
-        },
         handleSearch: function() {
             this.getData()
         },
@@ -590,7 +497,6 @@ export default {
             _this.queryParam.states = _this.houseStatus.join(',')
             _this.queryParam.isEnable = _this.isEnable.join(',')
             _this.queryParam.roomUse = _this.roomUse.join(',')
-            _this.queryParam.propertyNature = _this.propertyNature.join(',')
             _this.queryParam.currentState = _this.currentState.join(',')
             const title = ['楼栋号|地号', '区域', '楼层', '房号', '面积', '朝向', '用途',
                 '出租指导价', '当前状态', '租赁状态', '最后更新时间', '可用状态', '可用状态变更时间', '创建时间', '承重', '层高', '用电', '装修情况']
@@ -635,7 +541,6 @@ export default {
             this.queryParam = {}
             this.direction = []
             this.houseStatus = []
-            this.propertyNature = []
             this.roomUse = []
             this.currentState = []
             this.isEnable = []
@@ -677,7 +582,6 @@ export default {
             _this.queryParam.states = _this.houseStatus.join(',')
             _this.queryParam.isEnable = _this.isEnable.join(',')
             _this.queryParam.roomUse = _this.roomUse.join(',')
-            _this.queryParam.propertyNature = _this.propertyNature.join(',')
             _this.queryParam.currentState = _this.currentState.join(',')
             _this.baseRequest('listByModel', _this.queryParam).then((res) => {
                 if (res.data.rows) {
@@ -694,27 +598,22 @@ export default {
 
         handleAdd: function() {
             // 新增时当前可用状态默认为可用 当前状态默认为空置
-            this.groupfrom.isEnable = '1'
-            this.groupfrom.state = '1'
+            this.houseForm.isEnable = '1'
+            this.houseForm.state = '1'
             this.urlStr = 'add'
             this.dialogVisible = true
             this.dialogTitle = '新增房间'
         },
-
-        bindUser: function() {
-
-        },
-
         handleEdit: function(val) {
             this.isView = false
             this.urlStr = 'edit'
-            this.groupfrom = val
+            this.houseForm = val
             this.dialogVisible = true
             this.dialogTitle = '编辑房间'
         },
         handleView: function(val) {
             this.isView = true
-            this.groupfrom = val
+            this.houseForm = val
             this.dialogVisible = true
             this.dialogTitle = '查看房间'
         },
@@ -728,21 +627,21 @@ export default {
             this.getData()
         },
         dialogChose() {
-            this.groupfrom = {}
+            this.houseForm = {}
             this.dialogVisible = false
         },
 
         confirmSubmit: function() {
             this.$refs.commitForm.validate(valid => {
                 if (valid) {
-                    const ids = this.groupfrom.findids
+                    const ids = this.houseForm.findids
                     if (ids != null && ids != [] && ids != '') {
-                        this.groupfrom.groupId = ids[0]
-                        this.groupfrom.discId = ids[1]
-                        this.groupfrom.buildId = ids[2]
+                        this.houseForm.groupId = ids[0]
+                        this.houseForm.discId = ids[1]
+                        this.houseForm.buildId = ids[2]
                     }
                     const extraData = {}
-                    const postData = Object.assign({}, this.groupfrom, extraData)
+                    const postData = Object.assign({}, this.houseForm, extraData)
 
                     let planPicture = ''
                     this.fileList.forEach(v => {
@@ -757,7 +656,7 @@ export default {
                     postData.environmentPicture = environmentPicture
                     this.baseRequest(this.urlStr, postData).then((res) => {
                         // if(res.data.code == 200){
-                        this.groupfrom = {}
+                        this.houseForm = {}
                         this.dialogVisible = false
                         this.getData()
                         this.getTreeData()
@@ -773,79 +672,9 @@ export default {
             })
         },
 
-        confirmLPSubmit: function() {
-            this.baseLPRequest('add', this.formLP).then((res) => {
-                if (res.data.code == 200) {
-                    this.dialogVisibleLP = false
-                    this.getData()
-                    this.getTreeData()
-                    alert('提交成功')
-                }
-            }).catch(() => {
-            })
-        },
-
         handleChange(data) {
             console.log(data)
         },
-
-        handleUserOpen(row) {
-            this.roomId = row.id
-            this.getRoomHandleUser(row.id)
-        },
-
-        handleClose() {
-            this.handleDialogVisible = false
-        },
-
-        // 获取已绑定的管理员
-        getRoomHandleUser(id) {
-            const reqData = {
-                roomId: id
-            }
-            this.baseRequest('getRoomHandleUser', reqData).then((res) => {
-                // console.log("已绑定的管理员列表——：", res.data);
-                this.roomUser = []
-                res.data.data.forEach(element => {
-                    this.roomUser.push(element.userId)
-                })
-                console.log(this.roomUser)
-                this.handleDialogVisible = true
-            }).catch(() => {
-                alert('异常')
-            })
-        },
-
-        // 绑定管理员
-        addRoomHandleUser() {
-            alert(this.roomUser.toString())
-            const reqData = {
-                roomId: this.roomId,
-                users: this.roomUser.toString()
-            }
-            this.baseRequest('addRoomHandleUser', reqData).then((res) => {
-                console.log('已绑定的管理员列表——：', res)
-                // this.handleDialogVisible = true;
-                this.handleDialogVisible = false
-            }).catch(() => {
-            })
-        },
-
-        // 获取全部管理员
-        getHandleUserList() {
-            this.baseUserRequest('listAll', {}).then((res) => {
-                this.handleUserList = []
-                res.data.forEach(element => {
-                    const item = {
-                        label: element.truename,
-                        key: element.id
-                    }
-                    this.handleUserList.push(item)
-                })
-            }).catch(() => {
-            })
-        },
-
         getItemJson: function(item) {
             // 朝向
             item.direction = this.dc_map.MNP_BUILDING_CX[item.direction]
@@ -899,28 +728,28 @@ export default {
 
         dlgOpen: function() {
             // 填充父级
-            this.groupfrom.findids = []
-            if (undefined != this.groupfrom.groupId && this.groupfrom.groupId != null &&
-                this.groupfrom.groupId != '') {
-                this.groupfrom.findids[0] = this.groupfrom.groupId
-                if (undefined != this.groupfrom.discId && this.groupfrom.discId != null &&
-                    this.groupfrom.discId != '') {
-                    this.groupfrom.findids[1] = this.groupfrom.discId
-                    if (undefined != this.groupfrom.buildId && this.groupfrom.buildId != null &&
-                        this.groupfrom.buildId != '') {
-                        this.groupfrom.findids[2] = this.groupfrom.buildId
+            this.houseForm.findids = []
+            if (undefined != this.houseForm.groupId && this.houseForm.groupId != null &&
+                this.houseForm.groupId != '') {
+                this.houseForm.findids[0] = this.houseForm.groupId
+                if (undefined != this.houseForm.discId && this.houseForm.discId != null &&
+                    this.houseForm.discId != '') {
+                    this.houseForm.findids[1] = this.houseForm.discId
+                    if (undefined != this.houseForm.buildId && this.houseForm.buildId != null &&
+                        this.houseForm.buildId != '') {
+                        this.houseForm.findids[2] = this.houseForm.buildId
                     }
                 }
             }
             const _this = this
-            if (_this.groupfrom.id) {
+            if (_this.houseForm.id) {
                 const postData = {
-                    id: _this.groupfrom.id
+                    id: _this.houseForm.id
                 }
                 this.baseRequest('getById', postData)
                     .then(res => {
                         if (res.data) {
-                            _this.groupfrom = Object.assign({}, _this.groupfrom, res.data)
+                            _this.houseForm = Object.assign({}, _this.houseForm, res.data)
                             if (res.data.planPicture) {
                                 res.data.planPicture.split(',').forEach(v => {
                                     if (v) {
@@ -947,25 +776,6 @@ export default {
                     })
                     .catch(() => {})
             }
-            this.getRegionAndFloor()
-        },
-        // 根据载体所选区域和楼层 填充房间选项
-        getRegionAndFloor: function() {
-            this.regionOption = []
-            this.floorOption = []
-            if (this.groupfrom.findids) {
-                this.baseMnpBuildRequest('getById', { id: this.groupfrom.findids[2] })
-                    .then(res => {
-                        const region = res.data.lcqymc.split(',')
-                        const floor = res.data.lcmc.split(',')
-                        region.forEach(item => {
-                            this.regionOption.push({ value: item, label: item })
-                        })
-                        floor.forEach(item => {
-                            this.floorOption.push({ value: item, label: item })
-                        })
-                    })
-            }
         },
         // 上传相关，包括图片、文件
         handlePictureCardPreview: function(file) {
@@ -975,18 +785,11 @@ export default {
             this.dialogImageUrl = url
             this.dialogImageVisible = true
         },
-        // stateTypeFormatter(row, column) {
-        //     return this.dc_map.HOUSE_STATUS[row.state]
-        // },
-        // useTypeFormatter(row, column) {
-        //     return this.dc_map.HOUSE_USAGE[row.roomUse]
-        // },
-        // enableTypeFormatter(row, column) {
-        //     return this.dc_map.HOUSE_ENABLE[row.isEnable]
-        // },
-        // 字典项
-        generateDcMap: function() {
-            this.dc_map['dc_gender'] = this.$common.transDcMap(this.dc_gender)
+        uploadHouseTypePicture: function(param) {
+            console.log('param', param)
+            upload(param, true).then((res) => {
+                this.fileList.push(res)
+            })
         },
         // 请求封装，继承类中调用，必须存在
         baseRequest: function(opUrl, postData) {
@@ -998,15 +801,9 @@ export default {
         postRequest: function(opUrl, postData) {
             return this.$channel.baseRequest('PostController', opUrl, postData, 'Post')
         },
-        baseUserRequest: function(opUrl, postData) {
-            return this.$channel.baseRequest('UserController', opUrl, postData, 'Post')
-        },
         baseFloorDiscRequest: function(opUrl, postData) {
             return this.$channel.baseRequest('ParkFloorDiscController', opUrl, postData, 'User')
         },
-        // baseParkBuildRequest: function(opUrl, postData) {
-        //     return this.$channel.baseRequest('ParkBuildController', opUrl, postData, 'Post')
-        // },
         baseMnpBuildRequest: function(opUrl, postData) {
             return this.$channel.baseRequest('MnpBuildingController', opUrl, postData, 'Post')
         }