房源档案导出调整 楼盘性质调整

src/views/parkAssets/parkFloorDisc/index.vue

@@ -109,12 +109,13 @@
                 </el-col>
                 <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>性质</span></el-col>
                 <el-col :span="8" class="col-input">
-                  <el-form-item prop="nature">
+                  <el-form-item prop="natureList">
                     <el-select
-                      v-model="groupForm.nature"
+                      v-model="groupForm.natureList"
                       placeholder=""
                       filterable
                       clearable
+                      multiple
                       :disabled="isView"
                     >
                       <el-option
@@ -557,7 +558,9 @@ export default {
                 name: ''
             },
             formLP: this.getBaseForm(),
-            groupForm: {},
+            groupForm: {
+                natureList: []
+            },
             groupList: [],
             DeptTree: [],
             typeList: [
@@ -575,7 +578,7 @@ export default {
             LeaderData: [],
             groupFormRules: {
                 groupName: [{ required: true, trigger: 'blur', message: '请输入楼盘/小区名称' }],
-                nature: [{ required: true, trigger: 'change', message: '请选择性质' }],
+                natureList: [{ required: true, trigger: 'change', message: '请选择性质' }],
                 preSalesLicenseNumber: [{ required: true, trigger: 'blur', message: '请输入预销售许可证编号' }],
                 archiveCode: [{ required: true, trigger: 'blur', message: '请输入项目编号' }]
             },
@@ -668,6 +671,9 @@ export default {
                     if (res.data.saleStatus) {
                         this.groupForm.saleStatus = res.data.saleStatus + ''
                     }
+                    if (res.data.nature) {
+                        this.$set(this.groupForm, 'natureList', (res.data.nature + '').split(','))
+                    }
                     this.dialogVisible = true
                 }
             })
@@ -723,6 +729,7 @@ export default {
         confirmSubmit: function() {
             this.$refs.groupForm.validate(valid => {
                 if (valid) {
+                    this.groupForm.nature = this.groupForm.natureList.join(',')
                     this.baseRequest('addModel', this.groupForm).then((res) => {
                         if (res.data.code == 200) {
                             this.dialogVisible = false

src/views/reportForms/parkRoomArchives.vue

@@ -134,7 +134,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['DECORATION_SITUATION', 'MAPPING_STATUS', 'SOLD_STATUS', 'GROUP_NATURE'],
+            dc_key: ['DECORATION_SITUATION', 'MAPPING_STATUS', 'SOLD_STATUS', 'GROUP_NATURE', 'HOUSE_PAYMENT_STATUS'],
             // 列表相关
             search: {
             },
@@ -211,6 +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]
             return item
         },
         cancel: function() {
@@ -293,8 +294,9 @@ export default {
             this.OutData = []
             const title = ['房屋代码', '小区名称', '门牌', '户号', '施工号', '面积测绘状态', '销售状态', '房屋类别',
                 '预测套内面积', '预测分摊面积', '预测建筑面积', '预测土地面积', '实测套内面积', '实测分摊面积', '实测建筑面积', '实测土地面积',
-                '房屋总价', '备注', '选房时间', '批次号', '选房号', '网签合同备案号', '合同编号', '合同时间', '合同买受人', '合同买受人身份证',
-                '合同面积状态', '合同面积', '合同金额', '已付款总额', '已付款详情', '合同联系方式', '实际入住时间'
+                '房屋总价', '备注', '选房时间', '批次号', '选房号', '网签合同备案号', '合同编号', '签约时间', '合同买受人', '合同买受人身份证',
+                '买受人联系方式', '房屋买卖单价（元/㎡）', '总价款（元）', '买受人出资金额（元）', '应收房款（元）', '已付房款（元）',
+                '尚欠房款（元）', '收款状态', '已付款详情', '实际入住时间'
             ]
             this.OutData.push(title)
             const temp = []
@@ -332,14 +334,16 @@ export default {
                     jsonArray.push(item.signingDate)
                     jsonArray.push(item.buyerName)
                     jsonArray.push(item.buyerIdentityCard)
-                    jsonArray.push(item.contractAreaStatus)
-                    jsonArray.push(item.contractArea)
+                    jsonArray.push(item.buyerPhone)
+                    jsonArray.push(item.contractHousePrice)
                     jsonArray.push(item.contractTotalPrice)
+                    jsonArray.push(item.contractBuyerMoney)
+                    jsonArray.push(item.receivableMoney)
                     jsonArray.push(item.receivedMoney)
+                    jsonArray.push(item.arrears)
+                    jsonArray.push(item.collectionStatusStr)
                     jsonArray.push(item.payInfo)
-                    jsonArray.push(item.contractContact)
                     jsonArray.push(item.checkInDate)
-
                     _this.OutData.push(jsonArray)
                 })
                 const OutSize = [{ wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 },