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

@@ -1,10 +1,11 @@
 <template>
   <div>
     <div>
-      <el-row class="handle-box">
+      <el-row>
         <el-col :span="24">
           <span class="card_title">项目基础信息</span>
         </el-col>
+        <el-divider />
       </el-row>
       <el-row class="handle-box">
         <el-col :span="8">
@@ -87,18 +88,19 @@
         </el-col>
         <el-col :span="8">
           <span>行政区划:</span>
-          <span>{{ groupForm.regionalismCode }}</span>
+          <span>{{ groupForm.regionalismCodeStr }}</span>
         </el-col>
       </el-row>
-      <el-row class="handle-box">
-        <span>行政区划:</span>
+      <el-row class="handle-box" style="margin-bottom: 24px">
+        <span>详细地址:</span>
         <span>{{ groupForm.address }}</span>
       </el-row>
-      <el-divider />
+
       <el-row>
         <el-col :span="24">
           <span class="card_title">分期信息</span>
         </el-col>
+        <el-divider />
       </el-row>
       <el-row class="handle-box">
         <el-col :span="8">
@@ -120,42 +122,40 @@
           <span>{{ discForm.subscriptionFunds }}</span>
         </el-col>
       </el-row>
-      <el-row class="handle-box">
+      <el-row class="handle-box" style="margin-bottom: 24px">
         <el-col :span="8">
           <span>共持比例:</span>
           <span>{{ discForm.proportion }}</span>
         </el-col>
       </el-row>
-      <el-row class="handle-box">
-        <el-col :span="4">
-          <div class="xuanfang">已选房</div>
-        </el-col>
-        <el-col :span="4">
-          <div class="qianyue">已签约</div>
-        </el-col>
-        <el-col :span="4">
-          <div class="shoukuan">已收款</div>
-        </el-col>
-        <el-col :span="4">
-          <div class="ruzhu">已入驻</div>
-        </el-col>
-        <el-col :span="4">
-          <div class="tuifang">已退房</div>
-        </el-col>
-        <el-col :span="4">
-          <div class="chushi">初始状态</div>
+      <el-row>
+        <el-col :span="24">
+          <span class="card_title">图例</span>
         </el-col>
+        <el-divider />
       </el-row>
+
+      <div class="tuli" style="margin-bottom: 24px">
+        <div class="dis_flex align_center mr15px"><div class="mr10px">已订房：</div><div class="dingfang" style="width: 15px;height: 15px" /></div>
+
+        <div class="dis_flex align_center mr15px"><div class="mr10px">已选房：</div><div class="xuanfang" style="width: 15px;height: 15px" /></div>
+        <div class="dis_flex align_center mr15px"><div class="mr10px">已签约:</div><div class="qianyue" style="width: 15px;height: 15px" /></div>
+        <div class="dis_flex align_center mr15px "><div class="mr10px">已收款:</div><div class="shoukuan" style="width: 15px;height: 15px" /></div>
+        <div class="dis_flex align_center mr15px "><div class="mr10px">已入驻:</div><div class="ruzhu" style="width: 15px;height: 15px" /></div>
+        <div class="dis_flex align_center mr15px "><div class="mr10px">已退房:</div><div class="tuifang" style="width: 15px;height: 15px" /></div>
+        <div class="dis_flex align_center mr15px "><div class="mr10px">初始状态:</div><div class="chushi" style="width: 15px;height: 15px" /></div>
+
+      </div>
       <el-row v-for="(item, index) in houseData" :key="index">
         <el-col :span="24">
           <span class="card_title">单元/楼栋号:{{ item.buildName }}</span>
         </el-col>
         <el-divider />
-          <div class="buildList" v-loading="loading">
-              <div class="buildList-row" v-for="(roomItem, roomIndex) in item.roomList" :key="roomIndex">
-                  <div :class="grtProjectStatusStr(roomItem.projectStatusStr)">{{ roomItem.roomNo }}</div>
-              </div>
+        <div v-loading="loading" class="buildList">
+          <div v-for="(roomItem, roomIndex) in item.roomList" :key="roomIndex" class="buildList-row">
+            <div :class="grtProjectStatusStr(roomItem.projectStatusStr)">{{ roomItem.roomNo }}</div>
           </div>
+        </div>
 
       </el-row>
 
