Browse Source

导入Excel优化遗漏

MaiXinRong 6 years ago
parent
commit
23f93ceba4

+ 1 - 1
app/controller/ledger_controller.js

@@ -621,7 +621,7 @@ module.exports = app => {
                 const responseData = { err: 0, msg: '', data: {}, };
                 await ctx.service.ledger.importExcel(data);
                 responseData.data.bills = await ctx.service.ledger.getDataByTenderId(ctx.tender.id, -1);
-                responseData.data.pos = await ctx.service.pos.getPosData(null);
+                responseData.data.pos = await ctx.service.pos.getPosData({tid: this.ctx.tender.id});
                 ctx.body = responseData;
             } catch (err) {
                 this.log(err);

+ 2 - 0
app/public/js/path_tree.js

@@ -31,6 +31,8 @@ class PosData {
      */
     loadDatas(datas) {
         this.datas = datas;
+        this.items = {};
+        this.ledgerPos = {};
         for (const data of this.datas) {
             const key = itemsPre + data[this.setting.id];
             this.items[key] = data;

+ 4 - 0
test/app/lib/analysis_excel.test.js

@@ -152,5 +152,9 @@ describe('test/app/lib/analysis_excel.test.js', () => {
             tender_id: ctx.tender.id
         });
         assert(count === 2867);
+        const countPos = yield ctx.service.pos.count({
+            tid: ctx.tender.id
+        });
+        assert(countPos === 21271);
     });
 });