LAPTOP-FO2T5SIU\35838 4 mēneši atpakaļ
vecāks
revīzija
dfbb62a716

+ 3 - 1
src/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue

@@ -392,7 +392,9 @@ export default {
                 if (fromAddress === 'customer') {
                     this.intentionalDepositId = res.data.intentionalDepositId
                 }
-                this.getById(this.intentionalDepositId)
+                if (this.intentionalDepositId) {
+                    this.getById(this.intentionalDepositId)
+                }
             }).catch((err) => {
             })
         },

+ 34 - 1
src/views/customerManagement/numberManagement/index.vue

@@ -119,6 +119,7 @@
       <el-col :span="24" style="margin-top: 20px">
         <el-button size="small" class="ch-button" style="float: right; margin-top: 4px" @click="downLoad"><i class="el-icon-menu" />&nbsp;选房通知单</el-button>
         <el-button size="small" class="ch-button-danger" style="float: right; margin-top: 4px;margin-right: 10px;" @click="handleDelete"><i class="el-icon-menu" />&nbsp;删除</el-button>
+        <el-button v-if="$has('customerExport')" :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>
@@ -346,7 +347,8 @@ export default {
             importVisible: false,
             importType: '',
             importTitle: '',
-            uploadTitle: []
+            uploadTitle: [],
+            excelFlag: false
         }
     },
     mounted() {
@@ -594,6 +596,37 @@ export default {
                 }
             })
         },
