Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -265,12 +265,13 @@
|
|||||||
<el-option label="是" :value="1" />
|
<el-option label="是" :value="1" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="一式(份)">
|
<el-form-item label="一式">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.copyCount"
|
v-model="form.copyCount"
|
||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
@input="value => integerInput('copyCount', value)"
|
@input="value => integerInput('copyCount', value)"
|
||||||
/>
|
><template #suffix>份</template></el-input
|
||||||
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="回款账期(天)">
|
<el-form-item label="回款账期(天)">
|
||||||
<el-input
|
<el-input
|
||||||
|
|||||||
@@ -657,7 +657,7 @@ const emptyForm = () => ({
|
|||||||
billType: '',
|
billType: '',
|
||||||
paymentRatio: null,
|
paymentRatio: null,
|
||||||
appliedAmount: 0,
|
appliedAmount: 0,
|
||||||
paymentMethod: 'bank_transfer',
|
paymentMethod: '',
|
||||||
billLedgerId: null,
|
billLedgerId: null,
|
||||||
billNo: '',
|
billNo: '',
|
||||||
receiptAccountId: null,
|
receiptAccountId: null,
|
||||||
@@ -1053,6 +1053,7 @@ export default {
|
|||||||
if (this.billPayment) await this.loadBillOptions('', data.billLedgerId);
|
if (this.billPayment) await this.loadBillOptions('', data.billLedgerId);
|
||||||
} else {
|
} else {
|
||||||
this.form = emptyForm();
|
this.form = emptyForm();
|
||||||
|
this.form.paymentMethod = this.paymentMethodOptions[0]?.value || '';
|
||||||
this.form.paymentType = this.initialAddPaymentType();
|
this.form.paymentType = this.initialAddPaymentType();
|
||||||
this.referenceRows = [];
|
this.referenceRows = [];
|
||||||
this.form.applyDate = this.$dayjs().format('YYYY-MM-DD');
|
this.form.applyDate = this.$dayjs().format('YYYY-MM-DD');
|
||||||
|
|||||||
Reference in New Issue
Block a user