fix: 应收应付明细与付款申请合同名称仅显示名称,不再拼接合同编号
This commit is contained in:
@@ -97,7 +97,7 @@
|
|||||||
<el-option
|
<el-option
|
||||||
v-for="item in contractOptions"
|
v-for="item in contractOptions"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="formatContractOptionLabel(item)"
|
:label="item.contractName || item.contractNo"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
@@ -732,7 +732,6 @@ import {
|
|||||||
getList as getCustomerArchiveList,
|
getList as getCustomerArchiveList,
|
||||||
} from '@/api/vehicle/customer-archive';
|
} from '@/api/vehicle/customer-archive';
|
||||||
import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
|
import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
|
||||||
import { formatContractOptionLabel } from '@/utils/contract';
|
|
||||||
import { downloadFileByUrl } from '@/utils/util';
|
import { downloadFileByUrl } from '@/utils/util';
|
||||||
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
|
||||||
import {
|
import {
|
||||||
@@ -1140,7 +1139,6 @@ export default {
|
|||||||
this.initialize();
|
this.initialize();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
formatContractOptionLabel,
|
|
||||||
hasPermission(code) {
|
hasPermission(code) {
|
||||||
return this.permission?.[code] !== false;
|
return this.permission?.[code] !== false;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1063,7 +1063,6 @@ import { getContractOptions as getSettlementContractOptions } from '@/api/settle
|
|||||||
import { getList as getCargoTypeList } from '@/api/base/cargo-type';
|
import { getList as getCargoTypeList } from '@/api/base/cargo-type';
|
||||||
import { exportBlob } from '@/api/common';
|
import { exportBlob } from '@/api/common';
|
||||||
import { getDictionary } from '@/api/system/dictbiz';
|
import { getDictionary } from '@/api/system/dictbiz';
|
||||||
import { formatContractOptionLabel } from '@/utils/contract';
|
|
||||||
import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
|
import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
|
||||||
import { downloadXls } from '@/utils/util';
|
import { downloadXls } from '@/utils/util';
|
||||||
import { createSettlementTransfer } from '@/utils/settlement-transfer';
|
import { createSettlementTransfer } from '@/utils/settlement-transfer';
|
||||||
@@ -1228,14 +1227,14 @@ export default {
|
|||||||
const contract = this.contractOptions.find(
|
const contract = this.contractOptions.find(
|
||||||
item => String(item.id) === String(this.generateQuery.contractId)
|
item => String(item.id) === String(this.generateQuery.contractId)
|
||||||
);
|
);
|
||||||
return formatContractOptionLabel(contract);
|
return contract?.contractName || '';
|
||||||
},
|
},
|
||||||
updateContractName() {
|
updateContractName() {
|
||||||
const contractId = this.updateFeeForm.contractId;
|
const contractId = this.updateFeeForm.contractId;
|
||||||
const contract = [...this.updateContractOptions, ...this.contractOptions].find(
|
const contract = [...this.updateContractOptions, ...this.contractOptions].find(
|
||||||
item => String(item.id) === String(contractId)
|
item => String(item.id) === String(contractId)
|
||||||
);
|
);
|
||||||
return formatContractOptionLabel(contract);
|
return contract?.contractName || '';
|
||||||
},
|
},
|
||||||
updateBillingPlanName() {
|
updateBillingPlanName() {
|
||||||
const billingPlanId = this.updateFeeForm.billingPlanId;
|
const billingPlanId = this.updateFeeForm.billingPlanId;
|
||||||
|
|||||||
Reference in New Issue
Block a user