+        // 导出
+        handleExcel: function() {
+            const _this = this
+            _this.excelFlag = true
+            this.search.pageNum = this.currentPage
+            this.search.pageSize = this.pageSize
+            this.OutData = []
+            const title = ['批次号', '选房号', '买受人', '身份证号', '选房日']
+            this.OutData.push(title)
+            const temp = []
+            this.baseRequest('excelList', _this.search).then(res => {
+                const data = res.data
+                data.data.forEach(function(item) {
+                    const json = _this.getItemJson(item)
+                    temp.push(json)
+                })
+                temp.forEach(function(item) {
+                    const jsonArray = []
+                    jsonArray.push(item.batchNumber)
+                    jsonArray.push(item.roomSelectionNumber)
+                    jsonArray.push(item.buyerName)
+                    jsonArray.push(item.buyerIdentityCard)
+                    jsonArray.push(item.roomSelectionDate)
+                    _this.OutData.push(jsonArray)
+                })
+                const OutSize = [{ 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
+            })
+        },
 
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('CustomerManagementController', opUrl, postData, '')

+ 4 - 3
src/views/receiveRefundsManagement/refundManagement/addRefund.vue

@@ -307,7 +307,7 @@ export default {
                     this.dateStr = this.form.createdAt
                     this.username = this.form.createdName
                     this.form.applicantObject = this.form.applicantBuyerId
-                    this.getHouseList()
+                    this.getHouseList('view')
                     this.getPaymentListById()
                 }
             }).catch((e) => {
@@ -362,11 +362,12 @@ export default {
             _this.form.buyerName = ''
             _this.getHouseList()
         },
-        getHouseList() {
+        getHouseList(type) {
             const _this = this
             _this.houseOption = []
             const postData = {
-                identityCard: this.form.identityCard
+                identityCard: this.form.identityCard,
+                type: type
             }
             this.baseRequest('getHouseListByIdCard', postData).then((res) => {
                 if (res.data) {

+ 47 - 1
src/views/receiveRefundsManagement/refundManagement/index.vue

@@ -60,6 +60,7 @@
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24" style="margin-top: 20px">
+        <el-button v-if="$has('refundExport')" :loading="excelFlag" size="small" class="ch-button-export" style="float: right;" @click="handleExcel"><i class="el-icon-menu" />&nbsp;导出EXCEL</el-button>
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
         <el-button class="ch-button-add" size="small" style="float: right;" @click="handleAdd()"><i class="el-icon-menu" />&nbsp;新增</el-button>
@@ -144,7 +145,8 @@ export default {
             loading: false,
             // 弹框相关
             dialogVisible: false,
-            dialogTitle: '新增'
+            dialogTitle: '新增',
+            excelFlag: false
         }
     },
     mounted() {
@@ -219,6 +221,50 @@ export default {
         cancel: function() {
             this.dialogVisible = false
         },
+        // 导出
+        handleExcel: function() {
+            const _this = this
+            _this.excelFlag = true
+            this.search.pageNum = this.currentPage
+            this.search.pageSize = this.pageSize
+            this.OutData = []
+            const title = ['关联审批单号', '申请人', '身份证号', '退房原因', '所退房屋', '买受人', '款项', '已收(元)', '扣除',
+                '实退(元)', '应退金额(元)', '扣除金额(元)', '实退金额(元)', '收款账号', '备注'
+            ]
+            this.OutData.push(title)
+            const temp = []
+            this.baseRequest('excelList', _this.search).then(res => {
+                const data = res.data
+                data.data.forEach(function(item) {
+                    const json = _this.getItemJson(item)
+                    temp.push(json)
+                })
+                temp.forEach(function(item) {
+                    const jsonArray = []
+                    jsonArray.push(item.approvalNumber)
+                    jsonArray.push(item.applicant)
+                    jsonArray.push(item.identityCard)
+                    jsonArray.push(item.reasonStr)
+                    jsonArray.push(item.houseName)
+                    jsonArray.push(item.buyerName)
+                    jsonArray.push(item.contentTypeStr)
+                    jsonArray.push(item.receivedAmountInfo)
+                    jsonArray.push(item.deductibleInfo)
+                    jsonArray.push(item.actualRefundAmountInfo)
+                    jsonArray.push(item.refundAmount)
+                    jsonArray.push(item.deductible)
+                    jsonArray.push(item.actualRefundAmount)
+                    jsonArray.push(item.bankNumber)
+                    jsonArray.push(item.remark)
+
+                    _this.OutData.push(jsonArray)
+                })
+                const OutSize = [{ 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
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('RefundManageController', opUrl, postData, 'project')
         }

+ 1 - 0
src/views/reportForms/components/parkRoomIndexDetail.vue

@@ -450,6 +450,7 @@ export default {
             const _this = this
             _this.tabLoading = true
             const postData = {
+                payType: '1',
                 houseId: this.houseId
             }
             this.basePaymentRequest('listAll', postData).then((res) => {

+ 37 - 1
src/views/saleManage/checkIn/checkIn.vue

@@ -36,6 +36,7 @@
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24">
+        <el-button v-if="$has('checkInExport')" :loading="excelFlag" size="small" class="ch-button-export" style="float: right;" @click="handleExcel"><i class="el-icon-menu" />&nbsp;导出EXCEL</el-button>
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -239,7 +240,8 @@ export default {
             dialogTitle: '新增',
             dialogVisible2: false,
             dialogTitle2: '查看',
-            loadingFlag: false
+            loadingFlag: false,
+            excelFlag: false
         }
     },
     mounted() {
@@ -351,6 +353,40 @@ export default {
                 }
             })
         },
+        // 导出
+        handleExcel: function() {
+            const _this = this
+            _this.excelFlag = true
+            this.search.pageNum = this.currentPage
+            this.search.pageSize = this.pageSize
+            this.OutData = []
+            const title = ['合同编号', '买受人', '房屋', '入住状态', '备注', '入住日期', '经办人', '经办人时间']
+            this.OutData.push(title)
+            const temp = []
+            this.baseRequest('listAll', _this.search).then(res => {
+                const data = res.data
+                data.forEach(function(item) {
+                    const json = _this.getItemJson(item)
+                    temp.push(json)
+                })
+                temp.forEach(function(item) {
+                    const jsonArray = []
+                    jsonArray.push(item.contractNumber)
+                    jsonArray.push(item.buyerName)
+                    jsonArray.push(item.houseName)
+                    jsonArray.push(item.statusString)
+                    jsonArray.push(item.remark)
+                    jsonArray.push(item.inDate)
+                    jsonArray.push(item.operater)
+                    jsonArray.push(item.operateTime)
+                    _this.OutData.push(jsonArray)
+                })
+                const OutSize = [{ 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
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('CheckInController', opUrl, postData, 'project')
         }

+ 37 - 1
src/views/saleManage/propertyRegistration/propertyRegistration.vue

@@ -36,6 +36,7 @@
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24">
+        <el-button v-if="$has('propertyExport')" :loading="excelFlag" size="small" class="ch-button-export" style="float: right;" @click="handleExcel"><i class="el-icon-menu" />&nbsp;导出EXCEL</el-button>
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -235,7 +236,8 @@ export default {
             form: {},
             dialogTitle: '新增',
             dialogVisible2: false,
-            dialogTitle2: '查看'
+            dialogTitle2: '查看',
+            excelFlag: false
         }
     },
     mounted() {
@@ -346,6 +348,40 @@ export default {
                 }
             })
         },
+        // 导出
+        handleExcel: function() {
+            const _this = this
+            _this.excelFlag = true
+            this.search.pageNum = this.currentPage
+            this.search.pageSize = this.pageSize
+            this.OutData = []
+            const title = ['合同编号', '买受人', '房屋', '产权办理状态', '产权证编号', '备注', '经办人', '经办人时间']
+            this.OutData.push(title)
+            const temp = []
+            this.baseRequest('listAll', _this.search).then(res => {
+                const data = res.data
+                data.forEach(function(item) {
+                    const json = _this.getItemJson(item)
+                    temp.push(json)
+                })
+                temp.forEach(function(item) {
+                    const jsonArray = []
+                    jsonArray.push(item.contractNumber)
+                    jsonArray.push(item.buyerName)
+                    jsonArray.push(item.houseName)
+                    jsonArray.push(item.statusString)
+                    jsonArray.push(item.propertyNum)
+                    jsonArray.push(item.remark)
+                    jsonArray.push(item.operater)
+                    jsonArray.push(item.operateTime)
+                    _this.OutData.push(jsonArray)
+                })
+                const OutSize = [{ 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
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('PropertyRegistrationController', opUrl, postData, 'project')
         }

+ 58 - 4
src/views/signingManagement/contractManagement/index.vue

@@ -83,6 +83,7 @@
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24" style="margin-top: 20px">
+        <el-button v-if="$has('contractExport')" :loading="excelFlag" size="small" class="ch-button-export" style="float: right;" @click="handleExcel"><i class="el-icon-menu" />&nbsp;导出EXCEL</el-button>
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
       </el-col>
@@ -107,7 +108,7 @@
           <el-table-column label="实测建筑面积(㎡)" prop="actualBuildArea" width="110" />
           <el-table-column label="买卖单价(㎡)" prop="housePrice" />
           <el-table-column label="买受人产权份额占比" prop="buyerProportionStr" />
-          <el-table-column label="付款方式" prop="paymentMethodStr" width="100"/>
+          <el-table-column label="付款方式" prop="paymentMethodStr" width="100" />
           <el-table-column label="应收房款(元)" prop="buyerMoney" />
           <el-table-column label="应收专项维修资金(元)" prop="maintenanceTotalPrice" />
           <el-table-column label="合同状态" prop="contractStatusStr" width="110">
@@ -120,7 +121,7 @@
             </template>
           </el-table-column>
           <el-table-column label="签约日期" prop="signingDate" />
-          <el-table-column header-align="center" label="操作" width="220">
+          <el-table-column header-align="center" label="操作" width="250">
             <template scope="scope">
               <el-button :disabled="scope.row.contractStatusStr !== '认购待签约'" size="mini" type="text" @click="handleSign(scope.row)">签约</el-button>
               <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
@@ -189,7 +190,7 @@ export default {
     },
     data() {
         return {
-            dc_key: ['CONTRACT_STATUS', 'PAYMENT_METHODS'],
+            dc_key: ['CONTRACT_STATUS', 'PAYMENT_METHODS', 'MAPPING_INSTITUTION'],
             // 列表相关
             search: {
             },
@@ -199,7 +200,8 @@ export default {
             dialogVisible: false,
             dialogTitle: '新增',
             selectedRows: [],
-            selectId: ''
+            selectId: '',
+            excelFlag: false
         }
     },
     mounted() {
@@ -250,6 +252,7 @@ export default {
             }
             item.paymentMethodStr = this.dc_map.PAYMENT_METHODS[item.paymentMethod]
             item.contractStatusStr = this.dc_map.CONTRACT_STATUS[item.contractStatus]
+            item.institutionStr = this.dc_map.MAPPING_INSTITUTION[item.institution]
             return item
         },
         /* 编辑*/
@@ -306,6 +309,57 @@ export default {
                 this.selectId = val[val.length - 1].id
             }
         },
+        // 导出
+        handleExcel: function() {
+            const _this = this
+            _this.excelFlag = true
+            this.search.pageNum = this.currentPage
+            this.search.pageSize = this.pageSize
+            this.OutData = []
+            const title = ['网签备案号', '合同编号', '出卖人', '购房人', '房屋', '实测建筑面积(㎡)', '套内建筑面积(㎡)', '分摊共有建筑(㎡)',
+                '房产测绘机构', '签约日期', '备注说明', '房屋买卖单价(元/㎡)', '总价款(元)', '买受人产权份额占比为(%)', '买受人出资金额(元)',
+                '付款方式', '房款存入账号开户行', '房款存入账号', '住宅专项维修资金(元/㎡)', '总价款(元)'
+            ]
+            this.OutData.push(title)
+            const temp = []
+            this.baseRequest('listAll', _this.search).then(res => {
+                const data = res.data
+                data.forEach(function(item) {
+                    const json = _this.getItemJson(item)
+                    temp.push(json)
+                })
+                temp.forEach(function(item) {
+                    const jsonArray = []
+                    jsonArray.push(item.recordNumber)
+                    jsonArray.push(item.contractNumber)
+                    jsonArray.push('无锡市安居投资发展有限公司')
+                    jsonArray.push(item.buyerName)
+                    jsonArray.push(item.houseName)
+                    jsonArray.push(item.actualBuildArea)
+                    jsonArray.push(item.actualInternalArea)
+                    jsonArray.push(item.actualShareArea)
+                    jsonArray.push(item.institutionStr)
+                    jsonArray.push(item.signingDate)
+                    jsonArray.push(item.remark)
+                    jsonArray.push(item.housePrice)
+                    jsonArray.push(item.totalPrice)
+                    jsonArray.push(item.buyerProportion)
+                    jsonArray.push(item.buyerMoney)
+                    jsonArray.push(item.paymentMethodStr)
+                    jsonArray.push(item.bankName)
+                    jsonArray.push(item.bankNumber)
+                    jsonArray.push(item.maintenanceFunds)
+                    jsonArray.push(item.maintenanceTotalPrice)
+                    _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 }]
+                const fileName = '合同导出 ' + new Date().Format('yyyyMMddhhmm')
+                this.$outputXlsxFile(this.OutData, OutSize, fileName)
+                _this.excelFlag = false
+            })
+        },
 
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('ContractManageController', opUrl, postData, 'project')

+ 1 - 1
src/views/singleLogin/ssoLogin.vue

@@ -65,8 +65,8 @@ export default {
                             this.$router.push({ path: '/login' }).catch(() => {})
                         }
                     }).catch((e) => {
+                        console.log('e', e)
                         this.$router.push({ path: '/login' }).catch(() => {})
-                    // console.log(e)
                     })
             }
         },