1

src/views/customerManagement/numberManagement/index.vue

@@ -503,9 +503,9 @@ export default {
                         }
                         this.groupOption.push(obj)
                     })
-                    if (firstLoad) {
-                        this.checkedBox(this.groupOption[1].value)
-                    }
+                    // if (firstLoad) {
+                    //     this.checkedBox(this.groupOption[1].value)
+                    // }
                 }
             })
         },

src/views/parkAssets/component/uploadCost.vue

@@ -455,72 +455,6 @@ export default {
             }
         },
         downloadGroupTemplate() {
-            // const outData = []
-            // const title = []
-            // title.push('楼盘/小区名称')
-            // title.push('性质')
-            // title.push('预销售许可证编号')
-            // title.push('开发公司')
-            // title.push('总建筑面积(㎡)')
-            // title.push('总用地面积(㎡)')
-            // title.push('立项批文')
-            // title.push('工程规划许可证')
-            // title.push('施工许可证')
-            // title.push('土地证号')
-            // title.push('用地许可证号')
-            // title.push('容积率')
-            // title.push('绿化率')
-            // title.push('标准单价')
-            // title.push('超标单价')
-            // title.push('楼盘面积测绘状态')
-            // title.push('楼盘销售状态')
-            // title.push('行政区划')
-            // title.push('详细地址')
-            // title.push('备注')
-            //
-            // outData.push(title)
-            // const outSize = []
-            // title.forEach(item => {
-            //     if (item.length > 4) {
-            //         outSize.push({
-            //             wch: 30
-            //         })
-            //     } else {
-            //         outSize.push({
-            //             wch: 15
-            //         })
-            //     }
-            // })
-            // let fileName = '模板'
-            // if (this.importTitle.includes('批量导入')) {
-            //     fileName = '楼盘导入模版'
-            // }
-            // // if (this.importTitle.includes('批量更新')) {
-            // //     fileName = '更新模板'
-            // // }
-            // const ws = XLSX.utils.aoa_to_sheet(outData)
-            // ws['!cols'] = outSize
-            // ws['!rows'] = []
-            // const wb = XLSX.utils.book_new()
-            // XLSX.utils.book_append_sheet(wb, ws, fileName)
-            // const tmpDown = new Blob([
-            //     this.s2ab(
-            //         XLSXStyle.write(wb, {
-            //             bookType: 'xlsx',
-            //             bookSST: true,
-            //             type: 'binary',
-            //             cellStyles: true
-            //         })
-            //     )
-            // ])
-            // const elink = document.createElement('a')
-            // elink.download = decodeURIComponent(fileName + '.xlsx')
-            // elink.style.display = 'none'
-            // elink.href = URL.createObjectURL(tmpDown)
-            // document.body.appendChild(elink)
-            // elink.click()
-            // URL.revokeObjectURL(elink.href) // 释放URL 对象
-            // document.body.removeChild(elink)
             axios({
                 headers: {
                     'MVVM-Key': String(new Date().getTime()),
@@ -537,59 +471,6 @@ export default {
             })
         },
         downloadFQTemplate() {
-            // const outData = []
-            // const title = []
-            // title.push('楼盘/小区名称')
-            // title.push('分期名称')
-            // title.push('房屋买卖单价（元/㎡）')
-            // title.push('物业费单价（元/㎡）')
-            // title.push('住宅专项维修资金（元/㎡）')
-            // title.push('认购金（元）')
-            // title.push('共持比例')
-            // title.push('支付方式')
-            // outData.push(title)
-            // const outSize = []
-            // title.forEach(item => {
-            //     if (item.length > 4) {
-            //         outSize.push({
-            //             wch: 30
-            //         })
-            //     } else {
-            //         outSize.push({
-            //             wch: 15
-            //         })
-            //     }
-            // })
-            // let fileName = '模板'
-            // if (this.importTitle.includes('批量导入')) {
-            //     fileName = '楼盘分期导入'
-            // }
-            // // if (this.importTitle === '批量更新') {
-            // //     fileName = '更新模板'
-            // // }
-            // const ws = XLSX.utils.aoa_to_sheet(outData)
-            // ws['!cols'] = outSize
-            // ws['!rows'] = []
-            // const wb = XLSX.utils.book_new()
-            // XLSX.utils.book_append_sheet(wb, ws, fileName)
-            // const tmpDown = new Blob([
-            //     this.s2ab(
-            //         XLSXStyle.write(wb, {
-            //             bookType: 'xlsx',
-            //             bookSST: true,
-            //             type: 'binary',
-            //             cellStyles: true
-            //         })
-            //     )
-            // ])
-            // const elink = document.createElement('a')
-            // elink.download = decodeURIComponent(fileName + '.xlsx')
-            // elink.style.display = 'none'
-            // elink.href = URL.createObjectURL(tmpDown)
-            // document.body.appendChild(elink)
-            // elink.click()
-            // URL.revokeObjectURL(elink.href) // 释放URL 对象
-            // document.body.removeChild(elink)
             axios({
                 headers: {
                     'MVVM-Key': String(new Date().getTime()),
@@ -606,71 +487,6 @@ export default {
             })
         },
         downloadBuildTemplate() {
-            // const outData = []
-            // const title = []
-            // title.push('楼盘/小区名称')
-            // title.push('分期名称')
-            // title.push('单元/楼栋号')
-            // title.push('施工号')
-            // title.push('总面积（㎡）')
-            // title.push('住宅面积（㎡）')
-            // title.push('非住宅面积（㎡）')
-            // title.push('占地面积（㎡）')
-            // title.push('地下面积（㎡）')
-            // title.push('房号')
-            // title.push('套数')
-            // title.push('总层数')
-            // title.push('地上层数')
-            // title.push('地下层数')
-            // title.push('结构')
-            // title.push('行政区划')
-            // title.push('地号')
-            // title.push('备注')
-            // title.push('标准价格参考层及差价系数备注说明')
-            //
-            // outData.push(title)
-            // const outSize = []
-            // title.forEach(item => {
-            //     if (item.length > 4) {
-            //         outSize.push({
-            //             wch: 30
-            //         })
-            //     } else {
-            //         outSize.push({
-            //             wch: 15
-            //         })
-            //     }
-            // })
-            // let fileName = '模板'
-            // if (this.importTitle.includes('批量导入')) {
-            //     fileName = '楼栋管理模板'
-            // }
-            // // if (this.importTitle === '批量更新') {
-            // //     fileName = '更新模板'
-            // // }
-            // const ws = XLSX.utils.aoa_to_sheet(outData)
-            // ws['!cols'] = outSize
-            // ws['!rows'] = []
-            // const wb = XLSX.utils.book_new()
-            // XLSX.utils.book_append_sheet(wb, ws, fileName)
-            // const tmpDown = new Blob([
-            //     this.s2ab(
-            //         XLSXStyle.write(wb, {
-            //             bookType: 'xlsx',
-            //             bookSST: true,
-            //             type: 'binary',
-            //             cellStyles: true
-            //         })
-            //     )
-            // ])
-            // const elink = document.createElement('a')
-            // elink.download = decodeURIComponent(fileName + '.xlsx')
-            // elink.style.display = 'none'
-            // elink.href = URL.createObjectURL(tmpDown)
-            // document.body.appendChild(elink)
-            // elink.click()
-            // URL.revokeObjectURL(elink.href) // 释放URL 对象
-            // document.body.removeChild(elink)
             axios({
                 headers: {
                     'MVVM-Key': String(new Date().getTime()),
@@ -687,71 +503,20 @@ export default {
             })
         },
         downloadRoomTemplate() {
-            const outData = []
-            const title = []
-            title.push('楼盘/小区名称')
-            title.push('分期名称')
-            title.push('单元/楼栋号')
-            title.push('户室号')
-            title.push('所在层')
-            title.push('预测套内面积')
-            title.push('预测分摊面积')
-            title.push('预测建筑面积')
-            title.push('预测土地面积')
-            title.push('实测套内面积')
-            title.push('实测分摊面积')
-            title.push('实测建筑面积')
-            title.push('实测土地面积')
-            title.push('用途')
-            title.push('户编号')
-            title.push('装修情况')
-            title.push('2.2M以')
-            title.push('户型')
-            title.push('备注')
-            title.push('可售状态')
-            outData.push(title)
-            const outSize = []
-            title.forEach(item => {
-                if (item.length > 4) {
-                    outSize.push({
-                        wch: 30
-                    })
-                } else {
-                    outSize.push({
-                        wch: 15
-                    })
-                }
+            axios({
+                headers: {
+                    'MVVM-Key': String(new Date().getTime()),
+                    xx: 'anything'
+                },
+                method: 'post',
+                url: constant.BASE_URI + '/ParkRoomController/downLoadTemplate',
+                responseType: 'blob',
+                data: this.tableData
+            }).then(res => {
+                this.downloadExcel(res.data, '房间导入模板.xlsx')
+            }).catch((err) => {
+                console.log(err)
             })
-            let fileName = '模板'
-            if (this.importTitle.includes('批量导入')) {
-                fileName = '房间管理导入'
-            }
-            // if (this.importTitle === '批量更新') {
-            //     fileName = '更新模板'
-            // }
-            const ws = XLSX.utils.aoa_to_sheet(outData)
-            ws['!cols'] = outSize
-            ws['!rows'] = []
-            const wb = XLSX.utils.book_new()
-            XLSX.utils.book_append_sheet(wb, ws, fileName)
-            const tmpDown = new Blob([
-                this.s2ab(
-                    XLSXStyle.write(wb, {
-                        bookType: 'xlsx',
-                        bookSST: true,
-                        type: 'binary',
-                        cellStyles: true
-                    })
-                )
-            ])
-            const elink = document.createElement('a')
-            elink.download = decodeURIComponent(fileName + '.xlsx')
-            elink.style.display = 'none'
-            elink.href = URL.createObjectURL(tmpDown)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href) // 释放URL 对象
-            document.body.removeChild(elink)
         },
         handleClose() {
             this.dialogVisible = false

src/views/parkAssets/parkRoom/index.vue

@@ -150,6 +150,7 @@
               <el-table-column label="户室号" prop="roomNo" />
               <el-table-column label="套内面积（㎡）" prop="actualInternalArea" />
               <el-table-column label="建筑面积(㎡)" prop="actualBuildArea" />
+              <el-table-column label="性质" prop="natureStr" />
               <el-table-column label="用途" prop="roomUseStr" />
               <el-table-column label="装修情况" prop="decorationSituationStr" />
               <el-table-column label="可售状态" prop="saleStatusStr" />
@@ -358,6 +359,25 @@
                     </el-select>
                   </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="roomUse">
+                    <el-select
+                      v-model="houseForm.nature"
+                      placeholder=""
+                      filterable
+                      clearable
+                      :disabled="isView"
+                    >
+                      <el-option
+                        v-for="item in dc_data.GROUP_NATURE"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
                 <el-col :span="3" class="col-txt"><span>户型图:</span></el-col>
@@ -463,7 +483,7 @@ export default {
     mixins: [Base, BaseData, BaseDept],
     data() {
         return {
-            dc_key: ['HOUSE_USAGE', 'DECORATION_SITUATION', 'SALE_STATUS', 'SOLD_STATUS'],
+            dc_key: ['HOUSE_USAGE', 'DECORATION_SITUATION', 'SALE_STATUS', 'SOLD_STATUS', 'GROUP_NATURE'],
             // 查询参数
             queryParam: {
                 nodeId: '',
@@ -707,6 +727,8 @@ export default {
         },
 
         getItemJson: function(item) {
+            // 性质
+            item.natureStr = this.dc_map.GROUP_NATURE[item.nature]
             // 用途
             item.roomUseStr = this.dc_map.HOUSE_USAGE[item.roomUse]
             // 装修情况