Merge remote-tracking branch 'origin/test' into test

src/views/reportForms/components/parkRoomIndexDetail.vue

@@ -16,9 +16,9 @@
                 <el-table-column label="定金流水号" prop="serialNumber" width="100" />
                 <el-table-column label="认购房屋" prop="houseName" />
                 <el-table-column label="状态" prop="statusStr" width="110" />
-                <el-table-column label="经办时间" prop="createdName" />
-                <el-table-column label="经办人" prop="createdAt" />
-                <el-table-column header-align="center" label="操作" width="180">
+                <el-table-column label="经办时间" prop="createdAt" width="100"/>
+                <el-table-column label="经办人" prop="createdName" />
+                <el-table-column header-align="center" label="操作">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="depositView(scope.row)">查看</el-button>
                   </template>
@@ -51,8 +51,8 @@
                     </span>
                   </template>
                 </el-table-column>
-                <el-table-column label="签约日期" prop="signingDate" />
-                <el-table-column header-align="center" label="操作" width="180">
+                <el-table-column label="签约日期" prop="signingDate" width="100"/>
+                <el-table-column header-align="center" label="操作">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="contractView(scope.row)">查看</el-button>
                   </template>
@@ -84,7 +84,7 @@
                     </span>
                   </template>
                 </el-table-column>
-                <el-table-column header-align="center" label="操作" width="200">
+                <el-table-column header-align="center" label="操作">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="payLogView(scope.row)">查看</el-button>
                   </template>
@@ -114,7 +114,7 @@
                     </span>
                   </template>
                 </el-table-column>
-                <el-table-column header-align="center" label="操作" width="180">
+                <el-table-column header-align="center" label="操作">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="fundView(scope.row)">查看</el-button>
                   </template>
@@ -184,7 +184,7 @@
                     </span>
                   </template>
                 </el-table-column>
-                <el-table-column header-align="center" label="操作" width="180">
+                <el-table-column header-align="center" label="操作">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="invoiceView(scope.row)">查看</el-button>
                   </template>

src/views/reportForms/components/projectDetail.vue

@@ -238,10 +238,15 @@ export default {
                 if (res.data) {
                     this.groupForm = res.data
                     if (res.data.nature) {
-                        this.groupForm.natureStr = this.dc_map.GROUP_NATURE[res.data.nature]
-                        this.groupForm.areaStatusStr = this.dc_map.MAPPING_STATUS[res.data.areaStatus]
-                        this.groupForm.saleStatusStr = this.dc_map.SALE_STATUS[res.data.saleStatus]
+                        const arr = res.data.nature.split(',')
+                        let temp = ''
+                        arr.forEach(item => {
+                            temp = temp + this.dc_map.GROUP_NATURE[item] + ','
+                        })
+                        this.groupForm.natureStr = temp
                     }
+                    this.groupForm.areaStatusStr = this.dc_map.MAPPING_STATUS[res.data.areaStatus]
+                    this.groupForm.saleStatusStr = this.dc_map.SALE_STATUS[res.data.saleStatus]
                 }
             })
         },

src/views/reportForms/parkRoomArchives.vue

@@ -211,7 +211,7 @@ export default {
             item.areaStatusStr = this.dc_map.MAPPING_STATUS[item.areaStatus]
             item.soldStatusStr = this.dc_map.SOLD_STATUS[item.soldStatus]
             item.natureStr = this.dc_map.GROUP_NATURE[item.nature]
-            item.collectionStatusStr = this.dc_map.GROUP_NATURE[item.collectionStatus]
+            item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.collectionStatus]
             return item
         },
         cancel: function() {
@@ -349,7 +349,7 @@ export default {
                 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 }]
-                const fileName = '房间导出 ' + new Date().Format('yyyyMMddhhmm')
+                const fileName = '房源档案导出 ' + new Date().Format('yyyyMMddhhmm')
                 this.$outputXlsxFile(this.OutData, OutSize, fileName)
                 _this.excelFlag = false
             })