Commit 67844856 authored by chenwei's avatar chenwei

feat: 修改收款单,账单汇率有效期提示, 为空不提示汇率,已过期

parent 3780bc13
...@@ -233,12 +233,14 @@ ...@@ -233,12 +233,14 @@
<!-- 银行收款明细 --> <!-- 银行收款明细 -->
<el-card class="card"> <el-card class="card">
<div slot="header" class="card-title">{{ $t("银行收款明细") }}</div> <div slot="header" class="card-title alertHeader">
<div> {{ $t("银行收款明细") }}
<el-button type="primary" v-if="form.state != 7 && form.state != 0" plain size="mini" @click="handleAddReceiptItem" v-hasPermi="['ecw:payment:detail:addBank']" style="padding: 10px; margin-bottom: 10px">{{ $t("添加收款明细") }}</el-button>
<span class="redColor" v-if="compareDate">{{ $t("请注意:汇率已失效") }}</span> <div class="alertBOx">
<el-button type="primary" v-if="form.state != 7 && form.state != 0" plain size="mini" @click="handleAddReceiptItem" v-hasPermi="['ecw:payment:detail:addBank']" style="padding: 10px; margin-bottom: 10px">{{ $t("添加收款明细") }}</el-button> <span class="redColor" v-if="compareDate">{{ $t("请注意:汇率已失效") }}</span>
</div>
</div> </div>
<el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange"> <el-table ref="multipleTable" :data="detailed" border row-key="id" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" :reserve-selection="true"> </el-table-column> <el-table-column type="selection" width="50" :reserve-selection="true"> </el-table-column>
<el-table-column :label="$t('序号')" type="index" align="center" width="50"></el-table-column> <el-table-column :label="$t('序号')" type="index" align="center" width="50"></el-table-column>
...@@ -866,7 +868,8 @@ export default { ...@@ -866,7 +868,8 @@ export default {
compareDate() { compareDate() {
const date1 = dayjs(this.form.rateValidateDate) const date1 = dayjs(this.form.rateValidateDate)
const currentTime = dayjs() const currentTime = dayjs()
if (date1 && date1.isAfter(currentTime)) { console.log("99999", currentTime.isBefore(this.form.rateValidateDate))
if (!this.form.rateValidateDate || currentTime.isBefore(date1)) {
return false return false
} else { } else {
return true return true
...@@ -1768,6 +1771,7 @@ export default { ...@@ -1768,6 +1771,7 @@ export default {
} }
.redColor { .redColor {
padding: 0 10px; padding: 0 10px;
font-size: 14px;
color: red; color: red;
} }
.hexiaoCard { .hexiaoCard {
...@@ -1810,4 +1814,12 @@ export default { ...@@ -1810,4 +1814,12 @@ export default {
::v-deep .warnColor { ::v-deep .warnColor {
color: red; color: red;
} }
.alertHeader {
display: flex;
}
.alertBOx {
display: flex;
align-items: flex-end;
}
</style> </style>
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
<!--lanbm 2024-05-14 add--> <!--lanbm 2024-05-14 add-->
<el-table-column :label="$t('明细状态')" align="center" prop="mxStatus"> <el-table-column :label="$t('明细状态')" align="center" prop="mxStatus">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.mxStatus }}/
<dict-tag :type="DICT_TYPE.RECEIPT_DETAIL_STATUS" :value="row.receiptItemStatus" /> <dict-tag :type="DICT_TYPE.RECEIPT_DETAIL_STATUS" :value="row.receiptItemStatus" />
</template> </template>
</el-table-column> </el-table-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment