1

src/views/customerManagement/numberManagement/addCustomer.vue

@@ -6,8 +6,8 @@
           <span class="card_title">基本信息</span>
           <el-card shadow="always" style="padding: 15px 5px 5px 15px">
             <el-row>
-              <el-col :span="3" class="col-txt"><span><span class="red-asterisk" />小区-分期</span></el-col>
-              <el-col :span="9" class="col-input">
+              <el-col v-if="isView" :span="3" class="col-txt"><span><span class="red-asterisk" />小区-分期</span></el-col>
+              <el-col v-if="isView" :span="9" class="col-input">
                 <el-form-item prop="findids">
                   <el-cascader
                     ref="findids"

src/views/parkAssets/parkRoom/index.vue

@@ -124,7 +124,7 @@
           </el-row>
           <el-row class="lineheight20">
             <el-col :span="24">
-              <el-button size="small" v-if="$has('roomExport')" class="ch-button-export" style="float: right; margin-top: 4px" @click="handleExcel"><i class="el-icon-menu" />&nbsp;导出详情</el-button>
+              <el-button v-if="$has('roomExport')" :loading="excelFlag" 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-export" style="float: right;margin-top: 4px" @click="batchImport()"><i class="el-icon-menu" />&nbsp;批量导入</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>
               <el-button size="small" class="ch-button" style="float: right;margin-top: 4px" @click="handleSearch()"><i class="el-icon-menu" />&nbsp;查询</el-button>
@@ -531,7 +531,8 @@ export default {
             importType: '',
             importTitle: '',
             uploadTitle: [],
-            loadingFlag: false
+            loadingFlag: false,
+            excelFlag: false
         }
     },
     mounted() {
@@ -549,6 +550,7 @@ export default {
         // 导出
         handleExcel: function() {
             const _this = this
+            _this.excelFlag = true
             _this.queryParam.pageNum = _this.currentPage
             _this.queryParam.pageSize = _this.pageSize
             _this.queryParam.roomUseStr = _this.roomUse.join(',')
@@ -556,8 +558,10 @@ export default {
             _this.queryParam.soldStatusStr = _this.soldStatus.join(',')
             _this.queryParam.decorationSituationStr = _this.decorationSituation.join(',')
             this.OutData = []
-            const title = ['单元/楼栋号', '所在层', '户室号', '套内面积', '建筑面积', '用途', '装修情况',
-                '可售状态', '已售状态']
+            const title = ['小区', '分期', '单元/楼栋号', '户室号', '所在层', '预测套内面积(㎡)', '预测分摊面积(㎡)', '预测建筑面积(㎡)', '预测土地面积(㎡)',
+                '实测套内面积(㎡)', '实测分摊面积(㎡)', '实测建筑面积(㎡)', '实测土地面积(㎡)', '用途', '房屋代码', '装修情况', '2.2米以上面积',
+                '户型', '房屋性质', '备注', '可售状态'
+            ]
             this.OutData.push(title)
             const temp = []
             this.baseRequest('excelList', _this.queryParam).then(res => {
@@ -568,21 +572,35 @@ export default {
                 })
                 temp.forEach(function(item) {
                     const jsonArray = []
+                    jsonArray.push(item.groupName)
+                    jsonArray.push(item.discName)
                     jsonArray.push(item.buildName)
-                    jsonArray.push(item.floor)
                     jsonArray.push(item.roomNo)
+                    jsonArray.push(item.floor)
+                    jsonArray.push(item.predictionInternalArea)
+                    jsonArray.push(item.predictionShareArea)
+                    jsonArray.push(item.predictionBuildArea)
+                    jsonArray.push(item.predictionLandArea)
                     jsonArray.push(item.actualInternalArea)
+                    jsonArray.push(item.actualShareArea)
                     jsonArray.push(item.actualBuildArea)
+                    jsonArray.push(item.actualLandArea)
                     jsonArray.push(item.roomUseStr)
+                    jsonArray.push(item.roomNumber)
                     jsonArray.push(item.decorationSituationStr)
+                    jsonArray.push(item.twoPointTwo)
+                    jsonArray.push(item.houseTypeStr)
+                    jsonArray.push(item.natureStr)
+                    jsonArray.push(item.remark)
                     jsonArray.push(item.saleStatusStr)
-                    jsonArray.push(item.soldStatusStr)
                     _this.OutData.push(jsonArray)
                 })
                 const OutSize = [{ wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 },
-                    { wch: 15 }, { wch: 15 }]
+                    { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 },
+                    { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }]
                 const fileName = '房间导出 ' + new Date().Format('yyyyMMddhhmm')
                 this.$outputXlsxFile(this.OutData, OutSize, fileName)
+                _this.excelFlag = false
             })
         },
 

src/views/receiveRefundsManagement/depositManagement/index.vue

@@ -127,6 +127,7 @@ import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
 import AddSubscribe from '@/views/customerManagement/subscribe/addSubscribe.vue'
 import constant from '@/static/utils/constant'
+import axios from 'axios'
 
 export default {
     name: 'Index',
@@ -201,8 +202,32 @@ export default {
             })
         },
         downLoad(row) {
-            const url = constant.BASE_URI + '/RoomSelectionInfoController/downLoadReceipt?id=' + row.id
-            window.open(url, '_blank')
+            // const url = constant.BASE_URI + '/RoomSelectionInfoController/downLoadReceipt?id=' + row.id
+            // window.open(url, '_blank')
+            this.downLoadFlag = true
+            axios({
+                headers: {
+                    'MVVM-Key': String(new Date().getTime()),
+                    xx: 'anything'
+                },
+                method: 'get',
+                url: constant.BASE_URI + '/RoomSelectionInfoController/downLoadReceipt?id=' + row.id,
+                responseType: 'blob'
+            }).then(res => {
+                this.previewPDF(res.data)
+            }).catch((err) => {
+                this.downLoadFlag = false
+                console.log(err)
+            })
+        },
+        previewPDF(blobPart, filename) {
+            const binaryData = []
+            binaryData.push(blobPart)
+            // 获取blob链接
+            let pdfUrl = ''
+            pdfUrl = window.URL.createObjectURL(new Blob(binaryData, { type: 'application/pdf' }))
+            window.open(pdfUrl)
+            this.downLoadFlag = false
         },
         cancel: function() {
             this.dialogVisible = false

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -78,19 +78,19 @@
             </el-row>
             <el-row>
               <el-col :span="5" class="col-txt"><span>房屋</span></el-col>
-              <el-col v-if="!isView" :span="18" class="col-input">
-                <el-form-item>
-                  <el-cascader
-                    v-model="form.houseId"
-                    :append-to-body="false"
-                    style="width: 100%;"
-                    :options="TreeData"
-                    disabled
-                    @change="houseChange"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col v-else :span="18" class="col-input">
+<!--              <el-col v-if="!isView" :span="18" class="col-input">-->
+<!--                <el-form-item>-->
+<!--                  <el-cascader-->
+<!--                    v-model="form.houseId"-->
+<!--                    :append-to-body="false"-->
+<!--                    style="width: 100%;"-->
+<!--                    :options="TreeData"-->
+<!--                    disabled-->
+<!--                    @change="houseChange"-->
+<!--                  />-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+              <el-col :span="18" class="col-input">
                 <el-form-item>
                   <span style="text-decoration:underline;color: #20a0ff;cursor:pointer;" @click="houseView()">{{ form.houseName }}</span>
                 </el-form-item>