bug

src/views/buyingBack/buyingBackAdd.vue

@@ -233,6 +233,7 @@ export default {
                 if (res.data) {
                     this.form = res.data
                     this.username = this.form.createdName
+                    this.fileList = JSON.parse(this.form.fileList)
                 }
             }).catch(err => {
                 this.$message.error(err)
@@ -255,7 +256,8 @@ export default {
                         soaUrl = 'edit'
                     }
                     const extraData = {
-                        type: '2'
+                        type: '2',
+                        fileList: JSON.stringify(_this.fileList)
                     }
                     const postData = Object.assign({}, _this.form, extraData)
                     this.baseRequest(soaUrl, postData).then(res => {

src/views/buyingMore/buyingMoreAdd.vue

@@ -238,6 +238,9 @@ export default {
                 if (res.data) {
                     this.form = res.data
                     this.username = this.form.createdName
+                    if (this.form.fileList) {
+                        this.fileList = JSON.parse(this.form.fileList)
+                    }
                 }
             }).catch(err => {
                 this.$message.error(err)
@@ -260,7 +263,8 @@ export default {
                         soaUrl = 'edit'
                     }
                     const extraData = {
-                        type: '1'
+                        type: '1',
+                        fileList: JSON.stringify(_this.fileList)
                     }
                     const postData = Object.assign({}, _this.form, extraData)
                     this.baseRequest(soaUrl, postData).then(res => {

src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -166,7 +166,6 @@ export default {
             this.baseRequest('getById', data).then(res => {
                 this.form = res.data
                 this.form.buyerName = data.buyerName
-                console.log('this.form', this.form)
                 if (this.form.paperReceipts) {
                     this.fileList = JSON.parse(this.form.paperReceipts)
                 }

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -207,7 +207,8 @@ export default {
             this.getBankOptions()
             this.initDict(this.dc_key).then(res => {
                 this.contentTypeOption = this.dc_data.CONTENT_TYPE.filter(item =>
-                    item.label !== '专项维修资金' && item.label !== '意向金')
+                    item.label !== '专项维修资金' && item.label !== '意向金' && item.label !== '首款-定金转' &&
+                    item.label !== '房款-定金转')
                 if (data.id) {
                     this.getById(data)
                 } else {

src/views/receiveRefundsManagement/paymentManagement/paymentRegistration.vue

@@ -77,7 +77,7 @@
         <span class="card_title">缴费收款信息</span>
         <el-card shadow="always" style="padding: 15px 5px 5px 15px">
           <el-row style="text-align: right">
-            <el-button type="primary" @click="handleAdd">新增</el-button>
+            <el-button v-if="!isView" type="primary" @click="handleAdd">新增</el-button>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -92,7 +92,7 @@
                 <el-table-column header-align="center" label="操作" width="180">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
-                    <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button v-if="!isView" size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
                     <el-button size="mini" type="text" @click="downLoad(scope.row)">电子收据</el-button>
                     <el-button v-if="scope.row.contentType == '1'" size="mini" type="text" @click="handleConvert(scope.row,1)">转首款</el-button>
                     <el-button v-if="scope.row.contentType == '1'" size="mini" type="text" @click="handleConvert(scope.row,2)">转房款</el-button>

src/views/transactionRecord/convertRecordIndex.vue

@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="4">
         <el-date-picker
-          v-model="search.handleDateFrom"
+          v-model="search.collectionDateFrom"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -32,7 +32,7 @@
       </el-col>
       <el-col :span="4">
         <el-date-picker
-          v-model="search.handleDateTo"
+          v-model="search.collectionDateTo"
           popper-class="statistic_base"
           type="date"
           placeholder="年月日"
@@ -61,7 +61,7 @@
           @change="handleSearch"
         >
           <el-option
-            v-for="item in dc_data.CONTENT_TYPE"
+            v-for="item in dc_data.CONVERT_TYPE"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -93,8 +93,8 @@
           <el-table-column label="流水号" prop="serialNumber" width="250" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="金额（元）" prop="money" width="200" />
-          <el-table-column label="转换类型" prop="contentTypeStr" width="110" />
-          <el-table-column label="转换日期" prop="handleDate" />
+          <el-table-column label="转换类型" prop="convertTypeStr" width="110" />
+          <el-table-column label="转换日期" prop="convertDate" />
           <el-table-column label="付款账号" prop="bankNumber" />
           <el-table-column label="转换经办人" prop="createdName" />
           <el-table-column label="NCC提交状态" prop="ncSubmitStatusStr" />
@@ -149,7 +149,7 @@ export default {
     },
     data() {
         return {
-            dc_key: ['CONTENT_TYPE', 'COLLECTION_METHODS'],
+            dc_key: ['CONTENT_TYPE', 'COLLECTION_METHODS', 'CONVERT_TYPE'],
             // 列表相关
             search: {
             },
@@ -217,7 +217,8 @@ export default {
             this.handleSearch()
         },
         getItemJson: function(item) {
-            item.contentTypeStr = this.dc_map.CONTENT_TYPE[item.contentType]
+            // item.contentTypeStr = this.dc_map.CONTENT_TYPE[item.contentType]
+            item.convertTypeStr = this.dc_map.CONVERT_TYPE[item.convertType]
             item.paymentMethodStr = this.dc_map.COLLECTION_METHODS[item.paymentMethod]
             item.ncSubmitStatusStr = item.ncSubmitStatus == '1' ? '已提交' : '未提交'
             return item

src/views/transactionRecord/refundRecordIndex.vue

@@ -10,6 +10,7 @@
           :append-to-body="false"
           :options="options"
           clearable
+          :props="{ multiple: true}"
           style="width: 100%"
           @change="handleChange"
         />
@@ -244,33 +245,34 @@ export default {
         // 导出
         handleExcel: function() {
             const _this = this
-            _this.AllData = []
             this.OutData = []
-            const title = ['单元/楼栋号', '所在层', '户室号', '套内面积', '建筑面积', '用途', '装修情况',
-                '可售状态', '已售状态']
+            const title = ['房屋', '流水号', '买受人', '金额(元)', '退款类型', '付款账号',
+                '银行流水号', '退款经办人', 'NCC提交状态', '最近提交日期', 'NCC提交人']
             this.OutData.push(title)
             const temp = []
             this.baseRequest('refundRecordListAll', _this.search).then(res => {
                 const data = res.data
-                data.data.forEach(function(item) {
+                data.forEach(function(item) {
                     const json = _this.getItemJson(item)
                     temp.push(json)
                 })
                 temp.forEach(function(item) {
                     const jsonArray = []
-                    jsonArray.push(item.buildName)
-                    jsonArray.push(item.floor)
-                    jsonArray.push(item.roomNo)
-                    jsonArray.push(item.actualInternalArea)
-                    jsonArray.push(item.actualBuildArea)
-                    jsonArray.push(item.roomUse)
-                    jsonArray.push(item.decorationSituationStr)
-                    jsonArray.push(item.saleStatusStr)
-                    jsonArray.push(item.soldStatusStr)
+                    jsonArray.push(item.houseName)
+                    jsonArray.push(item.serialNumber)
+                    jsonArray.push(item.buyerName)
+                    jsonArray.push(item.money)
+                    jsonArray.push(item.contentTypeStr)
+                    jsonArray.push(item.bankNumber)
+                    jsonArray.push(item.bankSerialId)
+                    jsonArray.push(item.createdName)
+                    jsonArray.push(item.ncSubmitStatusStr)
+                    jsonArray.push(item.ncSubmitDate)
+                    jsonArray.push(item.ncSubmitName)
                     _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 }]
                 const fileName = '收款记录导出 ' + new Date().Format('yyyyMMddhhmm')
                 this.$outputXlsxFile(this.OutData, OutSize, fileName)
             })