|
@@ -158,14 +158,14 @@ $(document).ready(() => {
|
|
|
function loadLeafXmjData(iGclRow) {
|
|
|
const gcl = gclGatherData[iGclRow];
|
|
|
if (gcl) {
|
|
|
- gcl.leafXmjs = gcl.leafXmjs.filter(item => {
|
|
|
- return item.qc_qty || item.contract_qty
|
|
|
- });
|
|
|
for (const [index, xmj] of gcl.leafXmjs.entries()) {
|
|
|
const jiacha = calcOneBQJC(xmj);
|
|
|
gcl.leafXmjs[index].jiacha = jiacha !== 0 ? ZhCalc.round(jiacha, 2) : null;
|
|
|
}
|
|
|
- SpreadJsObj.loadSheetData(leafXmjSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gcl.leafXmjs);
|
|
|
+ const leafXmjs = gcl.leafXmjs.filter(item => {
|
|
|
+ return item.qc_qty || item.contract_qty
|
|
|
+ });
|
|
|
+ SpreadJsObj.loadSheetData(leafXmjSpread.getActiveSheet(), SpreadJsObj.DataType.Data, leafXmjs);
|
|
|
|
|
|
// 对清单调差工料table的单位数量进行改变
|
|
|
materialSpreadSetting.cols[materialSpreadSetting.cols.length - 2].title = '|' + gcl.unit + '数量 �';
|
|
@@ -298,7 +298,7 @@ $(document).ready(() => {
|
|
|
} else {
|
|
|
SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, []);
|
|
|
}
|
|
|
- SpreadJsObj.reLoadSheetData(leafXmjSpread.getActiveSheet());
|
|
|
+ // SpreadJsObj.reLoadSheetData(leafXmjSpread.getActiveSheet());
|
|
|
}
|
|
|
|
|
|
// SpreadJsObj.locateTreeNode(ledgerSpread.getActiveSheet(), )
|