@@ -181,8 +181,8 @@ export default {
     },
     data() {
         return {
-            loading:false,
-            dc_key: ['DECORATION_SITUATION', 'GROUP_NATURE', 'MAPPING_STATUS', 'SALE_STATUS'],
+            loading: false,
+            dc_key: ['DECORATION_SITUATION', 'GROUP_NATURE', 'MAPPING_STATUS', 'SALE_STATUS', 'REGIONALISM_CODE'],
             groupForm: {},
             discForm: {},
             groupId: '',
@@ -214,6 +214,11 @@ export default {
                 if (e === '初始状态') {
                     return 'chushi status_box '
                 }
+                if (e === '已订房') {
+                    return 'dingfang status_box '
+                }
+            } else {
+                return 'dingfang status_box'
             }
         },
         initData(data) {
@@ -233,10 +238,16 @@ 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.regionalismCodeStr = this.dc_map.REGIONALISM_CODE[res.data.regionalismCode]
+                    this.groupForm.areaStatusStr = this.dc_map.MAPPING_STATUS[res.data.areaStatus]
+                    this.groupForm.saleStatusStr = this.dc_map.SALE_STATUS[res.data.saleStatus]
                 }
             })
         },
@@ -254,14 +265,13 @@ export default {
             const postData = {
                 discId: this.discId
             }
-            this.loading=true
+            this.loading = true
             this.baseRoomRequest('projectHouseVoList', postData).then(res => {
                 if (res.data) {
                     this.houseData = res.data
-                    this.loading=false
+                    this.loading = false
                 }
             })
-
         },
         getItemJson: function(item) {
             return item
@@ -284,6 +294,24 @@ export default {
 </script>
 
 <style scoped>
+.mr15px{
+    margin-right: 15px;
+}
+.ml15px{
+    margin-left: 15px;
+}
+.mr10px{
+    margin-right: 10px;
+}
+.align_center{
+    align-items: center;
+}
+.dis_flex{
+    display: flex;
+}
+.tuli{
+    display: flex;
+}
 .xuanfang {
     text-align: center;
     width: 75px;
@@ -334,4 +362,11 @@ export default {
     border: 2px solid black;
     background-color: #ffffff;
 }
+.dingfang{
+    text-align: center;
+    width: 75px;
+    border: 2px solid black;
+    background-color: #8200ff;
+    color: white;
+}
 </style>

src/views/reportForms/parkRoomArchives.vue

@@ -48,7 +48,7 @@
           style="width: 100%"
           clearable
           filterable
-          @change="handleSearch"
+          @change="buildChange"
         >
           <el-option
             v-for="item in buildOption"
@@ -161,6 +161,10 @@ export default {
     },
     methods: {
         groupChange() {
+            this.discOption = []
+            this.search.discId = ''
+            this.search.buildId = ''
+            this.search.roomNo = ''
             this.handleSearch()
             const data = {
                 groupId: this.search.groupId
@@ -168,12 +172,19 @@ export default {
             this.getDiscOption(data)
         },
         discChange() {
+            this.buildOption = []
+            this.search.buildId = ''
+            this.search.roomNo = ''
             this.handleSearch()
             const data = {
                 discId: this.search.discId
             }
             this.getBuildOption(data)
         },
+        buildChange() {
+            this.search.roomNo = ''
+            this.handleSearch()
+        },
         getData: function() {
             const _this = this
             _this.loading = true
@@ -211,7 +222,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 +360,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
             })

src/views/reportForms/projectArchives.vue

@@ -10,7 +10,7 @@
           style="width: 100%"
           clearable
           filterable
-          @change="handleSearch"
+          @change="groupChange"
         >
           <el-option
             v-for="item in groupOption"
@@ -29,7 +29,7 @@
           style="width: 100%"
           clearable
           filterable
-          @change="handleSearch"
+          @change="discChange"
         >
           <el-option
             v-for="item in discOption"
@@ -135,12 +135,26 @@ export default {
     },
     mounted() {
         this.getGroupOption()
-        this.getDiscOption()
+        // this.getDiscOption()
         this.initDict(this.dc_key).then((res) => {
             this.getData()
         })
     },
     methods: {
+        groupChange() {
+            this.discOption = []
+            this.search.discId = ''
+            this.search.roomNo = ''
+            this.handleSearch()
+            const data = {
+                groupId: this.search.groupId
+            }
+            this.getDiscOption(data)
+        },
+        discChange() {
+            this.search.roomNo = ''
+            this.handleSearch()
+        },
         getGroupOption() {
             this.baseGroupRequest('listAll', {}).then((res) => {
                 const data = res.data
@@ -155,8 +169,8 @@ export default {
                 })
             })
         },
-        getDiscOption() {
-            this.baseDiscRequest('listAll', {}).then((res) => {
+        getDiscOption(data) {
+            this.baseDiscRequest('listAll', data).then((res) => {
                 const data = res.data
                 this.discOption = []
                 data.forEach(item => {