Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

 admin/src/views/contract/components/pendingBills.vue

@@ -10,19 +10,19 @@
            <div class="zd_list">
                <div class="zd_list_row">
                    <span>待收款账单数</span>
                    <span>2</span>
                    <span>{{info.inAmount || 0}}</span>
                </div>
                <div class="zd_list_row">
                    <span>待收款金额</span>
                    <span>￥247.00</span>
                    <span>￥{{info.inFee || 0}}</span>
                </div>
                <div class="zd_list_row">
                    <span>待付款账单数</span>
                    <span>3</span>
                    <span>{{info.payAmount || 0}}</span>
                </div>
                <div class="zd_list_row">
                    <span>待付款金额</span>
                    <span>￥247.00</span>
                    <span>￥{{info.payFee || 0}}</span>
                </div>
            </div>
            <div class="zd_content">
@@ -30,7 +30,7 @@
                    <span>账单</span>
                </div>
                <el-table
                    :data="tableData"
                    :data="info.ywContractBillList"
                    border
                    style="width: 100%">
                    <el-table-column
@@ -38,27 +38,38 @@
                        label="账单编号">
                    </el-table-column>
                    <el-table-column
                        prop="name"
                        label="费用类型">
                        <template slot-scope="{row}">
                            <span v-if="row.costType === 0">租赁费</span>
                            <span v-if="row.costType === 1">物业费</span>
                            <span v-if="row.costType === 2">租赁押金</span>
                            <span v-if="row.costType === 3">物业押金</span>
                            <span v-if="row.costType === 4">水电费</span>
                            <span v-if="row.costType === 5">杂项费</span>
                            <span v-if="row.costType === 6">其他</span>
                            <span v-if="row.costType === 7">保证金</span>
                        </template>
                    </el-table-column>
                    <el-table-column
                        prop="address"
                        label="计费周期">
                        <template slot-scope="{row}">
                            {{row.startDate}}~{{row.endDate}}
                        </template>
                    </el-table-column>
                    <el-table-column
                        prop="address"
                        prop="receivableFee"
                        label="应收付金额/原始应收付">
                    </el-table-column>
                    <el-table-column
                        prop="address"
                        prop="actReceivableFee"
                        label="实收/付金额">
                    </el-table-column>
                    <el-table-column
                        prop="address"
                        prop="needReceivableFee"
                        label="需收/付金额">
                    </el-table-column>
                    <el-table-column
                        prop="address"
                        prop="receivableFee"
                        label="应收/付日期">
                    </el-table-column>
                </el-table>
@@ -70,6 +81,7 @@
<script>
  import GlobalWindow from '@/components/common/GlobalWindow'
  import BaseOpera from '@/components/base/BaseOpera'
  import { getWaitDealList } from '@/api/ywContractBill'
  export default {
    name: 'pendingBills',
    components: {
@@ -78,11 +90,18 @@
    extends: BaseOpera,
    data () {
      return {
        tableData: []
        info: []
      }
    },
    methods: {
    
      open (title, contractId) {
        this.title = title
        getWaitDealList(contractId)
            .then(res => {
              this.info = res
              this.visible = true
            })
      }
    }
  }
</script>