|
|
@@ -4216,8 +4216,13 @@
|
|
|
<el-col :span="20">
|
|
|
<el-table
|
|
|
:data="interestTableData"
|
|
|
+ :span-method="arraySpanMethod"
|
|
|
>
|
|
|
- <el-table-column label="积分" prop="integral"></el-table-column>
|
|
|
+ <el-table-column label="积分" prop="integral">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.integral?scope.row.integral.toFixed(2):0 }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="权益名称" prop="rightsName"></el-table-column>
|
|
|
<el-table-column label="数量" prop="number"></el-table-column>
|
|
|
<el-table-column label="市场价" prop="marketPrice"></el-table-column>
|
|
|
@@ -6072,6 +6077,15 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
methods: {
|
|
|
+ arraySpanMethod({ row, column, rowIndex, columnIndex }) {
|
|
|
+ if(columnIndex === 0) {
|
|
|
+ if(rowIndex === 0){
|
|
|
+ return [this.interestTableData.length,1]
|
|
|
+ } else {
|
|
|
+ return [0,0]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
deleteJiaYi(reslistindex, drivingIndex) {
|
|
|
this.totalCompanyList[reslistindex].programme.drivingList.splice(drivingIndex, 1)
|
|
|
this.$forceUpdate()
|
|
|
@@ -6295,7 +6309,8 @@ export default {
|
|
|
} else {
|
|
|
this.interestIndex = index
|
|
|
// this.interestData.pointProportion
|
|
|
- let integral = (this.interestData.amount - this.interestData.pageResult.content[index].threeSettlementPrice)*this.interestData.pointProportion
|
|
|
+ let obj = this.interestData.feeOrderNewVo.exportFee.find(a => a.insuranceType === '合计')
|
|
|
+ let integral = (obj.totalAmount - this.interestData.pageResult.content[index].threeSettlementPrice)*this.interestData.pointProportion
|
|
|
this.interestTableData = this.interestData.pageResult.content[index].localEquityPackageAssociationList.map(a => {
|
|
|
return {
|
|
|
...a,
|
|
|
@@ -6348,7 +6363,8 @@ export default {
|
|
|
this.interestData = res.data
|
|
|
this.interestSelectData = item
|
|
|
this.interestList = res.data.pageResult.content
|
|
|
- let integral = (this.interestData.amount - this.interestData.pageResult.content[this.interestIndex].threeSettlementPrice)*this.interestData.pointProportion
|
|
|
+ let obj = res.data.feeOrderNewVo.exportFee.find(a => a.insuranceType === '合计')
|
|
|
+ let integral = (obj.totalAmount - this.interestData.pageResult.content[this.interestIndex].threeSettlementPrice)*this.interestData.pointProportion
|
|
|
this.interestTableData = res.data.pageResult.content[this.interestIndex].localEquityPackageAssociationList.map(a => {
|
|
|
return {
|
|
|
...a,
|
|
|
@@ -6384,7 +6400,7 @@ export default {
|
|
|
receiveType: this.interestPeople,
|
|
|
receiveName: info.name,
|
|
|
receivePhone: info.mobile,
|
|
|
- receiveIdentify: info.identifyNumber,
|
|
|
+ receiveIdentify: info.identifyNumber?info.identifyNumber:1,
|
|
|
orderMoney: obj.totalAmount,
|
|
|
point: integral.toFixed(2),
|
|
|
equityInfo: this.interestList[this.interestIndex]
|