|
|
|
@ -948,6 +948,21 @@
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="规格" v-if="judgeShow('cwaccountsummary-spec')" prop="spec"
|
|
|
|
|
align="center" width="150">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('cwaccountsummaryList-spec')"></span>编码
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.code"
|
|
|
|
|
@change="changeData('cwaccountsummary-spec',scope.$index)" placeholder="请输入"
|
|
|
|
|
:disabled="true" clearable :style='{"width":"100%"}'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="结算单位" v-if="judgeShow('cwaccountsummary-settlementUnit')"
|
|
|
|
|
prop="settlementUnit" align="center" width="150">
|
|
|
|
|
<template slot="header">
|
|
|
|
@ -1371,6 +1386,7 @@ export default {
|
|
|
|
|
productId: '',
|
|
|
|
|
productIdOptions: [],
|
|
|
|
|
spec: '',
|
|
|
|
|
code: '',
|
|
|
|
|
specOptions: [],
|
|
|
|
|
inventoryUnitId: '',
|
|
|
|
|
inventoryUnitIdOptions: [],
|
|
|
|
@ -2700,7 +2716,7 @@ export default {
|
|
|
|
|
found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses)).toFixed(2);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.taxCount, settlementUnit: cur.unit, settlementPrice: cur.businessPrice, settlementSubtotal: cur.taxCount, settlementPriceNo: cur.notTaxPrice, settlementSubtotalNo: cur.notTaxCount, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.taxCount, settlementTotalNo: cur.notTaxCount, businessOrderId: cur.businessOrderId, orderNo: cur.orderNo })
|
|
|
|
|
acc.push({ productId: cur.productId, productName: cur.productName, spec: cur.spec, code: cur.code, rate: cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.taxCount, settlementUnit: cur.unit, settlementPrice: cur.businessPrice, settlementSubtotal: cur.taxCount, settlementPriceNo: cur.notTaxPrice, settlementSubtotalNo: cur.notTaxCount, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.taxCount, settlementTotalNo: cur.notTaxCount, businessOrderId: cur.businessOrderId, orderNo: cur.orderNo })
|
|
|
|
|
}
|
|
|
|
|
return acc
|
|
|
|
|
}, [])
|
|
|
|
|