purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给单据增加订金字段和页面功能逻辑

Browse Source
This commit is contained in:
季圣华
2022-05-29 18:19:16 +08:00
parent 3939106bee
commit 5e536d7bbd
17 changed files with 237 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -237,8 +237,21 @@
{{model.discountLastMoney}}
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
{{model.accountName}}
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支付订金">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
<a-col :span="6"></a-col>
</a-row>
</section>
</template>
@@ -314,6 +327,11 @@
{{model.accountName}}
</a-form-item>
</a-col>
<a-col v-if="model.deposit" :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扣除订金">
{{model.deposit}}
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
{{model.changeAmount}}
@@ -324,8 +342,6 @@
{{model.debt}}
</a-form-item>
</a-col>
<a-col :span="6">
</a-col>
</a-row>
</section>
</template>
@@ -476,8 +492,21 @@
{{model.discountLastMoney}}
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="结算账户">
{{model.accountName}}
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收取订金">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
<a-col :span="6"></a-col>
</a-row>
</section>
</template>
@@ -553,6 +582,11 @@
{{model.accountName}}
</a-form-item>
</a-col>
<a-col v-if="model.deposit" :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扣除订金">
{{model.deposit}}
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
{{model.changeAmount}}
@@ -563,6 +597,9 @@
{{model.debt}}
</a-form-item>
</a-col>
<a-col :span="6"></a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
{{model.salesManStr}}
@@ -1358,7 +1395,7 @@
} else {
this.model.getAmount = this.model.changeAmount
}
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.deposit - this.model.changeAmount).toFixed(2)
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'id'))
});

4
jshERP-web/src/views/bill/dialog/LinkBillList.vue
View File

@@ -111,6 +111,7 @@
linkNumber: '',
organId: '',
discount: '',
deposit: '',
remark: '',
queryParam: {
number: "",
@@ -231,12 +232,13 @@
this.linkNumber = record.number
this.organId = record.organId
this.discount = record.discount
this.deposit = record.changeAmount - record.finishDeposit
this.remark = record.remark
this.loadDetailData(1)
}
} else {
this.getSelectBillDetailRows();
this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.remark)
this.$emit('ok', this.selectBillDetailRows, this.linkNumber, this.organId, this.discount, this.deposit, this.remark)
this.close();
}
},