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

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

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

@@ -17,8 +17,8 @@
          <el-tag type="info" v-if="info.status === 4">已退租</el-tag>
        </div>
        <div>
          <el-button type="primary" @click="$refs.pendingBills.open('待处理账单')">查看待处理账单</el-button>
          <el-button @click="$refs.terminationAgreement.open('退租协议')">查看退租协议</el-button>
          <el-button type="primary" @click="$refs.pendingBills.open('待处理账单', id)" v-if="info.status === 3">查看待处理账单</el-button>
          <el-button @click="$refs.terminationAgreement.open('退租协议', id)" v-if="[3,4].includes(info.status)">查看退租协议</el-button>
          <el-button plain type="danger" v-if="[0, 1, 2].includes(info.status)" @click="refund">退租</el-button>
        </div>
      </div>
@@ -197,6 +197,13 @@
        v-loading="loading"
        style="width: 100%">
        <el-table-column
          width="150"
          label="账单编号">
          <template slot-scope="{row}">
            <el-button type="text" @click="openBill(row.id)">{{row.code}}</el-button>
          </template>
        </el-table-column>
        <el-table-column
          label="费用类型">
          <template slot-scope="{row}">
            <span v-if="row.costType === 0">租赁费</span>
@@ -327,6 +334,8 @@
    <PendingBills ref="pendingBills" />
    <!--  退租协议  -->
    <TerminationAgreement ref="terminationAgreement" />
    <!--  账单详情  -->
    <BullDetail ref="bullDetail" />
  </GlobalWindow>
</template>

@@ -336,6 +345,7 @@
import TerminateLease from './terminateLease'
import PendingBills from './pendingBills'
import TerminationAgreement from './terminationAgreement'
import BullDetail from '../../finance/components/bullDetail'
import { getById } from '@/api/contract'
import { fetchList } from '@/api/bill'
export default {
@@ -343,7 +353,8 @@
    GlobalWindow,
    TerminateLease,
    PendingBills,
    TerminationAgreement
    TerminationAgreement,
    BullDetail
  },
  extends: BaseOpera,
  data() {
@@ -375,6 +386,9 @@
    xiazai (url) {
      window.open(url)
    },
    openBill(id) {
      this.$refs.bullDetail.open('账单详情', id)
    },
    returnUnit (type) {
      switch (type) {
        case 0: