Commit 1c08baa4 authored by 我在何方's avatar 我在何方

收款单客户优先显示付款人

parent 0f955a0b
...@@ -1300,7 +1300,7 @@ export default { ...@@ -1300,7 +1300,7 @@ export default {
this.flag = false this.flag = false
return return
} }
this.form.customerName = value.name this.form.customerName = value.payerName?value.payerName:value.name
this.form.customerId && getCustomer(this.form.customerId).then(res => { this.form.customerId && getCustomer(this.form.customerId).then(res => {
this.form = { this.form = {
...this.form, ...this.form,
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td> <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
<td style="width:12.5%">{{form?form.departmentName:$t('')}}</td> <td style="width:12.5%">{{form?form.departmentName:$t('')}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('客户名称')}}</td> <td style="font-weight: bold;width:12.5%">{{$t('客户名称')}}</td>
<td colspan="2" style="width: 25%;">{{form.payerName?form.payerName:(form.customerName||$t(''))}}</td> <td colspan="2" style="width: 25%;">{{form.customerName||$t('')}}</td>
<td style="font-weight: bold;width:12.5%">{{$t('收款日期')}}</td> <td style="font-weight: bold;width:12.5%">{{$t('收款日期')}}</td>
<td colspan="2" style="width: 25%;">{{form&&form.payedAt?parseTime(form.payedAt):$t('')}}</td> <td colspan="2" style="width: 25%;">{{form&&form.payedAt?parseTime(form.payedAt):$t('')}}</td>
</tr> </tr>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<el-descriptions-item :label="$t('状态')"> <el-descriptions-item :label="$t('状态')">
<dict-tag :type="DICT_TYPE.ECW_RECEIPT_STATE" :value="form.state"/> <dict-tag :type="DICT_TYPE.ECW_RECEIPT_STATE" :value="form.state"/>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('客户')">{{form.payerName?form.payerName:form.customerName }}</el-descriptions-item> <el-descriptions-item :label="$t('客户')">{{form.customerName }}</el-descriptions-item>
<el-descriptions-item :label="$t('部门')">{{ form.departmentName }}</el-descriptions-item> <el-descriptions-item :label="$t('部门')">{{ form.departmentName }}</el-descriptions-item>
<el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item> <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('手续费(RMB)')">{{ form.feeRate }}</el-descriptions-item> --> <!-- <el-descriptions-item :label="$t('手续费(RMB)')">{{ form.feeRate }}</el-descriptions-item> -->
...@@ -725,9 +725,9 @@ export default { ...@@ -725,9 +725,9 @@ export default {
this.id = this.$route.query.id; this.id = this.$route.query.id;
await getReceiptInfoByIds({ id: this.id }).then(res => { await getReceiptInfoByIds({ id: this.id }).then(res => {
this.form = res.data this.form = res.data
getCustomer(this.form.customerId).then(res => { // getCustomer(this.form.customerId).then(res => {
this.form.customerName = res?.data?.name // this.form.customerName = res?.data?.name
}) // })
var dept = this.deptData.filter((itt) => itt.id == res.data.departmentId); var dept = this.deptData.filter((itt) => itt.id == res.data.departmentId);
// console.log(dept) // console.log(dept)
if(dept.length>0){ if(dept.length>0){
......
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