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

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

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

@@ -86,12 +86,19 @@
                <el-table-column
                    width="100"
                    label="费用类型">
                    <template slot-scope="{row}">
                        <span v-if="row.costType === 0">租赁费</span>
                        <span v-if="row.costType === 1">物业费</span>
                        <span v-if="row.costType === 4">水电费</span>
                        <span v-if="row.costType === 5">杂项费</span>
                        <span v-if="row.costType === 6">其他</span>
                    <template slot-scope="scope">
                        <div style="display: flex; align-items: center;">
                            <span v-if="scope.row.costType === 0">租赁费</span>
                            <span v-if="scope.row.costType === 1">物业费</span>
                            <span v-if="scope.row.costType === 4">水电费</span>
                            <span v-if="scope.row.costType === 5">杂项费</span>
                            <span v-if="scope.row.costType === 6">其他</span>
                            <i class="el-icon-delete"
                               style="color: red; margin-left: 10px; font-size: 18px; cursor: pointer;"
                               @click="deleRow(scope.$index)"
                               v-if="scope.row.date && scope.row.date.length !==0">
                            </i>
                        </div>
                    </template>
                </el-table-column>
                <el-table-column
@@ -270,6 +277,10 @@
        this.changeBtDate(this.form.btDate)
        this.visible = true
      },
      deleRow(index) {
        this.info.terminateList.splice(index, 1)
        this.countData()
      },
      getDayTime () {
        const today = new Date();
        const year = today.getFullYear();