|
|
|
@ -1368,7 +1368,7 @@
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.spec"
|
|
|
|
|
@change="changeData('cwsettlementsummary-spec',scope.$index)"
|
|
|
|
|
placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
|
|
|
|
|
placeholder="请输入" clearable :style='{"width":"100%"}'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -1470,8 +1470,7 @@
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.settlementSubtotalNo"
|
|
|
|
|
@change="changeData('cwsettlementsummary-settlementSubtotalNo',scope.$index)"
|
|
|
|
|
placeholder="请输入" addonBefore="¥" :disabled="true" clearable
|
|
|
|
|
:style='{"width":"100%"}'>
|
|
|
|
|
placeholder="请输入" addonBefore="¥" clearable :style='{"width":"100%"}'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -1512,8 +1511,7 @@
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.settlementTotalNo"
|
|
|
|
|
@change="changeData('cwsettlementsummary-settlementTotalNo',scope.$index)"
|
|
|
|
|
placeholder="请输入" addonBefore="¥" :disabled="true" clearable
|
|
|
|
|
:style='{"width":"100%"}'>
|
|
|
|
|
placeholder="请输入" addonBefore="¥" clearable :style='{"width":"100%"}'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
@ -2954,25 +2952,26 @@ export default {
|
|
|
|
|
this.dataForm.overdueAmount = overdueAmount;
|
|
|
|
|
|
|
|
|
|
// debugger
|
|
|
|
|
var data = JSON.parse(JSON.stringify(this.dataForm.cwsettlementaccountList))
|
|
|
|
|
var order = this.dataForm.cwsettlementaccountList[0].code
|
|
|
|
|
console.log(order);
|
|
|
|
|
var dataProduct = JSON.parse(JSON.stringify(res.data))
|
|
|
|
|
console.log(dataProduct);
|
|
|
|
|
var productid = res.data[0].productId
|
|
|
|
|
data.forEach(item => {
|
|
|
|
|
dataProduct.forEach(item1 => {
|
|
|
|
|
// debugger
|
|
|
|
|
if (item.code == order && item1.productId == productid) {
|
|
|
|
|
this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data);
|
|
|
|
|
} else {
|
|
|
|
|
this.dataForm.cwsettlementsummaryList = res.data;
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
// var data = JSON.parse(JSON.stringify(this.dataForm.cwsettlementaccountList))
|
|
|
|
|
// var order = this.dataForm.cwsettlementaccountList[0].code
|
|
|
|
|
// console.log(order);
|
|
|
|
|
// var dataProduct = JSON.parse(JSON.stringify(res.data))
|
|
|
|
|
// console.log(dataProduct);
|
|
|
|
|
// var productid = res.data[0].productId
|
|
|
|
|
// data.forEach(item => {
|
|
|
|
|
// dataProduct.forEach(item1 => {
|
|
|
|
|
// // debugger
|
|
|
|
|
// if (item.code == order && item1.productId == productid) {
|
|
|
|
|
// this.dataForm.cwsettlementsummaryList = this.sameReduce(res.data);
|
|
|
|
|
// } else {
|
|
|
|
|
// this.dataForm.cwsettlementsummaryList = res.data;
|
|
|
|
|
// return
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.dataForm.cwsettlementsummaryList = res.data;
|
|
|
|
|
|
|
|
|
|
this.dataForm.cwsettlementsummaryList.forEach(item => {
|
|
|
|
|
item.settlementPrice = this.jnpf.floatDiv(item.settlementSubtotal, item.settlementSum);//汇总结算含税单价
|
|
|
|
|