Merge remote-tracking branch 'origin/master'

src/views/customerManagement/roomChose/addHouse.vue

@@ -62,7 +62,7 @@
       <!--      </el-row>-->
     </div>
     <div style="text-align: right;margin-top: 50px">
-      <el-button @click="cancel">取 消</el-button>
+      <el-button @click="cancel()">取 消</el-button>
       <el-button v-if="fromAddress!== 'intentionalDepositManagement'" type="primary" @click="confirmSubmit()">提交选房</el-button>
       <el-button v-if="fromAddress=== 'intentionalDepositManagement'" type="primary" @click="intentionalDepositConfirmSubmit()">意向金提交选房</el-button>
     </div>
@@ -170,6 +170,7 @@ export default {
                     message: '请选择房间',
                     type: 'warning'
                 })
+                return
             }
             const data = {
                 houseIds: this.AllData.map(obj => { return obj.houseId }).join(','),
@@ -224,12 +225,8 @@ export default {
         },
 
         downLoad(row) {
-            // const data = {
-            //     customerManagementId: this.customerManagementId,
-            //     houseId: row.houseId
-            // }
-            // const url = constant.BASE_URI + '/RoomSelectionInfoController/download?customerManagementId=' + this.customerManagementId + '&houseId=' + row.houseId
-            // window.location.href = url
+            const url = constant.BASE_URI + '/RoomSelectionInfoController/download?customerManagementId=' + this.customerManagementId + '&houseId=' + row.houseId
+            window.location.href = url
         },
         getChildrenData(data) {
             if (data) {

src/views/invoice/components/addInvoice.vue

@@ -190,7 +190,9 @@ export default {
             this.baseRequest('getById', postData).then(res => {
                 if (res.data) {
                     this.form = res.data
-                    this.getBankTaxRateByFloor()
+                    if (res.data.sendStatus == '0') {
+                        this.getBankTaxRateByFloor()
+                    }
                 }
             }).catch(err => {
                 this.$message.error(err)

src/views/invoice/components/batchInvoice.vue

@@ -0,0 +1,384 @@
+<template>
+  <div v-loading="loading">
+    <el-row class="handle-box">
+      <el-col :span="24">
+        批量操作：
+        <el-select
+          v-model="batchInvoiceSellerBank"
+          filterable
+          size="small"
+          placeholder="销方开户行、账号"
+          :popper-append-to-body="false"
+          @change="batchBankChange"
+        >
+          <el-option
+            v-for="item in bankOptions"
+            :key="item.id"
+            :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+            :title="'适用楼盘：' + (item.suitFloorStr?item.suitFloorStr:'无') + ' 适用费用类型：' + (item.suitCostType?item.suitCostType:'无')"
+            :value="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+          >
+            <div class="my-select">
+              <span>{{ item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber }}</span>
+              <span style="color: #8492a6; font-size: 13px;padding-left: 10px">
+                {{ ' 适用楼盘：' + (item.suitFloorStr?item.suitFloorStr:'无') + ' 适用费用类型：' + (item.suitCostType?item.suitCostType:'无') }}
+              </span>
+            </div>
+          </el-option>
+        </el-select>
+        <el-select
+          v-model="batchInvoiceTax"
+          filterable
+          size="small"
+          placeholder="税率"
+          @change="batchTaxChange"
+        >
+          <el-option
+            v-for="item in dc_data.invoice_tax"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-select
+          v-model="batchInvoiceType"
+          filterable
+          size="small"
+          placeholder="发票类型"
+          @change="batchTypeChange"
+        >
+          <el-option
+            v-for="item in invoiceTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+    </el-row>
+    <el-row class="handle-box">
+      <el-col :span="24">
+        <el-table
+          :data="batchInvoiceData"
+          :row-style="checkRow"
+        >
+          <el-table-column align="center" label="操作" width="180">
+            <template v-slot="scope">
+              <el-button size="mini" type="danger" @click="delRow(scope.$index)">移除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="发票抬头" prop="invoiceHeaderName" />
+          <el-table-column align="center" label="税号" prop="invoiceHeaderNumber" />
+          <el-table-column align="center" label="项目名称" prop="invoiceGoodsName" />
+          <el-table-column align="center" label="规格" prop="specifications" />
+          <el-table-column align="center" label="单位">
+            <span>平方米</span>
+          </el-table-column>
+          <el-table-column align="center" label="数量" prop="invoiceCount" />
+          <el-table-column align="center" label="金额" prop="invoiceAmount" />
+          <el-table-column align="center" label="销方开户行、账号" min-width="150">
+            <template v-slot="scope">
+              <el-select
+                v-model="scope.row.invoiceSellerBank"
+                filterable
+                size="small"
+                placeholder="请选择"
+                style="width: 80%"
+                :popper-append-to-body="false"
+                @change="(val) => bankChange(val,scope.$index)"
+              >
+                <el-option
+                  v-for="item in bankOptions"
+                  :key="item.id"
+                  :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+                  :title="'适用楼盘：' + (item.suitFloorStr?item.suitFloorStr:'无') + ' 适用费用类型：' + (item.suitCostType?item.suitCostType:'无')"
+                  :value="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+                >
+                  <div class="my-select">
+                    <span>{{ item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber }}</span>
+                    <span style="color: #8492a6; font-size: 13px;padding-left: 10px">
+                      {{ ' 适用楼盘：' + (item.suitFloorStr?item.suitFloorStr:'无') + ' 适用费用类型：' + (item.suitCostType?item.suitCostType:'无') }}
+                    </span>
+                  </div>
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="税率" min-width="150">
+            <template v-slot="scope">
+              <el-select
+                v-model="scope.row.invoiceTax"
+                filterable
+                size="small"
+                placeholder="请选择"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="item in dc_data.invoice_tax"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="开票备注" min-width="200">
+            <template v-slot="scope">
+              <el-input v-model="scope.row.remark" type="textarea" autosize />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+    <div slot="footer" style="text-align: right">
+      <el-button @click="handleClose">关 闭</el-button>
+      <el-button type="primary" @click="confirmSubmit()">提 交</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import Base from '@/views/base/base'
+export default {
+    name: 'BatchInvoice',
+    components: { },
+    mixins: [Base],
+    data() {
+        return {
+            dc_key: ['invoice_tax'],
+            batchInvoiceData: [],
+            bankOptions: [],
+            loading: false,
+            dialogVisible: false,
+            batchInvoiceSellerBank: '',
+            batchInvoiceTax: '',
+            batchInvoiceType: '',
+            targetIndex: '',
+            invoiceTypeOptions: [
+                { label: '全电发票(增值税专用发票)', value: '01' },
+                { label: '全电发票(普通发票)', value: '02' }
+                // { label: '增值税电子发票', value: '026' },
+                // { label: '增值税普通发票', value: '007' },
+                // { label: '增值税电子专用发票', value: '028' },
+                // { label: '增值税专用发票', value: '004' }
+            ]
+        }
+    },
+    methods: {
+        initData(data) {
+            this.getBankOptions()
+            this.initDict(this.dc_key).then(() => {
+                this.batchInvoiceData = []
+                this.loading = true
+                const ids = data.map((obj, index) => {
+                    return obj.id
+                }).join(',')
+                this.baseRequest('batchListVo', { invoiceManages: ids }).then(res => {
+                    this.batchInvoiceData = res.data || []
+                    this.loading = false
+                }).catch((err) => {
+                    console.log(err)
+                    this.loading = false
+                })
+            })
+        },
+        editHeader(headerId) {
+            if (!headerId) {
+                this.$message.warning('请先选择发票抬头')
+                return
+            }
+            this.dialogVisible = true
+            this.dialogTitle = '编辑'
+            this.$nextTick(() => {
+                this.$refs.invoiceHeaderEdit.initData(headerId, false)
+            })
+        },
+        handleHeaderClose(refresh) {
+            this.dialogVisible = false
+            if (refresh) {
+                this.batchInvoiceData.forEach(item => {
+                    item.headerOptions = []
+                    this.headerRequest('listVoAll', { companyId: item.companyId }).then(res => {
+                        const data = res.data || []
+                        data.forEach(x => {
+                            if (x.invoiceName) {
+                                item.headerOptions.push(x)
+                            }
+                        })
+                        if (item.headerOptions.length && item.headerOptions.length === 1) {
+                            const obj = item.headerOptions[0]
+                            if (obj) {
+                                item.invoiceHeaderId = obj.id
+                                item.invoiceHeaderName = obj.invoiceName
+                                item.invoiceHeaderNumber = obj.invoiceNumber
+                                item.invoiceHeaderAddress = obj.address
+                                item.invoiceHeaderBank = obj.bank
+                                item.invoiceEmail = obj.email
+                                item.invoicePhone = obj.mobilePhone
+                            }
+                        }
+                    })
+                })
+            }
+        },
+        delRow(rowIndex) {
+            this.batchInvoiceData.splice(rowIndex, 1)
+        },
+        headerChange(val, index, row) {
+            if (val && (index === 0 || index)) {
+                const obj = this.batchInvoiceData[index].headerOptions.find(x => x.id === val)
+                if (obj) {
+                    this.batchInvoiceData[index].invoiceHeaderName = obj.invoiceName
+                    this.batchInvoiceData[index].invoiceHeaderNumber = obj.invoiceNumber
+                    this.batchInvoiceData[index].invoiceHeaderAddress = obj.address
+                    this.batchInvoiceData[index].invoiceHeaderBank = obj.bank
+                    // this.batchInvoiceData[index].invoiceHeaderBankNumber = obj.bankNumber
+                    // this.batchInvoiceData[index].invoiceHeaderPhone = obj.phone
+                    this.batchInvoiceData[index].invoiceEmail = obj.email
+                    this.batchInvoiceData[index].invoicePhone = obj.mobilePhone
+                    this.batchInvoiceData[index].invoiceType = obj.invoiceType
+                } else {
+                    this.batchInvoiceData[index].invoiceHeaderName = ''
+                    this.batchInvoiceData[index].invoiceHeaderNumber = ''
+                    this.batchInvoiceData[index].invoiceHeaderAddress = ''
+                    this.batchInvoiceData[index].invoiceHeaderBank = ''
+                    // this.batchInvoiceData[index].invoiceHeaderBankNumber = ''
+                    // this.batchInvoiceData[index].invoiceHeaderPhone = ''
+                    this.batchInvoiceData[index].invoiceEmail = ''
+                    this.batchInvoiceData[index].invoicePhone = ''
+                    this.batchInvoiceData[index].invoiceType = obj.invoiceType
+                }
+            }
+
+            const postData = Object.assign({}, row)
+            this.baseRequest('getContent', postData).then(res => {
+                this.batchInvoiceData[index].remark = res.data
+                this.$forceUpdate()
+            })
+        },
+        getBankOptions() {
+            this.bankRequest('listAll', {}).then(res => {
+                this.bankOptions = res.data || []
+            })
+        },
+        bankChange(val, index) {
+        },
+        batchBankChange() {
+            this.batchInvoiceData.forEach(item => {
+                item.invoiceSellerBank = this.batchInvoiceSellerBank
+            })
+        },
+        batchTaxChange() {
+            this.batchInvoiceData.forEach(item => {
+                item.invoiceTax = this.batchInvoiceTax
+            })
+        },
+        batchTypeChange() {
+            this.batchInvoiceData.forEach(item => {
+                item.invoiceType = this.batchInvoiceType
+            })
+        },
+        confirmSubmit() {
+            if (!this.batchInvoiceData.length) {
+                this.$message.warning('无数据')
+                return
+            }
+            const returnList = this.batchInvoiceData.filter(x => !x.invoiceEmail || !x.invoicePhone ||
+              !x.invoiceHeaderId || !x.invoiceContent || !x.invoiceType || !x.invoiceSellerBank || !x.invoiceTax)
+            const passList = this.batchInvoiceData.filter(x => x.invoiceEmail &&
+              x.invoiceHeaderId && x.invoiceContent && x.invoiceType && x.invoiceSellerBank && x.invoiceTax)
+            if (!passList.length) {
+                this.$message.warning('无符合提交条件的数据，请确认发票发送邮箱是否为空')
+                return
+            }
+            this.$confirm('是否确定提交?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.loading = true
+                this.baseRequest('batchInvoice', { data: JSON.stringify(passList) }).then(res => {
+                    this.loading = false
+                    if (res.data.key === 200) {
+                        this.$message.success('提交成功')
+                        if (returnList.length) {
+                            this.batchInvoiceData = returnList
+                        } else {
+                            this.$emit('editClose', true)
+                        }
+                    } else if (res.data.key === 504) {
+                        this.$message.error(res.data.msg)
+                        this.$emit('editClose', true)
+                    } else {
+                        this.$message.error(res.data.msg)
+                    }
+                })
+            }).catch(() => {
+            })
+        },
+        handleClose() {
+            this.$emit('editClose')
+        },
+        checkRow({ row, rowIndex }) {
+            if (!row.invoiceEmail || !row.invoicePhone || !row.invoiceHeaderId || !row.invoiceContent ||
+              !row.invoiceType || !row.invoiceSellerBank || !row.invoiceTax) {
+                return {
+                    backgroundColor: '#FFF3F3',
+                    color: 'black',
+                    fontSize: '16px'
+                }
+            }
+        },
+        bankRequest(opUrl, postData) {
+            return this.$channel.globeRequest('InvoiceBankController', opUrl, postData, 'project')
+        },
+        mnpCompanyRequest(opUrl, postData) {
+            return this.$channel.globeRequest('MnpCompanyController', opUrl, postData, 'project')
+        },
+        headerRequest(opUrl, postData) {
+            return this.$channel.globeRequest('InvoiceHeaderController', opUrl, postData, 'project')
+        },
+        baseRequest(opUrl, postData) {
+            return this.$channel.globeRequest('InvoiceManageController', opUrl, postData, 'project')
+        }
+    }
+}
+</script>
+
+<style scoped>
+.my-select {
+  width: 25vw;
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+  .ch-input .el-input__inner {
+      border-color: #32323A;
+  }
+  .ch-input-size {
+      width: 150px;
+  }
+  .ch-button {
+      border-color: #32323A;
+      background-color: #32323A;
+      color: #fff;
+  }
+  .ch-button-warning {
+      margin-left: 10px;
+      border-color: #E6A23C;
+      background-color: #E6A23C;
+      color: #fff;
+  }
+  .ch-button-export {
+      margin-left: 10px;
+      border-color: #98CC1F;
+      background-color: #98CC1F;
+      color: #fff;
+  }
+  /deep/.el-dialog__header {
+      padding: 10px 20px;
+  }
+  /deep/.el-dialog__body {
+      padding: 10px 20px;
+  }
+</style>

src/views/invoice/components/formalInvoiceManageEdit.vue

@@ -168,7 +168,9 @@ export default {
             this.baseRequest('getById', postData).then(res => {
                 if (res.data) {
                     this.form = res.data
-                    this.getBankTaxRateByFloor()
+                    if (res.data.sendStatus == '0') {
+                        this.getBankTaxRateByFloor()
+                    }
                 }
             }).catch(err => {
                 this.$message.error(err)

src/views/invoice/components/invoiceBankEdit.vue

@@ -48,17 +48,6 @@
             <el-row>
               <el-col :span="3" class="col-txt"><span style="color: red">*</span><span>适用费用类型</span></el-col>
               <el-col :span="20" class="col-input">
-                <!--                <el-form-item prop="suitCostType">-->
-                <!--                  <el-checkbox-group v-model="checkList" @change="checkBoxChange">-->
-                <!--                    <el-checkbox label="租赁费（保证金）" />-->
-                <!--                    <el-checkbox label="物业费" />-->
-                <!--                    <el-checkbox label="水费" />-->
-                <!--                    <el-checkbox label="电费" />-->
-                <!--                    <el-checkbox label="停车费" />-->
-                <!--                    <el-checkbox label="场地费" />-->
-                <!--                    <el-checkbox label="其他" />-->
-                <!--                  </el-checkbox-group>-->
-                <!--                </el-form-item>-->
                 <el-table
                   ref="multipleTable"
                   v-loading="itemLoading"
@@ -191,6 +180,10 @@ export default {
         confirmSubmit() {
             const _this = this
             let flag = false
+            if (!_this.multipleSelection.length) {
+                _this.$message.warning('请勾选数据')
+                flag = true
+            }
             _this.multipleSelection.forEach(item => {
                 if (!item.taxRate) {
                     _this.$message.warning('请选择税率')

src/views/invoice/formalInvoiceManage.vue

@@ -99,7 +99,7 @@
         <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
         <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
         <el-button size="small" class="ch-button-export" @click="batchInvoice()">批量开票</el-button>
-<!--        <el-button size="small" type="danger" @click="handleBatchBadDebt()">红冲</el-button>-->
+        <!--        <el-button size="small" type="danger" @click="handleBatchBadDebt()">红冲</el-button>-->
         <el-button size="small" class="ch-button-export" :loading="excelFlag" @click="handleExportAll()">导出</el-button>
       </el-col>
     </el-row>
@@ -189,17 +189,34 @@
       <formal-invoice-manage-edit v-if="dialogVisible" ref="editInvoice" @cancel="cancel" />
     </el-dialog>
 
+    <!-- 批量开票 -->
+    <el-dialog
+      :title="dialogBatchTitle"
+      :visible.sync="dialogBatchVisible"
+      width="75%"
+      top="50px"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      class="statistic_base"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      custom-class="tagdialog"
+      @close="handleBatchClose"
+    >
+      <batch-invoice v-if="dialogBatchVisible" ref="batchInvoice" @editClose="handleBatchClose" />
+    </el-dialog>
+
   </div>
 </template>
 <script>
 import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
 import FormalInvoiceManageEdit from '@/views/invoice/components/formalInvoiceManageEdit.vue'
-import constant from '@/static/utils/constant'
+import BatchInvoice from '@/views/invoice/components/batchInvoice.vue'
 
 export default {
     name: 'FormalInvoiceManage',
-    components: { FormalInvoiceManageEdit },
+    components: { FormalInvoiceManageEdit,BatchInvoice },
     mixins: [Base, BaseData],
     data() {
         return {
@@ -212,18 +229,14 @@ export default {
             // 弹框相关
             dialogVisible: false,
             dialogTitle: '新增',
-            sendStatusOption: [],
-            invoiceStatusOption: [],
             selected: [],
-            excelFlag: false
+            excelFlag: false,
+            dialogBatchVisible: false,
+            dialogBatchTitle: ''
         }
     },
     mounted() {
         this.initDict(this.dc_key).then((res) => {
-            console.log('dc_data.INVOICE_STATUS', this.dc_data.INVOICE_STATUS)
-            console.log('dc_data.SEND_STATUS', this.dc_data.SEND_STATUS)
-            // this.sendStatusOption = this.dc_data.SEND_STATUS
-            // this.invoiceStatusOption = this.dc_data.INVOICE_STATUS
             this.getData()
         })
     },
@@ -300,18 +313,17 @@ export default {
             }
             let check = true
             this.selected.forEach(item => {
-                if (item.invoiceStatus !== '0' && item.invoiceStatus !== '2') {
+                if (item.sendStatus !== '0') {
                     check = false
                 }
             })
             if (!check) {
-                this.$message.warning('仅可对待开票和已发票作废的账单进行批量开票')
+                this.$message.warning('仅可对待推送的数据进行批量开票')
                 return
             }
             this.dialogBatchVisible = true
             this.dialogBatchTitle = '批量开票'
             this.$nextTick(() => {
-                // this.$refs.batchInvoice.initData(JSON.stringify(this.selected))
                 this.$refs.batchInvoice.initData(this.selected)
             })
         },
@@ -324,6 +336,12 @@ export default {
         cancel: function() {
             this.dialogVisible = false
         },
+        handleBatchClose(refresh) {
+            this.dialogBatchVisible = false
+            if (refresh) {
+                this.getData()
+            }
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('InvoiceManageController', opUrl, postData, 'project')
         }

src/views/invoice/invoiceManage.vue

@@ -207,16 +207,10 @@ export default {
             // 弹框相关
             dialogVisible: false,
             dialogTitle: '新增',
-            sendStatusOption: [],
-            invoiceStatusOption: []
         }
     },
     mounted() {
         this.initDict(this.dc_key).then((res) => {
-            console.log('dc_data.INVOICE_STATUS', this.dc_data.INVOICE_STATUS)
-            console.log('dc_data.SEND_STATUS', this.dc_data.SEND_STATUS)
-            // this.sendStatusOption = this.dc_data.SEND_STATUS
-            // this.invoiceStatusOption = this.dc_data.INVOICE_STATUS
             this.getData()
         })
     },

src/views/invoice/receiptManage.vue

@@ -0,0 +1,206 @@
+<template>
+  <div>
+    <el-row class="handle-box" style="margin-bottom: 10px">
+      <el-col :span="2" class="col-txt">
+        <span>买受人</span>
+      </el-col>
+      <el-col :span="4" class="col-input">
+        <el-input v-model="search.buyerName" @keyup.enter.native="handleSearch()" />
+      </el-col>
+      <el-col :span="2" class="col-txt">
+        <span>房屋</span>
+      </el-col>
+      <el-col :span="4" class="col-input">
+        <el-input v-model="search.houseName" @keyup.enter.native="handleSearch()" />
+      </el-col>
+    </el-row>
+    <el-row class="handle-box" style="margin-bottom: 10px;text-align: right">
+      <el-col :span="24" style="margin-top: 20px">
+        <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
+        <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
+      </el-col>
+    </el-row>
+    <el-row class="handle-box">
+      <el-col :span="24">
+        <el-table
+          v-loading="loading"
+          :data="AllData"
+          row-class-name="g_table_row"
+          border
+          :header-cell-style="{background:'#f2f2f2'}"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column type="index" width="60" />
+          <el-table-column label="批次号" prop="number" />
+          <el-table-column label="买受人" prop="buyerName" width="200" />
+          <el-table-column label="房屋" prop="houseName" width="200" />
+
+          <el-table-column label="票据类型" prop="receiptTypeStr" />
+          <el-table-column label="票面金额" prop="receiptMoney" />
+          <el-table-column label="票据编号" prop="receiptNumber" width="200">
+            <template scope="scope">
+              <el-button size="mini" type="text" @click="downLoad(scope.row)">
+                {{ scope.row.receiptNumber }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="经办人" prop="createdName" />
+          <el-table-column label="经办时间" prop="createdAt" width="110" />
+          <el-table-column label="票据状态" prop="receiptStatusStr">
+            <template scope="scope">
+              <span
+                :style="{'color':scope.row.receiptStatusStr==='已红冲'?'red'
+                  :scope.row.receiptStatusStr==='已开'?'green':'gray'}"
+              >
+                {{ scope.row.receiptStatusStr }}
+              </span>
+            </template>
+          </el-table-column>
+            <el-table-column label="关联票号" prop="associationNumber" width="200">
+                <template scope="scope">
+                    <el-button size="mini" type="text" @click="downLoad(scope.row)">
+                        {{ scope.row.associationNumber }}
+                    </el-button>
+                </template>
+            </el-table-column>
+
+        </el-table>
+        <div class="table-page">
+          <el-pagination
+            :current-page.sync="currentPage"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="pageSize"
+            background
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="allpage"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+<script>
+import Base from '@/views/base/base'
+import BaseData from '@/views/base/baseData'
+
+export default {
+    name: 'ReceiptManage',
+    components: { },
+    mixins: [Base, BaseData],
+    data() {
+        return {
+            dc_key: ['RECEIPT_TYPE', 'RECEIPT_STATUS'],
+            // 列表相关
+            search: {
+            },
+            AllData: [],
+            loading: false,
+            // 弹框相关
+            dialogVisible: false,
+            dialogTitle: '新增',
+            selected: [],
+            excelFlag: false,
+            dialogBatchVisible: false,
+            dialogBatchTitle: ''
+        }
+    },
+    mounted() {
+        this.initDict(this.dc_key).then((res) => {
+            this.getData()
+        })
+    },
+    methods: {
+
+        getData: function() {
+            const _this = this
+            _this.loading = true
+            _this.AllData = []
+
+            this.search.pageNum = this.currentPage
+            this.search.pageSize = this.pageSize
+            this.baseRequest('listByModel', this.search).then((res) => {
+                if (res.data.rows) {
+                    res.data.rows.forEach(function(item) {
+                        const json = _this.getItemJson(item)
+                        _this.AllData.push(json)
+                    })
+                    _this.allpage = res.data.total
+                }
+                _this.loading = false
+            }).catch((e) => {
+                // console.log(e)
+            })
+            // this.initOutData()
+        },
+        handleSearch: function() {
+            this.getData()
+        },
+        handleReset: function() {
+            for (const i in this.search) {
+                if (i !== 'pageNum' && i !== 'pageSize') {
+                    this.search[i] = ''
+                }
+            }
+            this.handleSearch()
+        },
+        getItemJson: function(item) {
+            item.number = item.batchNumber + '-' + item.roomSelectionNumber
+            item.receiptTypeStr = this.dc_map.RECEIPT_TYPE[item.receiptType]
+            item.receiptStatusStr = this.dc_map.RECEIPT_STATUS[item.receiptStatus]
+            return item
+        },
+
+        handleView(val) {
+
+        },
+        handleSelectionChange(val) {
+            this.selected = val
+        },
+        cancel: function() {
+            this.dialogVisible = false
+        },
+        downLoad() {
+
+        },
+        baseRequest(opUrl, postData) {
+            return this.$channel.globeRequest('ReceiptManageController', opUrl, postData, 'project')
+        }
+    }
+}
+</script>
+
+<style scoped>
+  .ch-input .el-input__inner {
+      border-color: #32323A;
+  }
+  .ch-input-size {
+      width: 150px;
+  }
+  .ch-button {
+      border-color: #32323A;
+      background-color: #32323A;
+      color: #fff;
+  }
+  .ch-button-warning {
+      margin-left: 10px;
+      border-color: #E6A23C;
+      background-color: #E6A23C;
+      color: #fff;
+  }
+  .ch-button-export {
+      margin-left: 10px;
+      border-color: #98CC1F;
+      background-color: #98CC1F;
+      color: #fff;
+  }
+  /deep/.el-dialog__header {
+      padding: 10px 20px;
+  }
+  /deep/.el-dialog__body {
+      padding: 10px 20px;
+  }
+</style>

src/views/parkAssets/component/uploadCost.vue

@@ -177,7 +177,10 @@ export default {
                     // this.$emit('cancelUpload', true)
                     this.successCount = res.data.data.successCount
                     this.errorCount = res.data.data.errorCount
-                    this.tableData = res.data.data.errorList || []
+                    res.data.data.errorList.forEach(item => {
+                        const json = this.getItemJson(item)
+                        this.tableData.push(json)
+                    })
                     this.isImport = true
                     console.log('上传成功....')
                 } else {
@@ -243,7 +246,10 @@ export default {
                     // this.$emit('cancelUpload', true)
                     this.successCount = res.data.data.successCount
                     this.errorCount = res.data.data.errorCount
-                    this.tableData = res.data.data.errorList || []
+                    res.data.data.errorList.forEach(item => {
+                        const json = this.getItemJson(item)
+                        this.tableData.push(json)
+                    })
                     this.isImport = true
                     console.log('上传成功....')
                 } else {
@@ -275,7 +281,10 @@ export default {
                     // this.$emit('cancelUpload', true)
                     this.successCount = res.data.data.successCount
                     this.errorCount = res.data.data.errorCount
-                    this.tableData = res.data.data.errorList || []
+                    res.data.data.errorList.forEach(item => {
+                        const json = this.getItemJson(item)
+                        this.tableData.push(json)
+                    })
                     this.isImport = true
                     console.log('上传成功....')
                 } else {
@@ -318,123 +327,28 @@ export default {
             }
         },
         exportErrorGroup() {
+            const _this = this
+            _this.excelFlag = true
             if (!this.tableData.length) {
                 this.$message.error('失败记录为空！')
                 return
             }
-            const outData = []
-            const title = []
-            title.push('楼盘/小区名称')
-            title.push('性质')
-            title.push('预销售许可证编号')
-            title.push('开发公司')
-            title.push('总建筑面积(㎡)')
-            title.push('总用地面积(㎡)')
-            title.push('立项批文')
-            title.push('工程规划许可证')
-            title.push('施工许可证')
-            title.push('土地证号')
-            title.push('用地许可证号')
-            title.push('容积率')
-            title.push('绿化率')
-            title.push('标准单价')
-            title.push('超标单价')
-            title.push('楼盘面积测绘状态')
-            title.push('楼盘销售状态')
-            title.push('行政区划')
-            title.push('详细地址')
-            title.push('备注')
-            title.push('异常原因')
-            outData.push(title)
-            const errorFiled = []
-            this.tableData.forEach((item, index) => {
-                const jsonArray = []
-                jsonArray.push(item.groupName)
-                jsonArray.push(item.nature)
-                jsonArray.push(item.preSalesLicenseNumber)
-                jsonArray.push(item.companyName)
-                jsonArray.push(item.buildArea)
-                jsonArray.push(item.landArea)
-                jsonArray.push(item.projectApprovalDocument)
-                jsonArray.push(item.engineeringPlanningPermit)
-                jsonArray.push(item.constructionPermit)
-                jsonArray.push(item.landCertificateNumber)
-                jsonArray.push(item.landUsePermitNumber)
-                jsonArray.push(item.volumeRatio)
-                jsonArray.push(item.greenRatio)
-                jsonArray.push(item.price)
-                jsonArray.push(item.exceededPrice)
-                jsonArray.push(item.areaStatus)
-                jsonArray.push(item.saleStatus)
-                jsonArray.push(item.regionalismCode)
-                jsonArray.push(item.address)
-                jsonArray.push(item.introduction)
-                jsonArray.push(item.reason)
-                outData.push(jsonArray)
-            })
-            const outSize = []
-            title.forEach(item => {
-                if (item.length > 4) {
-                    outSize.push({
-                        wch: 30
-                    })
-                } else {
-                    outSize.push({
-                        wch: 15
-                    })
-                }
+            axios({
+                headers: {
+                    'MVVM-Key': String(new Date().getTime()),
+                    xx: 'anything'
+                },
+                method: 'post',
+                url: constant.BASE_URI + '/ParkInfoController/errorListExport',
+                responseType: 'blob',
+                data: this.tableData
+            }).then(res => {
+                this.downloadExcel(res.data, '失败记录.xlsx')
+                _this.excelFlag = false
+            }).catch((err) => {
+                console.log(err)
+                _this.excelFlag = false
             })
-            const fileName = '失败记录导出 ' + new Date().Format('yyyy-MM-dd hh:mm')
-            const ws = XLSX.utils.aoa_to_sheet(outData)
-            ws['!cols'] = outSize
-            ws['!rows'] = []
-            if (errorFiled.length) {
-                errorFiled.forEach(item => {
-                    if (!ws[item]) {
-                        ws[item] = {
-                            v: '',
-                            t: 's',
-                            s: {
-                                fill: {
-                                    bgColor: { indexed: 64 }, fgColor: { rgb: 'FF0000' }
-                                },
-                                font: {
-                                    color: { rgb: 'FFFFFF' }
-                                }
-                            }
-                        }
-                    } else {
-                        ws[item].s = {
-                            fill: {
-                                bgColor: { indexed: 64 }, fgColor: { rgb: 'FF0000' }
-                            },
-                            font: {
-                                color: { rgb: 'FFFFFF' }
-                            }
-                        }
-                    }
-                })
-            }
-            const wb = XLSX.utils.book_new()
-            XLSX.utils.book_append_sheet(wb, ws, fileName)
-            const tmpDown = new Blob([
-                this.s2ab(
-                    XLSXStyle.write(wb, {
-                        bookType: 'xlsx',
-                        bookSST: true,
-                        type: 'binary',
-                        cellStyles: true
-                    })
-                )
-            ])
-            const elink = document.createElement('a')
-            elink.download = decodeURIComponent(fileName + '.xlsx')
-            elink.style.display = 'none'
-            elink.href = URL.createObjectURL(tmpDown)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href) // 释放URL 对象
-            document.body.removeChild(elink)
         },
         exportErrorFQ() {
             const _this = this
@@ -461,238 +375,52 @@ export default {
             })
         },
         exportErrorBuild() {
+            const _this = this
+            _this.excelFlag = true
             if (!this.tableData.length) {
                 this.$message.error('失败记录为空！')
                 return
             }
-            const outData = []
-            const title = []
-            title.push('楼盘/小区名称')
-            title.push('分期名称')
-            title.push('单元/楼栋号')
-            title.push('总面积（㎡）')
-            title.push('住宅面积（㎡）')
-            title.push('非住宅面积（㎡）')
-            title.push('占地面积（㎡）')
-            title.push('地下面积（㎡）')
-            title.push('房号')
-            title.push('套数')
-            title.push('总层数')
-            title.push('地上层数')
-            title.push('地下层数')
-            title.push('结构')
-            title.push('行政区划')
-            title.push('地号')
-            title.push('备注')
-            title.push('标准价格参考层及差价系数备注说明')
-            title.push('异常原因')
-            outData.push(title)
-            const errorFiled = []
-            this.tableData.forEach((item, index) => {
-                const jsonArray = []
-                jsonArray.push(item.groupName)
-                jsonArray.push(item.discName)
-                jsonArray.push(item.buildNum)
-                jsonArray.push(item.area)
-                jsonArray.push(item.residentialArea)
-                jsonArray.push(item.unResidentialArea)
-                jsonArray.push(item.coverAnArea)
-                jsonArray.push(item.undergroundArea)
-                jsonArray.push(item.roomNum)
-                jsonArray.push(item.numberInfo)
-                jsonArray.push(item.floors)
-                jsonArray.push(item.overgroundFloors)
-                jsonArray.push(item.undergroundFloors)
-                jsonArray.push(item.structure)
-                jsonArray.push(item.regionalismCode)
-                jsonArray.push(item.landCode)
-                jsonArray.push(item.remark)
-                jsonArray.push(item.priceRemark)
-                jsonArray.push(item.reason)
-                outData.push(jsonArray)
-            })
-            const outSize = []
-            title.forEach(item => {
-                if (item.length > 4) {
-                    outSize.push({
-                        wch: 30
-                    })
-                } else {
-                    outSize.push({
-                        wch: 15
-                    })
-                }
+            axios({
+                headers: {
+                    'MVVM-Key': String(new Date().getTime()),
+                    xx: 'anything'
+                },
+                method: 'post',
+                url: constant.BASE_URI + '/MnpBuildingController/errorListExport',
+                responseType: 'blob',
+                data: this.tableData
+            }).then(res => {
+                this.downloadExcel(res.data, '失败记录.xlsx')
+                _this.excelFlag = false
+            }).catch((err) => {
+                console.log(err)
+                _this.excelFlag = false
             })
-            const fileName = '失败记录导出 ' + new Date().Format('yyyy-MM-dd hh:mm')
-            const ws = XLSX.utils.aoa_to_sheet(outData)
-            ws['!cols'] = outSize
-            ws['!rows'] = []
-            if (errorFiled.length) {
-                errorFiled.forEach(item => {
-                    if (!ws[item]) {
-                        ws[item] = {
-                            v: '',
-                            t: 's',
-                            s: {
-                                fill: {
-                                    bgColor: { indexed: 64 }, fgColor: { rgb: 'FF0000' }
-                                },
-                                font: {
-                                    color: { rgb: 'FFFFFF' }
-                                }
-                            }
-                        }
-                    } else {
-                        ws[item].s = {
-                            fill: {
-                                bgColor: { indexed: 64 }, fgColor: { rgb: 'FF0000' }
-                            },
-                            font: {
-                                color: { rgb: 'FFFFFF' }
-                            }
-                        }
-                    }
-                })
-            }
-            const wb = XLSX.utils.book_new()
-            XLSX.utils.book_append_sheet(wb, ws, fileName)
-            const tmpDown = new Blob([
-                this.s2ab(
-                    XLSXStyle.write(wb, {
-                        bookType: 'xlsx',
-                        bookSST: true,
-                        type: 'binary',
-                        cellStyles: true
-                    })
-                )
-            ])
-            const elink = document.createElement('a')
-            elink.download = decodeURIComponent(fileName + '.xlsx')
-            elink.style.display = 'none'
-            elink.href = URL.createObjectURL(tmpDown)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href) // 释放URL 对象
-            document.body.removeChild(elink)
         },
         exportErrorRoom() {
+            const _this = this
+            _this.excelFlag = true
             if (!this.tableData.length) {
                 this.$message.error('失败记录为空！')
                 return
             }
-            const outData = []
-            const title = []
-            title.push('楼盘/小区名称')
-            title.push('分期名称')
-            title.push('单元/楼栋号')
-            title.push('户室号')
-            title.push('所在层')
-            title.push('预测套内面积')
-            title.push('预测分摊面积')
-            title.push('预测建筑面积')
-            title.push('预测土地面积')
-            title.push('实测套内面积')
-            title.push('实测分摊面积')
-            title.push('实测建筑面积')
-            title.push('实测土地面积')
-            title.push('用途')
-            title.push('户编号')
-            title.push('装修情况')
-            title.push('2.2M以')
-            title.push('户型')
-            title.push('备注')
-            title.push('可售状态')
-            title.push('异常原因')
-            outData.push(title)
-            const errorFiled = []
-            this.tableData.forEach((item, index) => {
-                const jsonArray = []
-                jsonArray.push(item.groupName)
-                jsonArray.push(item.discName)
-                jsonArray.push(item.buildNum)
-                jsonArray.push(item.roomNo)
-                jsonArray.push(item.floor)
-                jsonArray.push(item.predictionInternalArea)
-                jsonArray.push(item.predictionShareArea)
-                jsonArray.push(item.predictionBuildArea)
-                jsonArray.push(item.predictionLandArea)
-                jsonArray.push(item.actualInternalArea)
-                jsonArray.push(item.actualShareArea)
-                jsonArray.push(item.actualBuildArea)
-                jsonArray.push(item.actualLandArea)
-                jsonArray.push(item.roomUse)
-                jsonArray.push(item.roomNumber)
-                jsonArray.push(item.decorationSituation)
-                jsonArray.push(item.twoPointTwo)
-                jsonArray.push(item.houseType)
-                jsonArray.push(item.remark)
-                jsonArray.push(item.saleStatus)
-                jsonArray.push(item.reason)
-                outData.push(jsonArray)
-            })
-            const outSize = []
-            title.forEach(item => {
-                if (item.length > 4) {
-                    outSize.push({
-                        wch: 30
-                    })
-                } else {
-                    outSize.push({
-                        wch: 15
-                    })
-                }
+            axios({
+                headers: {
+                    'MVVM-Key': String(new Date().getTime()),
+                    xx: 'anything'
+                },
+                method: 'post',
+                url: constant.BASE_URI + '/ParkRoomController/errorListExport',
+                responseType: 'blob',
+                data: this.tableData
+            }).then(res => {
+                this.downloadExcel(res.data, '失败记录.xlsx')
+                _this.excelFlag = false
+            }).catch((err) => {
+                console.log(err)
+                _this.excelFlag = false
             })
-            const fileName = '失败记录导出 ' + new Date().Format('yyyy-MM-dd hh:mm')
-            const ws = XLSX.utils.aoa_to_sheet(outData)
-            ws['!cols'] = outSize
-            ws['!rows'] = []
-            if (errorFiled.length) {
-                errorFiled.forEach(item => {
-                    if (!ws[item]) {
-                        ws[item] = {
-                            v: '',
-                            t: 's',
-                            s: {
-                                fill: {
-                                    bgColor: { indexed: 64 }, fgColor: { rgb: 'FF0000' }
-                                },
-                                font: {
-                                    color: { rgb: 'FFFFFF' }
-                                }
-                            }
-                        }
-                    } else {
-                        ws[item].s = {
-                            fill: {
-                                bgColor: { indexed: 64 }, fgColor: { rgb: 'FF0000' }
-                            },
-                            font: {
-                                color: { rgb: 'FFFFFF' }
-                            }
-                        }
-                    }
-                })
-            }
-            const wb = XLSX.utils.book_new()
-            XLSX.utils.book_append_sheet(wb, ws, fileName)
-            const tmpDown = new Blob([
-                this.s2ab(
-                    XLSXStyle.write(wb, {
-                        bookType: 'xlsx',
-                        bookSST: true,
-                        type: 'binary',
-                        cellStyles: true
-                    })
-                )
-            ])
-            const elink = document.createElement('a')
-            elink.download = decodeURIComponent(fileName + '.xlsx')
-            elink.style.display = 'none'
-            elink.href = URL.createObjectURL(tmpDown)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href) // 释放URL 对象
-            document.body.removeChild(elink)
         },
         s2ab(s) {
             var cuf
@@ -855,6 +583,7 @@ export default {
             title.push('楼盘/小区名称')
             title.push('分期名称')
             title.push('单元/楼栋号')
+            title.push('施工号')
             title.push('总面积（㎡）')
             title.push('住宅面积（㎡）')
             title.push('非住宅面积（㎡）')
@@ -1002,7 +731,7 @@ export default {
         },
         getItemJson(item) {
             item.groupNameStr = item.groupName.replace('{', '').replace('}', '')
-            item.discNameStr = item.discName.replace('{', '').replace('}', '')
+            item.discNameStr = item.discName ? item.discName.replace('{', '').replace('}', '') : ''
             item.buildNumStr = item.buildNum ? item.buildNum.replace('{', '').replace('}', '') : ''
             item.roomNoStr = item.roomNo ? item.roomNo.replace('{', '').replace('}', '') : ''
             return item

src/views/receiveRefundsManagement/intentionalDepositManagement/index.vue

@@ -33,7 +33,7 @@
           <el-table-column label="经办人" prop="createdAt" />
           <el-table-column header-align="center" label="操作" width="380">
             <template scope="scope">
-              <el-button :disabled="scope.row.status === 3" size="mini" type="text" @click="handleEdit(scope.row)">转定金</el-button>
+              <el-button :disabled="scope.row.status !== 1" size="mini" type="text" @click="handleEdit(scope.row)">转定金</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <el-button :disabled="scope.row.status === 1" size="mini" type="text" @click="downLoad(scope.row)">意向金收据</el-button>
               <el-button :disabled="scope.row.status === 2" size="mini" type="text" @click="handleRefund(scope.row)">退意向金</el-button>

src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -223,8 +223,11 @@ export default {
             this.$emit('cancel')
         },
         handleRoomCancel(data) {
-            this.form.houseName = data.buildName + '-' + data.roomNo
-            this.form.houseId = data.houseId
+            console.log('data', data)
+            if (data) {
+                this.form.houseName = data.buildName + '-' + data.roomNo
+                this.form.houseId = data.houseId
+            }
             this.dialogHouseVisible = false
         },
 

src/views/receiveRefundsManagement/maintenanceFundsManagement/index.vue

@@ -6,19 +6,18 @@
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span>房屋&nbsp;</span>
         <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="房屋" size="small" @keyup.enter.native="handleSearch()" />
-        <span>合同状态&nbsp;</span>
+        <span>收款状态&nbsp;</span>
         <el-select
-          v-model="search.status"
+          v-model="search.fundCollectionStatus"
           clearable
           filterable
-          placeholder="合同状态"
+          placeholder="收款状态"
           :popper-append-to-body="false"
           popper-class="statistic_base"
-          size="small"
           @change="handleSearch"
         >
           <el-option
-            v-for="item in dc_data.CONTRACT_STATUS"
+            v-for="item in dc_data.MAINTENANCE_FUNDS_STATUS"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -26,28 +25,13 @@
             popper-class="statistic_base"
           />
         </el-select>
-        <span>签约日期&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateFrom"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateTo"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24" style="margin-top: 20px">
         <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 type="primary" size="small" style="float: right" @click="downLoad()">&nbsp;专项维修资金凭证</el-button>
       </el-col>
     </el-row>
     <el-row class="handle-box">
@@ -201,6 +185,9 @@ export default {
         },
         cancel: function() {
             this.dialogVisible = false
+        },
+        downLoad() {
+
         },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('MaintenanceFundsManagementController', opUrl, postData, 'project')

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -40,7 +40,7 @@
                     popper-class="statistic_base"
                   >
                     <el-option
-                      v-for="item in dc_data.PAYMENT_METHODS"
+                      v-for="item in dc_data.COLLECTION_METHODS"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -158,7 +158,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['CONTENT_TYPE', 'PAYMENT_METHODS'],
+            dc_key: ['CONTENT_TYPE', 'PAYMENT_METHODS', 'COLLECTION_METHODS'],
             form: {
 
             },

src/views/receiveRefundsManagement/paymentManagement/index.vue

@@ -6,19 +6,19 @@
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span>房屋&nbsp;</span>
         <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="房屋" size="small" @keyup.enter.native="handleSearch()" />
-        <span>合同状态&nbsp;</span>
+        <span>收款状态&nbsp;</span>
         <el-select
-          v-model="search.status"
+          v-model="search.collectionStatus"
           clearable
           filterable
-          placeholder="合同状态"
+          placeholder="收款状态"
           :popper-append-to-body="false"
           popper-class="statistic_base"
           size="small"
           @change="handleSearch"
         >
           <el-option
-            v-for="item in dc_data.CONTRACT_STATUS"
+            v-for="item in dc_data.HOUSE_PAYMENT_STATUS"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -26,22 +26,6 @@
             popper-class="statistic_base"
           />
         </el-select>
-        <span>签约日期&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateFrom"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateTo"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">

src/views/receiveRefundsManagement/paymentManagement/paymentRegistration.vue

@@ -137,7 +137,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['PAYMENT_METHODS', 'CONTENT_TYPE'],
+            dc_key: ['PAYMENT_METHODS', 'CONTENT_TYPE', 'COLLECTION_METHODS'],
             form: {
 
             },
@@ -208,7 +208,7 @@ export default {
             })
         },
         getItemJson: function(item) {
-            item.paymentMethodStr = this.dc_map.PAYMENT_METHODS[item.paymentMethod]
+            item.paymentMethodStr = this.dc_map.COLLECTION_METHODS[item.paymentMethod]
             item.contentTypeStr = this.dc_map.CONTENT_TYPE[item.contentType]
             item.bankFullName = item.bankName + item.bankBranchName + item.bankNumber
             return item

src/views/saleManage/checkIn/checkIn.vue

@@ -17,8 +17,7 @@
     <el-row class="handle-box">
       <el-col :span="24">
         <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
-          <el-table-column type="index" width="60" />
-          <el-table-column label="合同编号" prop="contractNumber" />
+          <el-table-column label="序号" type="index" width="60" />
           <el-table-column label="合同编号">
             <template scope="scope">
               <el-link :underline="false" type="primary" @click="handleView2(scope.row)">{{ scope.row.contractNumber }}</el-link>