浏览代码

区分两个变更页面台账获取差别

laiguoran 3 年之前
父节点
当前提交
d207551ec3
共有 3 个文件被更改,包括 8 次插入6 次删除
  1. 4 2
      app/controller/change_controller.js
  2. 3 3
      app/public/js/change_information_set.js
  3. 1 1
      app/public/js/change_revise.js

+ 4 - 2
app/controller/change_controller.js

@@ -936,10 +936,12 @@ module.exports = app => {
             try {
             try {
                 // 判断是否台账修订中,修订中则不获取changeLedger及changePos值
                 // 判断是否台账修订中,修订中则不获取changeLedger及changePos值
                 const lastRevise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
                 const lastRevise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
+                const data = JSON.parse(ctx.request.body.data);
+                const from = data.from ? data.from : '';
                 const ledgerData = await ctx.service.ledger.getData(ctx.tender.id);
                 const ledgerData = await ctx.service.ledger.getData(ctx.tender.id);
-                const changeLedgerData = lastRevise && lastRevise.status !== audit.revise.status.checked ? [] : await ctx.service.changeLedger.getData(ctx.tender.id);
+                const changeLedgerData = lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changeLedger.getData(ctx.tender.id);
                 const posData = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
                 const posData = await ctx.service.pos.getPosData({ tid: ctx.tender.id });
-                const changePosData = lastRevise && lastRevise.status !== audit.revise.status.checked ? [] : await ctx.service.changePos.getPosData({ tid: ctx.tender.id });
+                const changePosData = lastRevise && lastRevise.status !== audit.revise.status.checked && data.from !== 'revise' ? [] : await ctx.service.changePos.getPosData({ tid: ctx.tender.id });
                 const dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
                 const dealBills = await ctx.service.dealBills.getAllDataByCondition({ where: { tender_id: ctx.tender.id } });
                 ctx.body = { err: 0, msg: '', data: { bills: ctx.helper._.concat(ledgerData, changeLedgerData), pos: ctx.helper._.concat(posData, changePosData), dealBills } };
                 ctx.body = { err: 0, msg: '', data: { bills: ctx.helper._.concat(ledgerData, changeLedgerData), pos: ctx.helper._.concat(posData, changePosData), dealBills } };
             } catch (err) {
             } catch (err) {

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

@@ -1148,9 +1148,9 @@ function tableDataRemake(changeListData) {
         }
         }
         if(removeList.length > 0) {
         if(removeList.length > 0) {
             _.pullAll(changeList, removeList);
             _.pullAll(changeList, removeList);
-            // postData(window.location.pathname + '/save', { type:'remove_list', updateData: removeList }, function (result) {
-            // }, function () {
-            // });
+            postData(window.location.pathname + '/save', { type:'remove_list', updateData: removeList }, function (result) {
+            }, function () {
+            });
         }
         }
     }
     }
 }
 }

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

@@ -1877,7 +1877,7 @@ $(document).ready(() => {
 
 
     // 加载清单&计量单元数据
     // 加载清单&计量单元数据
     const preUrl = window.location.pathname.split('/').slice(0, 4).join('/');
     const preUrl = window.location.pathname.split('/').slice(0, 4).join('/');
-    postData(preUrl + '/defaultBills', {}, function (result) {
+    postData(preUrl + '/defaultBills', { from: 'revise' }, function (result) {
         billsTree.loadDatas(result.bills);
         billsTree.loadDatas(result.bills);
         pos.loadDatas(result.pos);
         pos.loadDatas(result.pos);
         treeCalc.calculateAll(billsTree);
         treeCalc.calculateAll(billsTree);