LAPTOP-FO2T5SIU\35838 il y a 9 mois
Parent
commit
69aaeb678f
2 fichiers modifiés avec 151 ajouts et 514 suppressions
  1. 122 414
      src/views/parkAssets/parkBuild/index.vue
  2. 29 100
      src/views/parkAssets/parkRoom/index.vue

+ 122 - 414
src/views/parkAssets/parkBuild/index.vue

@@ -34,10 +34,10 @@
       </div>
       <div class="block-r">
         <el-row class="handle-box" style="margin-bottom: 10px">
-          <el-col :span="1">
-            楼栋号
+          <el-col :span="3">
+            单元/楼栋号
           </el-col>
-          <el-col :span="23">
+          <el-col :span="20">
             <el-input v-model="queryParam.ldmc" 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-add" style="float: right; margin-right: 10px; margin-top: 4px" @click="handleAdd()"><i class="el-icon-menu" />&nbsp;新增楼栋</el-button>
@@ -50,19 +50,15 @@
             <!-- @current-change="handleRowSelectChange" -->
             <el-table ref="singleTable" v-loading="loading" :data="AllData" highlight-current-row>
               <el-table-column label="编号" type="index" width="60" />
-              <el-table-column label="园区" prop="parkName" />
-              <el-table-column label="楼盘" prop="lpmc" />
-              <el-table-column label="楼栋号" prop="ldmc">
-                <template scope="scope">
-                  <span @click="handleView(scope.row)">{{ scope.row.ldmc }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="类型" prop="type" :formatter="typeFormatter" />
-              <el-table-column label="面积" prop="mj" header-align="center" align="center" width="80" />
+              <el-table-column label="楼盘/小区名称" prop="groupName" />
+              <el-table-column label="分期名称" prop="discName" />
+              <el-table-column label="单元/楼栋号" prop="buildNum" />
+              <el-table-column label="总面积(㎡)" prop="area" />
+              <el-table-column label="套数" prop="numberInfo" />
               <el-table-column label="操作" header-align="center" width="160">
                 <template scope="scope">
-                  <el-button size="mini" type="primary" @click="handleEdit(scope.row)" class="editButton">编辑</el-button>
-                  <el-button v-if="scope.row.id != '1'" size="mini" type="info" @click="buildDel(scope.row)" class="deleButton">删除</el-button>
+                  <el-button size="mini" type="primary" class="editButton" @click="handleEdit(scope.row)">编辑</el-button>
+                  <el-button size="mini" type="info" class="deleButton" @click="buildDel(scope.row)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -82,7 +78,7 @@
       </div>
     </div>
 
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="950px" top="50px" @open="dlgOpen" @close="dlgClose">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="950px" top="50px" append-to-body @open="dlgOpen" @close="dlgClose">
       <el-form ref="buildForm" :model="buildForm" style="width: 100%;padding: 5px" :rules="commitRules">
         <el-row>
           <el-col style="padding-bottom: 10px">
@@ -105,54 +101,96 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>*楼栋号|地块号</span></el-col>
+                <el-col :span="4" class="col-txt"><span>*单元/楼栋号</span></el-col>
                 <el-col :span="8" class="col-input">
-                  <el-form-item prop="ldmc">
-                    <el-input v-model="buildForm.ldmc" />
+                  <el-form-item prop="buildNum">
+                    <el-input v-model="buildForm.buildNum" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" class="col-txt"><span>*关联区域</span></el-col>
+                <el-col :span="4" class="col-txt"><span>*施工号</span></el-col>
                 <el-col :span="8" class="col-input">
-                  <el-form-item prop="lcqymc">
-                    <el-select v-model="buildForm.lcqymc" placeholder="" filterable multiple>
-                      <el-option
-                        v-for="item in dc_data.MNP_BUILDING_LCQY"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
+                  <el-form-item prop="constructionNum">
+                    <el-input v-model="buildForm.constructionNum" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>*关联楼层</span></el-col>
-                <el-col :span="20" class="col-input">
-                  <el-form-item prop="lcmc">
-                    <el-select v-model="buildForm.lcmc" placeholder="" filterable multiple>
-                      <el-option
-                        v-for="item in dc_data.MNP_BUILDING_LC"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
+                <el-col :span="4" class="col-txt"><span>*总面积(㎡)</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="area">
+                    <el-input v-model="buildForm.area" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>*住宅面积(㎡)</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="residentialArea">
+                    <el-input v-model="buildForm.residentialArea" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>*面积(㎡)</span></el-col>
+                <el-col :span="4" class="col-txt"><span>*非住宅面积(㎡)</span></el-col>
                 <el-col :span="8" class="col-input">
-                  <el-form-item prop="mj">
-                    <el-input v-model="buildForm.mj" />
+                  <el-form-item prop="unResidentialArea">
+                    <el-input v-model="buildForm.unResidentialArea" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" class="col-txt"><span>类型</span></el-col>
+                <el-col :span="4" class="col-txt"><span>*占地面积</span></el-col>
                 <el-col :span="8" class="col-input">
-                  <el-form-item>
-                    <el-select v-model="buildForm.type" placeholder="" filterable>
+                  <el-form-item prop="coverAnArea">
+                    <el-input v-model="buildForm.coverAnArea" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>*地下面积</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="undergroundArea">
+                    <el-input v-model="buildForm.undergroundArea" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>*房号</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="roomNum">
+                    <el-input v-model="buildForm.roomNum" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>*套数</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="numberInfo">
+                    <el-input v-model="buildForm.numberInfo" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>*总层数</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="floors">
+                    <el-input v-model="buildForm.floors" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>*地上层数</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="overgroundFloors">
+                    <el-input v-model="buildForm.overgroundFloors" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>*地下层数</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="undergroundFloors">
+                    <el-input v-model="buildForm.undergroundFloors" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>*结构</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="structure">
+                    <el-select v-model="buildForm.structure" placeholder="" filterable :disabled="isView">
                       <el-option
-                        v-for="item in dc_data.parkType"
+                        v-for="item in dc_data.BUILD_STRUCTURE"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -160,45 +198,37 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="4" class="col-txt"><span>经纬度</span></el-col>
-                <el-col :span="20" class="col-input">
-                  <el-form-item>
-                    <el-input v-model="buildForm.latAndLon" />
+                <el-col :span="4" class="col-txt"><span>*行政区划</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="regionalismCode">
+                    <el-input v-model="buildForm.regionalismCode" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>产证名称</span></el-col>
+                <el-col :span="4" class="col-txt"><span>*地号</span></el-col>
                 <el-col :span="8" class="col-input">
-                  <el-form-item prop="mj">
-                    <el-input v-model="buildForm.certificateName" />
+                  <el-form-item prop="landCode">
+                    <el-input v-model="buildForm.landCode" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" class="col-txt"><span>产证编号</span></el-col>
-                <el-col :span="8" class="col-input">
-                  <el-form-item prop="mj">
-                    <el-input v-model="buildForm.certificateNumber" />
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>备注</span></el-col>
+                <el-col :span="20" class="col-input">
+                  <el-form-item>
+                    <el-input v-model="buildForm.remark" type="textarea" :autosize="{ minRows: 2, maxRows: 100}" placeholder="请输入内容" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>产证地址</span></el-col>
-                <el-col :span="20" class="col-input">
+                <el-col :span="7" class="col-txt"><span>标准价格参考层及差价系数备注说明</span></el-col>
+                <el-col :span="17" class="col-input">
                   <el-form-item>
-                    <el-input v-model="buildForm.certificateAddress" />
+                    <el-input v-model="buildForm.priceRemark" type="textarea" :autosize="{ minRows: 2, maxRows: 100}" placeholder="请输入内容" />
                   </el-form-item>
                 </el-col>
               </el-row>
-              <!--              <el-row>-->
-              <!--                <el-col :span="4" class="col-txt"><span>楼栋介绍</span></el-col>-->
-              <!--                <el-col :span="20" class="col-txt">-->
-              <!--                  <el-form-item>-->
-              <!--                    <text-edit ref="textEdit" :text-content="buildForm.introduction" @input="test" />-->
-              <!--                  </el-form-item>-->
-              <!--                </el-col>-->
-              <!--              </el-row>-->
             </el-card>
           </el-col>
         </el-row>
@@ -236,7 +266,7 @@ export default {
     mixins: [Base, BaseData, BaseDept],
     data() {
         return {
-            dc_key: ['parkType', 'MNP_BUILDING_LCQY', 'MNP_BUILDING_LC'],
+            dc_key: ['BUILD_STRUCTURE'],
             // 查询参数
             queryParam: {
                 ldmc: ''
@@ -251,39 +281,31 @@ export default {
             dc_gender: [],
             dc_map: {},
 
-            // 列表相关
-            username: '',
-            truename: '',
-            dataRoleId: '',
-            postId: '',
             AllData: [],
             loading: false,
-            currentRow: null,
-            isAdminSelect: false,
-            isGroupUser: false,
 
-            // 用户维护相关
             dialogVisible: false,
             dialogTitle: '新增用户',
             isAdd: true,
-            selectDepartment: [],
-            form: this.getBaseForm(),
             LeaderData: [],
             commitRules: {
-                ldmc: [{ required: true, trigger: 'blur', message: '请输入楼栋号' }],
-                mj: [{ required: true, trigger: 'blur', message: '请输入面积' }]
-                // lcqymc: [{ required: true, trigger: 'blur', message: '请选择关联区域' }],
-                // lcmc: [{ required: true, trigger: 'blur', message: '请选择关联楼层' }]
+                buildNum: [{ required: true, trigger: 'blur', message: '请输入单元/楼栋号' }],
+                constructionNum: [{ required: true, trigger: 'blur', message: '请输入施工号' }],
+                area: [{ required: true, trigger: 'blur', message: '请输入总面积' }],
+                residentialArea: [{ required: true, trigger: 'blur', message: '请输入住宅面积' }],
+                unResidentialArea: [{ required: true, trigger: 'blur', message: '请输入非面积' }],
+                coverAnArea: [{ required: true, trigger: 'blur', message: '请输入占地面积' }],
+                undergroundArea: [{ required: true, trigger: 'blur', message: '请输入地下面积' }],
+                roomNum: [{ required: true, trigger: 'blur', message: '请输入房号' }],
+                numberInfo: [{ required: true, trigger: 'blur', message: '请输入套数' }],
+                floors: [{ required: true, trigger: 'blur', message: '请输入总层数' }],
+                overgroundFloors: [{ required: true, trigger: 'blur', message: '请输入地上层数' }],
+                undergroundFloors: [{ required: true, trigger: 'blur', message: '请输入地下层数' }],
+                structure: [{ required: true, trigger: 'blur', message: '请输入结构' }],
+                regionalismCode: [{ required: true, trigger: 'blur', message: '请输入行政区划' }],
+                landCode: [{ required: true, trigger: 'blur', message: '请输入地号' }]
             },
 
-            // 角色维护相关
-            dialogRoleVisible: false,
-            dialogRoleTitle: '角色选择',
-            selectUserId: '',
-            selectUserName: '',
-            SelectMenuRole: [],
-            SelectDataRoleId: '',
-            MenuRole: [],
             nodeId: '',
             level: '',
             dialogViewVisible: false
@@ -332,12 +354,6 @@ export default {
             this.queryParam.pageNum = this.currentPage
             this.queryParam.pageSize = this.pageSize
             this.baseRequest('list', this.queryParam).then((res) => {
-                // if (res.data.rows) {
-                //     res.data.rows.forEach(function(item) {
-                //         _this.AllData.push(_this.getItemJson(item))
-                //     })
-                //     _this.allpage = res.data.total
-                // }
                 _this.AllData = res.data.rows
                 _this.allpage = res.data.total
                 _this.loading = false
@@ -396,11 +412,6 @@ export default {
                     this.buildForm.findids[1] = this.buildForm.discId
                 }
             }
-            this.buildForm.lcqymc = val.lcqymc.split(',')
-            this.buildForm.lcmc = val.lcmc.split(',')
-            if (this.buildForm.latAndLon) {
-                this.buildForm.latAndLon = val.lat + ',' + val.lon
-            }
             this.dialogVisible = true
             this.dialogTitle = '编辑楼栋'
         },
@@ -435,21 +446,6 @@ export default {
         },
 
         confirmSubmit: function() {
-            console.log()
-            if (undefined == this.buildForm.lcmc || this.buildForm.lcmc.length < 1) {
-                this.$message({
-                    message: '请选择关联楼层',
-                    type: 'warning'
-                })
-                return
-            }
-            if (undefined == this.buildForm.lcqymc || this.buildForm.lcqymc.length < 1) {
-                this.$message({
-                    message: '请选择关联区域',
-                    type: 'warning'
-                })
-                return
-            }
             this.$refs.buildForm.validate(valid => {
                 if (valid) {
                     const _this = this
@@ -470,49 +466,10 @@ export default {
                     if (undefined != this.buildForm.id && this.buildForm.id != null && this.buildForm.id != '') {
                         urlAdd = 'edit'
                     }
-                    // 经纬度
-                    const latAndLon = this.buildForm.latAndLon
-                    if (latAndLon != null && latAndLon != [] && latAndLon != '') {
-                        const latAndLon = this.buildForm.latAndLon.split(',')
-                        postData.lon = latAndLon[0]
-                        postData.lat = latAndLon[1]
-                    }
-                    // 关联区域
-                    const lcqymc = this.buildForm.lcqymc.join(',')
-                    postData.lcqymc = lcqymc
-                    // 关联楼层
-                    const lcmc = this.buildForm.lcmc.join(',')
-                    postData.lcmc = lcmc
-
-                    // if (ids != null && ids != [] && ids != '') {
-                    //     this.buildForm.groupId = ids[0]
-                    //     this.buildForm.discId = ids[1]
-                    // }
-                    // if (arr != null && arr != [] && arr != '') {
-                    //     this.buildForm.groupName = arr[0]
-                    //     this.buildForm.lpmc = arr[1]
-                    // }
-                    // let urlAdd = 'add'
-                    // if (undefined != this.buildForm.id && this.buildForm.id != null && this.buildForm.id != '') {
-                    //     urlAdd = 'edit'
-                    // }
-                    // // 经纬度
-                    // const latAndLon = this.buildForm.latAndLon
-                    // if (latAndLon != null && latAndLon != [] && latAndLon != '') {
-                    //     const latAndLon = this.buildForm.latAndLon.split(',')
-                    //     this.buildForm.lon = latAndLon[0]
-                    //     this.buildForm.lat = latAndLon[1]
-                    // }
-                    // // 关联区域
-                    // const lcqymc = this.buildForm.lcqymc.join(',')
-                    // this.buildForm.lcqymc = lcqymc
-                    // // 关联楼层
-                    // const lcmc = this.buildForm.lcmc.join(',')
-                    // this.buildForm.lcmc = lcmc
 
                     this.baseRequest(urlAdd, postData).then((res) => {
                         if (res.data.code == 200) {
-                            this.buildForm = {}
+                            // this.buildForm = {}
                             this.dialogVisible = false
                             // this.getList()
                             this.getTreeData()
@@ -537,122 +494,12 @@ export default {
             console.log('层级====', node.level)
             _this.queryParam.nodeId = node.data.id
             _this.queryParam.level = node.level
-            // this.getData()
             _this.getList()
         },
-        getData: function() {
-            const _this = this
-            this.loading = true
-            this.AllData = []
-
-            const postData = {
-                department: this.selectDeptNode.id === '0' ? '' : this.selectDeptNode.id,
-                username: this.username,
-                truename: this.truename,
-                dataRole: this.dataRoleId,
-                postId: this.postId,
-                pageNum: this.currentPage,
-                pageSize: this.pageSize,
-                nodeId: this.nodeId,
-                level: this.level
-            }
-            if (this.$common.currUser().groupId) {
-                postData.groupId = this.$common.currUser().groupId
-            }
-            this.baseRequest('list', postData).then((res) => {
-                if (res.data.rows) {
-                    res.data.rows.forEach(function(item) {
-                        _this.AllData.push(_this.getItemJson(item))
-                    })
-                    _this.allpage = res.data.total
-                }
-                _this.loading = false
-            }).catch(() => {
-            })
-
-            // this.initRole()
-        },
         getItemJson: function(item) {
-            // const posts = item.posts ? item.posts.split(',') : []
-            // if (posts.length > 0) {
-            //     const postStr = []
-            //     posts.forEach(post => {
-            //         postStr.push(this.PostMap[post])
-            //     })
-            //     item.postStr = postStr.join(',')
-            // }
-            // item.type = this.dc_map.parkType[item.type]
-            // item.dataRoleStr = this.DataRoleMap[item.dataRole]
-            // item.department = item.department ? this.DeptMap[item.department] : ''
-            // 合同状态
-            item.type = this.dc_map.parkType[item.type]
             return item
         },
-        typeFormatter(row, column) {
-            return this.dc_map.parkType[row.type]
-        },
-        // initRole: function() {
-        //     const _this = this
-        //     this.MenuRole = []
-        //
-        //     this.$channel.baseRequest('RoleController', 'listAll', '', 'All Role').then((res) => {
-        //         if (res.data) {
-        //             res.data.forEach(function(item) {
-        //                 const json = {
-        //                     name: item.name,
-        //                     id: item.id
-        //                 }
-        //                 _this.MenuRole.push(json)
-        //             })
-        //         }
-        //     }).catch(() => {
-        //     })
-        // },
-
-        // handleReset: function() {
-        //     this.username = ''
-        //     this.truename = ''
-        //     this.postId = ''
-        //     this.dataRoleId = ''
-        //     this.handleSearch()
-        // },
-        handleRowSelectChange(val) {
-            this.currentRow = val
-            if (this.currentRow) {
-                if (this.currentRow.id === '1') {
-                    this.isAdminSelect = true
-                } else {
-                    this.isAdminSelect = false
-                }
-            }
-        },
-        getBaseForm: function() {
-            const baseForm = {
-                id: '',
-                groupId: '',
-                username: '',
-                password: null,
-                truename: '',
-                leader: '',
-                department: [],
-                posts: [],
-                gender: '',
-                phone: '',
-                sequenceNo: '',
-                secretKey: '',
-                comment: ''
-            }
-
-            if (this.$common.currUser().groupId) {
-                baseForm.groupId = this.$common.currUser().groupId
-            }
-
-            return baseForm
-        },
         dlgOpen: function() {
-            // this.$nextTick(() => {
-            //     this.$refs.buildForm.resetFields()
-            // })
         },
         dlgClose: function() {
             const _this = this
@@ -660,154 +507,12 @@ export default {
             _this.getList()
         },
 
-        assignRole: function() {
-            if (this.currentRow) {
-                this.selectUserId = this.currentRow.id
-                this.selectUserName = this.currentRow.truename
-                this.SelectMenuRole = []
-                this.SelectDataRoleId = this.currentRow.dataRole
-                this.dialogRoleTitle = this.currentRow.username + '[' + this.currentRow.truename + ']角色选择'
-                this.dialogRoleVisible = true
-            }
-        },
-        dlgRoleOpen: function() {
-            const _this = this
-            const postData = {
-                sysUserId: this.selectUserId
-            }
-            this.baseRequest('listUserRole', postData).then((res) => {
-                if (res.data) {
-                    res.data.forEach(function(item) {
-                        _this.SelectMenuRole.push(item.sysRoleId)
-                    })
-                }
-            }).catch(() => {
-            })
-        },
-        confirmSubmitRole: function() {
-            const postRole = {
-                userId: this.selectUserId
-            }
-            if (this.SelectMenuRole) {
-                postRole.prem = this.SelectMenuRole.join(',')
-            }
-
-            this.baseRequest('updateRole', postRole)
-
-            const postUser = {
-                id: this.selectUserId,
-                dataRole: this.SelectDataRoleId
-            }
-            this.opRecord(postUser, 'edit')
-        },
-        // /* 重置密码*/
-        // resetPWD: function() {
-        //     if (!this.currentRow) return
-        //     const _this = this
-        //     this.confirm('是否为' + this.currentRow.username + '重置密码,默认密码为:Ab654321?').then(() => {
-        //         const doing = _this.$notify({
-        //             title: '正在处理,请稍等',
-        //             type: 'warning'
-        //         })
-        //         const postData = {
-        //             id: this.currentRow.id,
-        //             password: 'Ab654321'
-        //         }
-        //         _this.baseRequest('editPwd', postData).then((res) => {
-        //             doing.close()
-        //             _this.$notify({
-        //                 title: '重置成功',
-        //                 type: 'info'
-        //             })
-        //         }).catch(() => {
-        //         })
-        //     })
-        // },
-        // /* 状态变更*/
-        // handleStatusSwitch: function(row) {
-        //     let info = ''
-        //     let preStatus = '0'
-        //     switch (row.status) {
-        //         case '0':
-        //             info = '是否禁用用户?'
-        //             preStatus = '1'
-        //             break
-        //         case '1':
-        //             info = '是否启用用户?'
-        //             preStatus = '0'
-        //             break
-        //     }
-        //     this.confirm(info).then(() => {
-        //         const postData = {
-        //             id: row.id,
-        //             status: row.status
-        //         }
-        //         this.opRecord(postData, 'edit')
-        //     }).catch(() => {
-        //         row.status = preStatus
-        //     })
-        // },
-        // handleStatus: function(_id, _status) {
-        //     let info = ''
-        //     const _this = this
-        //     switch (_status) {
-        //         case '0':
-        //             info = '是否禁用用户?'
-        //             break
-        //         case '1':
-        //             info = '是否启用用户?'
-        //             break
-        //     }
-        //     this.confirm(info).then(() => {
-        //         const postData = {
-        //             id: _id,
-        //             status: _status
-        //         }
-        //         _this.opRecord(postData, 'edit')
-        //     })
-        // },
-        // opRefresh: function() {
-        //     this.getList()
-        //     // this.getData()
-        //     this.dialogVisible = false
-        //     this.dialogRoleVisible = false
-        // },
-        // initValidLeader: function(_uid = '') {
-        //     const _this = this
-        //     this.LeaderData = []
-        //
-        //     const postData = {
-        //         uid: _uid
-        //     }
-        //     return this.globleRequest('UserController', 'listLeaderValid', postData, 'Valid Leader Users').then((res) => {
-        //         if (res.data) {
-        //             res.data.forEach(function(item) {
-        //                 const json = {
-        //                     label: item.truename,
-        //                     value: item.id
-        //                 }
-        //                 _this.LeaderData.push(json)
-        //             })
-        //         }
-        //     }).catch(() => {
-        //     })
-        // },
-        handleView(data) {
-            this.dialogViewVisible = true
-            this.$nextTick(() => {
-                this.$refs.buildView.initData(data)
-            })
-        },
         cancel() {
             this.dialogViewVisible = false
         },
         test(val) {
             // this.$set(this.buildForm, 'introduction', val)
         },
-        // 字典项
-        generateDcMap: function() {
-            this.dc_map['dc_gender'] = this.$common.transDcMap(this.dc_gender)
-        },
         // 请求封装,继承类中调用,必须存在
         baseRequest: function(opUrl, postData) {
             return this.$channel.baseRequest('MnpBuildingController', opUrl, postData, 'User')
@@ -835,15 +540,18 @@ export default {
         font-size: 16px;
         padding-right: 8px;
     }
+    .custom-tree-container{
+        display: flex;
+    }
     .custom-tree-container .block-l {
         /*flex-grow: 2 ;*/
-        float: left;
+        //float: left;
         width: 20%;
         padding: 0 8px 0 0;
     }
     .custom-tree-container .block-r {
         /*flex-grow: 10;*/
-        float: left;
+        //float: left;
         width: 80%;
         /*padding: 0 0 0 8px;*/
     }

+ 29 - 100
src/views/parkAssets/parkRoom/index.vue

@@ -36,14 +36,14 @@
         <div style="width: 100%;padding: 10px;background: white;margin-bottom: 10px;">
           <el-row class="lineheight20">
             <el-col :span="2">
-              当前状态
+              用途
             </el-col>
             <el-col :span="22">
               <el-checkbox-group
-                v-model="currentState"
+                v-model="roomUse"
               >
                 <el-checkbox
-                  v-for="item in dc_data.INVESTMENT_STATUS"
+                  v-for="item in dc_data.HOUSE_USAGE"
                   :key="item.value"
                   :label="item.value"
                 >{{ item.label }}</el-checkbox>
@@ -52,30 +52,14 @@
           </el-row>
           <el-row class="lineheight20">
             <el-col :span="2">
-              朝向:
-            </el-col>
-            <el-col :span="22">
-              <el-checkbox-group
-                v-model="direction"
-              >
-                <el-checkbox
-                  v-for="item in dc_data.MNP_BUILDING_CX"
-                  :key="item.value"
-                  :label="item.label"
-                >{{ item.label }}</el-checkbox>
-              </el-checkbox-group>
-            </el-col>
-          </el-row>
-          <el-row class="lineheight20">
-            <el-col :span="2">
-              可用状态:
+              装修情况:
             </el-col>
             <el-col :span="22">
               <el-checkbox-group
-                v-model="isEnable"
+                v-model="decorationSituation"
               >
                 <el-checkbox
-                  v-for="item in dc_data.HOUSE_ENABLE"
+                  v-for="item in dc_data.DECORATION_SITUATION"
                   :key="item.value"
                   :label="item.value"
                 >{{ item.label }}</el-checkbox>
@@ -84,14 +68,14 @@
           </el-row>
           <el-row class="lineheight20">
             <el-col :span="2">
-              租赁状态:
+              可售状态:
             </el-col>
             <el-col :span="22">
               <el-checkbox-group
-                v-model="houseStatus"
+                v-model="state"
               >
                 <el-checkbox
-                  v-for="item in dc_data.HOUSE_STATUS"
+                  v-for="item in dc_data.SALE_STATUS"
                   :key="item.value"
                   :label="item.value"
                 >{{ item.label }}</el-checkbox>
@@ -100,7 +84,7 @@
           </el-row>
           <el-row class="lineheight20">
             <el-col :span="2">
-              用途
+              已售状态
             </el-col>
             <el-col :span="22">
               <el-checkbox-group
@@ -114,22 +98,6 @@
               </el-checkbox-group>
             </el-col>
           </el-row>
-          <el-row class="lineheight20">
-            <el-col :span="2">
-              物业性质:
-            </el-col>
-            <el-col :span="22">
-              <el-checkbox-group
-                v-model="propertyNature"
-              >
-                <el-checkbox
-                  v-for="item in dc_data.PROPERTY_NATURE"
-                  :key="item.value"
-                  :label="item.value"
-                >{{ item.label }}</el-checkbox>
-              </el-checkbox-group>
-            </el-col>
-          </el-row>
           <el-row class="lineheight20">
             <el-col :span="2">
               <div style="margin-top: 6px">面积:</div>
@@ -493,29 +461,6 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      title="绑定管理人员"
-      :visible.sync="handleDialogVisible"
-      width="40%"
-      :before-close="handleClose"
-    >
-      <!-- style="text-align: center"、 -->
-      <div>
-        <el-transfer
-          v-model="roomUser"
-          filterable
-          :titles="['未绑', '已绑']"
-          filter-placeholder="请输入"
-          :data="handleUserList"
-        />
-        <!-- <el-transfer v-model="roomUser" :data="handleUserList"></el-transfer> -->
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="addRoomHandleUser">确 定</el-button>
-      </span>
-    </el-dialog>
-
     <el-dialog
       :visible.sync="dialogImageVisible"
       :close-on-click-modal="false"
@@ -539,7 +484,7 @@ export default {
     mixins: [Base, BaseData, BaseDept],
     data() {
         return {
-            dc_key: ['HOUSE_STATUS', 'HOUSE_ENABLE', 'HOUSE_USAGE', 'PROPERTY_NATURE', 'MNP_BUILDING_CX', 'INVESTMENT_STATUS', 'DECORATION_SITUATION'],
+            dc_key: ['HOUSE_USAGE', 'DECORATION_SITUATION', 'SALE_STATUS'],
             // 查询参数
             queryParam: {
                 groupName: '',
@@ -565,18 +510,8 @@ export default {
             dc_gender: [],
             dc_map: {},
 
-            // 列表相关
-            username: '',
-            truename: '',
-            dataRoleId: '',
-            postId: '',
             AllData: [],
             loading: false,
-            currentRow: null,
-            isAdminSelect: false,
-            isGroupUser: false,
-
-            // 用户维护相关
             dialogVisible: false,
             dialogVisibleLP: false,
             dialogTitle: '',
@@ -598,27 +533,12 @@ export default {
                 electricity: [{ required: true, trigger: 'blur', message: '请输入用电' }]
             },
 
-            // 角色维护相关
-            dialogRoleVisible: false,
-            dialogRoleTitle: '角色选择',
-            selectUserId: '',
-            selectUserName: '',
-            SelectMenuRole: [],
-            SelectDataRoleId: '',
-            MenuRole: [],
-
-            // 绑定管理人员
             roomId: '',
-            roomUser: [],
-            handleUserList: [],
-            handleDialogVisible: false,
-            direction: [],
-            currentState: [],
-            houseStatus: [],
-            isEnable: ['1'],
             usage: [],
             arr: [],
             roomUse: [],
+            state: [],
+            decorationSituation: [],
             propertyNature: [],
             regionOption: [],
             floorOption: [],
@@ -628,7 +548,6 @@ export default {
             dialogImageUrl: '',
             dialogImageVisible: false,
             isView: false,
-            expandedDeptKey: ['1138039460324179968', '1138039642482802688', '1138039726041726976', '1138039752541339648', '1141688047763456000']
         }
     },
     mounted() {
@@ -1105,21 +1024,31 @@ export default {
         font-size: 16px;
         padding-right: 8px;
     }
+    .custom-tree-container{
+        display: flex;
+    }
     .custom-tree-container .block-l {
-        float: left;
-        width: 19%;
-        margin: 0 0.3% 0 0;
-        max-height: 80vh;
-        overflow-x: scroll;
+        /*flex-grow: 2 ;*/
+        //float: left;
+        width: 20%;
+        padding: 0 8px 0 0;
     }
     .custom-tree-container .block-r {
-        float: left;
+        /*flex-grow: 10;*/
+        //float: left;
         width: 80%;
+        /*padding: 0 0 0 8px;*/
     }
 </style>
 
 <style scoped>
 
+    .lineheight20{
+        padding: 7px;
+        background-color: white;
+        line-height: 15rpx;
+    }
+
     .ch-input .el-input__inner {
         border-color: #32323A;
     }