Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

liukangdong

2024-12-03 8dcbe3d898f6c60ef3226095d994ca8953bf5f6d

 admin/src/views/finance/bull.vue

@@ -9,7 +9,7 @@
      <div class="btns">
        <el-button type="primary" @click="addOpen" icon="el-icon-plus"
          v-permissions="['business:ywpatrolline:create']">新建</el-button>
        <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">导出</el-button>
<!--        <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">导出</el-button>-->
      </div>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
@@ -38,24 +38,40 @@
      <el-table-column prop="needReceivableFee" label="需收金额" min-width="100" show-overflow-tooltip />
      <el-table-column label="费用类型" min-width="100" show-overflow-tooltip>
        <template slot-scope="{row}">
          <span v-if="row.feeType === 0">周期费用</span>
          <span v-if="row.feeType === 1">一次性费用</span>
          <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 label="是否逾期" min-width="100" show-overflow-tooltip>
        <template slot-scope="{row}">
          <span v-if="row.isOverdue === 0">否</span>
          <span v-if="row.isOverdue === 1">是</span>
          <span v-if="row.isOverdue === 0">未逾期</span>
          <span v-if="row.isOverdue === 1" style="color: red;">已逾期</span>
        </template>
      </el-table-column>
      <el-table-column label="计费周期" min-width="100" show-overflow-tooltip>
      <el-table-column label="计费周期" min-width="200" show-overflow-tooltip>
        <template slot-scope="{row}">
          {{ row.startDate }} ~ {{ row.endDate }}
        </template>
      </el-table-column>
      <el-table-column prop="planPayDate" label="应收日期" min-width="100" show-overflow-tooltip />
      <el-table-column prop="createTime" label="账单来源" min-width="100" show-overflow-tooltip />
      <el-table-column prop="statusName" label="合同状态" min-width="100" fixed="right" show-overflow-tooltip />
      <el-table-column label="账单来源" min-width="100" show-overflow-tooltip>
        <template slot-scope="{row}">
          <span v-if="row.type === 0">合同账单</span>
          <span v-if="row.type === 1">自建账单</span>
        </template>
      </el-table-column>
      <el-table-column label="账单状态" min-width="100" fixed="right" show-overflow-tooltip>
        <template slot-scope="{row}">
          <span v-if="row.status === 0">开启</span>
          <span v-if="row.status === 1" style="color: red;">关闭</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" min-width="120" fixed="right">
        <template slot-scope="{row}">
          <el-button type="text" @click="handleDetail(row)" icon="el-icon-edit" v-permissions="['business:category:update']">查看详情</el-button>
@@ -108,6 +124,11 @@
            label: '客户名称'
          },
          {
            filed: 'contractCode',
            type: 'input',
            label: '合同编号'
          },
          {
            filed: 'status',
            type: 'select',
            label: '账单状态',
@@ -150,6 +171,11 @@
    },
    getList (page) {
      const { pagination, filters } = this
      let form = JSON.parse(JSON.stringify(filters))
      if (form && form.selDate && form.selDate.length > 0) {
        form.planPayDateStart = form.payDate[0]
        form.planPayDateEnd = form.payDate[1]
      }
      this.loading = true
      fetchList({
        model: {