|
@@ -185,7 +185,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: 'gather_qty', hAlign: 2, width: 110, type: 'Number', getValue: 'getValue.gather_qty'});
|
|
|
}
|
|
|
- ledgerCols.push({title: '本期完成金额', colSpan: '1', rowSpan: '2', field: 'gather_tp', 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: 'total_jiacha', hAlign:3, width: 110, type: 'Number'});
|
|
|
const ledgerSpreadSetting = {
|
|
|
// cols: [
|
|
@@ -211,10 +211,19 @@ $(document).ready(() => {
|
|
|
const ledgerCol = {
|
|
|
getValue: {
|
|
|
gather_qty: function (data) {
|
|
|
- if (materialQtySource === 3) {
|
|
|
+ if (materialQtySource === qtySourceValueConst.gather_minus_qty) {
|
|
|
return ZhCalc.add(data.gather_qty, data.qc_minus_qty);
|
|
|
}
|
|
|
},
|
|
|
+ gather_tp: function (data) {
|
|
|
+ if (materialQtySource === qtySourceValueConst.gather_qty) {
|
|
|
+ return data.gather_tp;
|
|
|
+ } else if (materialQtySource === qtySourceValueConst.contract_qty) {
|
|
|
+ return data.contract_tp;
|
|
|
+ } else if (materialQtySource === qtySourceValueConst.gather_minus_qty) {
|
|
|
+ return ZhCalc.round(ZhCalc.mul(ZhCalc.add(data.gather_qty, data.qc_minus_qty), data.unit_price), 2);
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
ledgerSpreadSetting.cols = ledgerCols;
|