|
@@ -126,23 +126,29 @@ function calculateJiaCha(data, index) {
|
|
|
if (index) {
|
|
if (index) {
|
|
|
const gcld = data[index]
|
|
const gcld = data[index]
|
|
|
let total_jiacha = 0;
|
|
let total_jiacha = 0;
|
|
|
|
|
+ let total_qty = 0;
|
|
|
for (const [index, xmj] of gcld.leafXmjs.entries()) {
|
|
for (const [index, xmj] of gcld.leafXmjs.entries()) {
|
|
|
const jiacha = calcOneBQJC(xmj);
|
|
const jiacha = calcOneBQJC(xmj);
|
|
|
gcld.leafXmjs[index].jiacha = jiacha !== 0 ? jiacha : null;
|
|
gcld.leafXmjs[index].jiacha = jiacha !== 0 ? jiacha : null;
|
|
|
gcld.leafXmjs[index].qty = getOneQtyByLeafXmj(xmj);
|
|
gcld.leafXmjs[index].qty = getOneQtyByLeafXmj(xmj);
|
|
|
total_jiacha += jiacha;
|
|
total_jiacha += jiacha;
|
|
|
|
|
+ total_qty = ZhCalc.add(total_qty, gcld.leafXmjs[index].qty);
|
|
|
}
|
|
}
|
|
|
- gcld.total_jiacha = ZhCalc.round(total_jiacha, materialDecimal.tp)
|
|
|
|
|
|
|
+ gcld.total_jiacha = ZhCalc.round(total_jiacha, materialDecimal.tp);
|
|
|
|
|
+ gcld.total_qty = ZhCalc.round(total_qty, materialDecimal.qty);
|
|
|
} else {
|
|
} else {
|
|
|
for(const gcld of data) {
|
|
for(const gcld of data) {
|
|
|
let total_jiacha = 0;
|
|
let total_jiacha = 0;
|
|
|
|
|
+ let total_qty = 0;
|
|
|
for (const [index, xmj] of gcld.leafXmjs.entries()) {
|
|
for (const [index, xmj] of gcld.leafXmjs.entries()) {
|
|
|
const jiacha = calcOneBQJC(xmj);
|
|
const jiacha = calcOneBQJC(xmj);
|
|
|
gcld.leafXmjs[index].jiacha = jiacha !== 0 ? jiacha : null;
|
|
gcld.leafXmjs[index].jiacha = jiacha !== 0 ? jiacha : null;
|
|
|
gcld.leafXmjs[index].qty = getOneQtyByLeafXmj(xmj);
|
|
gcld.leafXmjs[index].qty = getOneQtyByLeafXmj(xmj);
|
|
|
total_jiacha += jiacha;
|
|
total_jiacha += jiacha;
|
|
|
|
|
+ total_qty = ZhCalc.add(total_qty, gcld.leafXmjs[index].qty);
|
|
|
}
|
|
}
|
|
|
- gcld.total_jiacha = ZhCalc.round(total_jiacha, materialDecimal.tp)
|
|
|
|
|
|
|
+ gcld.total_jiacha = ZhCalc.round(total_jiacha, materialDecimal.tp);
|
|
|
|
|
+ gcld.total_qty = ZhCalc.round(total_qty, materialDecimal.qty);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -217,6 +223,7 @@ $(document).ready(() => {
|
|
|
ledgerCols.push({title: '|不计价', colSpan: '|1', rowSpan: '|1', field: 'qc_minus_qty', hAlign: 2, width: 110, type: 'Number'});
|
|
ledgerCols.push({title: '|不计价', colSpan: '|1', rowSpan: '|1', field: 'qc_minus_qty', hAlign: 2, width: 110, type: 'Number'});
|
|
|
ledgerCols.push({title: '|小计', colSpan: '|1', rowSpan: '|1', field: 'gather_qty', hAlign: 2, width: 110, type: 'Number', getValue: 'getValue.gather_qty'});
|
|
ledgerCols.push({title: '|小计', colSpan: '|1', rowSpan: '|1', field: 'gather_qty', hAlign: 2, width: 110, type: 'Number', getValue: 'getValue.gather_qty'});
|
|
|
}
|
|
}
|
|
|
|
|
+ ledgerCols.push({title: '本期调差数量', colSpan: '1', rowSpan: '2', field: 'total_qty', hAlign: 2, width: 110, type: 'Number'});
|
|
|
ledgerCols.push({title: '本期完成金额', colSpan: '1', rowSpan: '2', field: 'gather_tp', hAlign: 2, width: 110, type: 'Number', getValue: 'getValue.gather_tp'});
|
|
ledgerCols.push({title: '本期完成金额', colSpan: '1', rowSpan: '2', field: 'gather_tp', hAlign: 2, width: 110, type: 'Number', getValue: 'getValue.gather_tp'});
|
|
|
ledgerCols.push({title: '本期价差', colSpan: '1', rowSpan: '2', field: 'total_jiacha', hAlign:3, width: 110, type: 'Number'});
|
|
ledgerCols.push({title: '本期价差', colSpan: '1', rowSpan: '2', field: 'total_jiacha', hAlign:3, width: 110, type: 'Number'});
|
|
|
const ledgerSpreadSetting = {
|
|
const ledgerSpreadSetting = {
|