|
@@ -180,6 +180,7 @@
|
|
|
ref="contractListDialogRef"
|
|
ref="contractListDialogRef"
|
|
|
@changeParent="getContractData"
|
|
@changeParent="getContractData"
|
|
|
:type="contractType"
|
|
:type="contractType"
|
|
|
|
|
+ :collectionId="collectionId"
|
|
|
></contract-list-dialog>
|
|
></contract-list-dialog>
|
|
|
<!--选择销售订单-->
|
|
<!--选择销售订单-->
|
|
|
<sale-order-list-dialog
|
|
<sale-order-list-dialog
|
|
@@ -670,12 +671,29 @@ export default {
|
|
|
},
|
|
},
|
|
|
//获取合同数据
|
|
//获取合同数据
|
|
|
getContractData(params) {
|
|
getContractData(params) {
|
|
|
- let row = {
|
|
|
|
|
- id: params.id,
|
|
|
|
|
- name: params.contractName,
|
|
|
|
|
- code: params.contractNo,
|
|
|
|
|
- amount: params.discountTotalPrice
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ console.log('this.contractType~~~', this.contractType);
|
|
|
|
|
+ let row = {}
|
|
|
|
|
+ if(this.contractType == 2) {
|
|
|
|
|
+ row = {
|
|
|
|
|
+ id: params.id,
|
|
|
|
|
+ name: params.contractName,
|
|
|
|
|
+ code: params.contractNo,
|
|
|
|
|
+ amount: params.discountTotalPrice,
|
|
|
|
|
+ bankName: params.partbBank,
|
|
|
|
|
+ collectionId: params.partbId,
|
|
|
|
|
+ collectionName: params.partbName,
|
|
|
|
|
+ bankAccount: params.partbBankAccount,
|
|
|
|
|
+ type: this.contractType
|
|
|
|
|
+ };
|
|
|
|
|
+ } else {
|
|
|
|
|
+ row = {
|
|
|
|
|
+ id: params.id,
|
|
|
|
|
+ name: params.contractName,
|
|
|
|
|
+ code: params.contractNo,
|
|
|
|
|
+ amount: params.discountTotalPrice
|
|
|
|
|
+ };
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$emit('getInfo', row);
|
|
|
this.setSelectData(row);
|
|
this.setSelectData(row);
|
|
|
},
|
|
},
|
|
|
//选择销售订单
|
|
//选择销售订单
|