From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/finance/components/bullDetail.vue | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index ac60691..976f0a0 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/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])">鍙戦�佺即璐归�氱煡</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() {
--
Gitblit v1.9.3