Browse Source

台账修订,查找定位相关

MaiXinRong 2 months ago
parent
commit
6bcf4d5cb1
2 changed files with 4 additions and 4 deletions
  1. 3 3
      app/public/js/revise_compare.js
  2. 1 1
      app/public/js/shares/cs_tools.js

+ 3 - 3
app/public/js/revise_compare.js

@@ -109,7 +109,7 @@ $(document).ready(() => {
                 for (const p of posRange) {
                     let nP = _.find(node.pos, {id: p.id});
                     if (!nP) {
-                        nP = {id: p.id};
+                        nP = {id: p.id, name: p.name };
                         node.pos.push(nP);
                     }
                     for (const f of posCompareField) {
@@ -130,7 +130,7 @@ $(document).ready(() => {
                 for (const p of posRange) {
                     let nP = _.find(node.pos, {id: p.id});
                     if (!nP) {
-                        nP = {id: p.id};
+                        nP = {id: p.id, name: p.name};
                         node.pos.push(nP);
                     }
                     for (const f of posCompareField) {
@@ -340,7 +340,7 @@ $(document).ready(() => {
                 if (!searchLedger) {
                     searchLedger = $.ledgerSearch({
                         selector: '#search',
-                        ledger: { billsTree: billsTree, getLedgerPos: function (node){ return node.pos; } },
+                        ledger: { billsTree: billsTree, getLedgerPos: function (node){ return node.pos; }, posId: 'id', },
                         resultSpreadSetting: {
                             cols: [
                                 {title: '项目节编号', field: 'code', hAlign: 0, width: 90, formatter: '@', readOnly: true},

+ 1 - 1
app/public/js/shares/cs_tools.js

@@ -869,7 +869,7 @@ const showSelectTab = function(select, spread, afterShow) {
                 if (!posRange || posRange.length === 0) continue;
                 for (const p of posRange) {
                     if (posCheckFun(p, keyword)) {
-                        const convertData = { lid: node[ledger.billsTree.setting.id], pid: p[ledger.pos.setting.id] };
+                        const convertData = { lid: node[ledger.billsTree.setting.id], pid: p[ledger.pos ? ledger.pos.setting.id : ledger.posId] };
                         for (const col of setting.resultSpreadSetting.cols) {
                             convertData[col.field] = p[col.field];
                         }