|
|
@@ -966,10 +966,18 @@ $(document).ready(() => {
|
|
|
const colSetting = sheet.zh_setting.cols[iCol];
|
|
|
if (sheet.zh_setting.dgnUpFields.indexOf(colSetting.field) !== -1) {
|
|
|
if (node.b_code && node.b_code !== '') continue;
|
|
|
+ } else if (colSetting.field === 'contract_qty') {
|
|
|
+ if (node.is_tp) continue;
|
|
|
+ } else if (colSetting.field === 'contract_tp') {
|
|
|
+ if (!node.is_tp) continue;
|
|
|
} else if (colSetting.field !== 'postil') {
|
|
|
- if (node.children && node.children.length > 0) { continue; }
|
|
|
+ if (node.children && node.children.length > 0) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
const nodePos = stagePos.getLedgerPos(node.id);
|
|
|
- if (nodePos && nodePos.length > 0) { continue; }
|
|
|
+ if (nodePos && nodePos.length > 0) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (sheet.zh_setting.dgnUpFields.indexOf(colSetting.field) !== -1) {
|
