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

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 admin/src/views/finance/components/bullDetail.vue

@@ -8,23 +8,26 @@
          <el-tag type="success" v-if="info.status === 0">开启</el-tag>
          <el-tag type="info" v-if="info.status === 1">关闭</el-tag>
        </div>
        <el-button plain type="primary" v-if="![1].includes(info.payStatus)" @click="$refs.flowingWater.open('创建收支流水', {
          billType: returnBillType(),
          billId: info.id,
          costType: info.costType,
          receivableFee: Math.abs(info.needReceivableFee),
          costTypeName: returnText(info.costType),
          contractCode: info.contractCode,
          contractId: info.contractId,
          startDate: info.startDate,
          endDate: info.endDate,
          multifileList: [],
          date: `${info.startDate} ~ ${info.endDate}`,
          companyId: info.companyId,
          companyName: info.companyName,
          actReceivableFee: Math.abs(info.needReceivableFee),
          needReceivableFeeCopy: info.needReceivableFee
        })">新建收支流水</el-button>
        <div style="display: flex; align-items: center;">
          <el-button @click="$refs.call.open('发送催缴通知', [info.id])" v-if="info.isOverdue === 1 && info.billType === 0">发送缴费通知</el-button>
          <el-button plain type="primary" v-if="![1].includes(info.payStatus)" @click="$refs.flowingWater.open('创建收支流水', {
            billType: returnBillType(),
            billId: info.id,
            costType: info.costType,
            receivableFee: Math.abs(info.needReceivableFee),
            costTypeName: returnText(info.costType),
            contractCode: info.contractCode,
            contractId: info.contractId,
            startDate: info.startDate,
            endDate: info.endDate,
            multifileList: [],
            date: `${info.startDate} ~ ${info.endDate}`,
            companyId: info.companyId,
            companyName: info.companyName,
            actReceivableFee: Math.abs(info.needReceivableFee),
            needReceivableFeeCopy: info.needReceivableFee
          })">新建收支流水</el-button>
        </div>
      </div>
      <div class="line"></div>
      <div class="main">
@@ -190,6 +193,8 @@
    <FlowingWater ref="flowingWater" @success="getDetails" @refresh="Refresh" />
    <!--  合同详情  -->
    <ContractDetail ref="ContractDetailRef" />
    <!--  发送缴费通知  -->
    <Call ref="call" />
  </GlobalWindow>
</template>

@@ -197,13 +202,15 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import FlowingWater from './flowingWater'
import Call from './call'
import ContractDetail from '../../contract/components/contractDetail'
import { getYwContractBillById } from '@/api/contract'
export default {
  components: {
    GlobalWindow,
    FlowingWater,
    ContractDetail
    ContractDetail,
    Call
  },
  extends: BaseOpera,
  data() {