|
@@ -1,9 +1,3 @@
|
|
|
-function getTenderId() {
|
|
|
|
|
- return window.location.pathname.split('/')[2];
|
|
|
|
|
-}
|
|
|
|
|
-const invalidFields = {
|
|
|
|
|
- parent: ['cur_qty', 'cur_tp', 'unit_price'],
|
|
|
|
|
-};
|
|
|
|
|
function transExpr(expr) {
|
|
function transExpr(expr) {
|
|
|
return $.trim(expr).replace('\t', '').replace('=', '').replace('%', '/100');
|
|
return $.trim(expr).replace('\t', '').replace('=', '').replace('%', '/100');
|
|
|
}
|
|
}
|
|
@@ -22,7 +16,7 @@ $(document).ready(function() {
|
|
|
isLeaf: 'tree_is_leaf',
|
|
isLeaf: 'tree_is_leaf',
|
|
|
fullPath: 'tree_full_path',
|
|
fullPath: 'tree_full_path',
|
|
|
rootId: -1,
|
|
rootId: -1,
|
|
|
- calcFields: ['yf_tp', 'sf_tp', 'pay_tp', 'cut_tp'],
|
|
|
|
|
|
|
+ calcFields: ['yf_tp', 'sf_tp', 'pay_tp', 'cut_tp', 'yf_excl_tax_tp', 'sf_excl_tax_tp'],
|
|
|
keys: ['id', 'stage_id', 'tree_id'],
|
|
keys: ['id', 'stage_id', 'tree_id'],
|
|
|
};
|
|
};
|
|
|
this.tree = createNewPathTree('ledger', this.treeSetting);
|
|
this.tree = createNewPathTree('ledger', this.treeSetting);
|
|
@@ -671,7 +665,7 @@ $(document).ready(function() {
|
|
|
}
|
|
}
|
|
|
SpreadJsObj.initSheet(this.sheet, spreadSetting);
|
|
SpreadJsObj.initSheet(this.sheet, spreadSetting);
|
|
|
this.reloadDetailData();
|
|
this.reloadDetailData();
|
|
|
- SpreadJsObj.locateRow(this.sheet, 0);
|
|
|
|
|
|
|
+ SpreadJsObj.locateRow(this.sheet, 0, false);
|
|
|
}
|
|
}
|
|
|
loadRelaData() {
|
|
loadRelaData() {
|
|
|
const select = SpreadJsObj.getSelectObject(this.sheet);
|
|
const select = SpreadJsObj.getSelectObject(this.sheet);
|