|
@@ -2578,8 +2578,8 @@ $(document).ready(() => {
|
|
|
const datas = billsTree.nodes.filter(node => node.is_leaf === 1 && !node.code && node.ccid !== undefined && node.ccid !== '');
|
|
|
const showDatas = [];
|
|
|
for (const d of datas) {
|
|
|
- if (_.findIndex(showDatas, { b_code: d.b_code, name: d.name, unit: d.unit, unit_price: d.unit_price }) === -1) {
|
|
|
- showDatas.push({ code: d.code, b_code: d.b_code, name: d.name, unit: d.unit, unit_price: d.unit_price });
|
|
|
+ if (_.findIndex(showDatas, { b_code: d.b_code ? d.b_code : '', name: d.name, unit: d.unit, unit_price: d.unit_price }) === -1) {
|
|
|
+ showDatas.push({ code: d.code, b_code: d.b_code ? d.b_code : '', name: d.name, unit: d.unit, unit_price: d.unit_price });
|
|
|
}
|
|
|
}
|
|
|
SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'data', _.uniqWith(showDatas, _.isEqual).sort(sortByCode));
|