fix
This commit is contained in:
@@ -211,7 +211,7 @@
|
||||
</el-form-item>
|
||||
</section-card>
|
||||
|
||||
<section-card title="使用记录">
|
||||
<section-card v-if="readonly" title="使用记录">
|
||||
<el-table :data="usageRecords" border>
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column prop="applicationNo" label="申请单号" min-width="180" align="center" />
|
||||
@@ -311,7 +311,7 @@ export default {
|
||||
billType: [{ required: true, message: '请选择汇票类型', trigger: 'change' }],
|
||||
faceAmount: [{ validator: this.validateFaceAmount, trigger: 'change' }],
|
||||
issueDate: [{ required: true, message: '请选择出票日期', trigger: 'change' }],
|
||||
maturityDate: [{ validator: this.validateMaturityDate, trigger: 'change' }],
|
||||
maturityDate: [{ required: true, validator: this.validateMaturityDate, trigger: 'change' }],
|
||||
availableDeptIds: [{ validator: this.validateDepartments, trigger: 'change' }],
|
||||
feeBearerId: [{ required: true, message: '请选择费用承担方', trigger: 'change' }],
|
||||
confirmedDiscountRate: [{ validator: this.validateRate, trigger: 'change' }],
|
||||
@@ -359,6 +359,8 @@ export default {
|
||||
this.form = {
|
||||
...emptyForm(),
|
||||
...data,
|
||||
confirmedDiscountRate: this.normalizeDiscountRate(data.confirmedDiscountRate),
|
||||
bankDiscountReferenceRate: this.normalizeDiscountRate(data.bankDiscountReferenceRate),
|
||||
availableDeptIds: this.parse(data.availableDeptIdsJson),
|
||||
attachments: this.parse(data.attachmentsJson),
|
||||
};
|
||||
@@ -461,6 +463,11 @@ export default {
|
||||
}
|
||||
callback();
|
||||
},
|
||||
normalizeDiscountRate(value) {
|
||||
return value === null || value === undefined || value === '' || Number(value) === -1
|
||||
? null
|
||||
: value;
|
||||
},
|
||||
normalizeAttachments(files) {
|
||||
const userName = this.userInfo?.realName || this.userInfo?.userName || '';
|
||||
const time = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
|
||||
@@ -492,9 +499,9 @@ export default {
|
||||
availableDeptIdsJson: JSON.stringify(this.form.availableDeptIds || []),
|
||||
availableDeptNames: this.form.availableDeptNames,
|
||||
feeBearerId: this.form.feeBearerId,
|
||||
confirmedDiscountRate: this.form.confirmedDiscountRate,
|
||||
confirmedDiscountRate: this.normalizeDiscountRate(this.form.confirmedDiscountRate),
|
||||
issuingBank: this.form.issuingBank,
|
||||
bankDiscountReferenceRate: this.form.bankDiscountReferenceRate,
|
||||
bankDiscountReferenceRate: this.normalizeDiscountRate(this.form.bankDiscountReferenceRate),
|
||||
attachmentsJson: JSON.stringify(this.form.attachments || []),
|
||||
remark: this.form.remark,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user