Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test
This commit is contained in:
@@ -100,7 +100,7 @@
|
||||
<section class="detail-block">
|
||||
<div class="sec-title">费用明细</div>
|
||||
<el-tabs v-model="feeTab" class="fee-tabs">
|
||||
<el-tab-pane label="应收" name="income">
|
||||
<el-tab-pane v-if="showIncome" label="应收" name="income">
|
||||
<div v-if="!readonly" class="fee-toolbar">
|
||||
<el-button type="primary" plain size="small" icon="Plus" v-hasPermi="['price:billing:feeAdd']" @click="openAddFee">增加费用</el-button>
|
||||
<!-- <el-button type="primary" plain size="small" icon="Edit" v-hasPermi="['price:billing:chargeWeightEdit']" :disabled="detail.refundStatus === 'REFUNDED'" @click="openEditCw">修改计费重</el-button> -->
|
||||
@@ -215,7 +215,8 @@ const props = defineProps({
|
||||
title: { type: String, default: '计费详情' },
|
||||
loading: { type: Boolean, default: false },
|
||||
detail: { type: Object, default: null },
|
||||
readonly: { type: Boolean, default: false }
|
||||
readonly: { type: Boolean, default: false },
|
||||
showIncome: { type: Boolean, default: true }
|
||||
})
|
||||
|
||||
const emit = defineEmits(['update:modelValue', 'updated'])
|
||||
@@ -240,7 +241,7 @@ const payFees = computed(() => {
|
||||
})
|
||||
|
||||
watch(() => props.detail, () => {
|
||||
feeTab.value = 'income'
|
||||
feeTab.value = props.showIncome ? 'income' : 'pay'
|
||||
historyOpen.value = false
|
||||
})
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
</el-table>
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="query.pageNum" v-model:limit="query.pageSize" @pagination="loadList" />
|
||||
|
||||
<bill-detail v-model="detailOpen" title="订单详情" :loading="detailLoading" :detail="detail" />
|
||||
<bill-detail v-model="detailOpen" title="订单详情" :loading="detailLoading" :detail="detail" :show-income="false" />
|
||||
|
||||
<el-dialog v-model="feeOpen" :title="feeTitle" width="1280px" append-to-body destroy-on-close>
|
||||
<div v-loading="feeLoading" class="fee-board">
|
||||
|
||||
Reference in New Issue
Block a user