Browse Source

报表。变更令查询问题

MaiXinRong 3 months atrás
parent
commit
e1216f5e77
2 changed files with 3 additions and 3 deletions
  1. 2 2
      app/lib/rm/change.js
  2. 1 1
      app/public/js/global.js

+ 2 - 2
app/lib/rm/change.js

@@ -112,7 +112,7 @@ class rptMemChange extends RptMemBase {
     async getChangeLedgerBillsData(fields, showLevel) {
         try {
             const billsData = await this.ctx.service.ledger.getData(this.ctx.tender.id);
-            const changeBillsData = await this.ctx.service.changeLedger.getAllDataByCondition({ where: { ccid: this.ctx.change.id } });
+            const changeBillsData = await this.ctx.service.changeLedger.getAllDataByCondition({ where: { tender_id: this.ctx.tender.id } });
             billsData.push(...changeBillsData);
 
             const billsTree = this._getNewBillsTree();
@@ -132,7 +132,7 @@ class rptMemChange extends RptMemBase {
     async getChangeLedgerPosData() {
         try {
             const posData = await this.ctx.service.pos.getAllDataByCondition({ where: {tid: this.ctx.tender.id }});
-            const changePosData = await this.ctx.service.changePos.getAllDataByCondition({ where: { ccid: this.ctx.change.id } });
+            const changePosData = await this.ctx.service.changePos.getAllDataByCondition({ where: { tid: this.ctx.tender.id } });
             posData.push(...changePosData);
 
             const pos = new Ledger.pos({

+ 1 - 1
app/public/js/global.js

@@ -834,7 +834,7 @@ function setUploadFileProgress(pos) {
  */
 function setLocalCache(key, value) {
     const storage = window.localStorage;
-    if (!storage || key === '' || value === '') {
+    if (!storage || key === '') {
         return;
     }