Преглед изворни кода

导入合同数据后,明细数据切换表格格式

MaiXinRong пре 21 часа
родитељ
комит
a8d1b7a7d8
3 измењених фајлова са 14 додато и 3 уклоњено
  1. 2 0
      app/controller/cost_controller.js
  2. 3 3
      app/public/js/cost_stage_ledger.js
  3. 9 0
      app/service/cost_stage.js

+ 2 - 0
app/controller/cost_controller.js

@@ -94,6 +94,8 @@ module.exports = app => {
                 if (s.audit_status !== audit.common.status.checked) {
                     await this.ctx.service.costStage.loadUser(s);
                     s.is_join = s.userIds.indexOf(this.ctx.session.sessionUser.accountId) >= 0;
+                    // 实时计算 // 暂不开放
+                    // await this.ctx.service.costStage.calcRealtime(s);
                 } else {
                     const auditors = await this.ctx.service.costStageAudit.getAuditors(s.id, s.audit_times);
                     s.is_join = auditors.findIndex(a => { return a.audit_id === this.ctx.session.sessionUser.accountId }) >= 0;

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

@@ -335,13 +335,13 @@ $(document).ready(function() {
                     if (['up-move', 'down-move'].indexOf(type) > -1) {
                         if (sel) {
                             sheet.setSelection(tree.nodes.indexOf(node), sel.col, sel.rowCount, sel.colCount);
-                            // SpreadJsObj.reloadRowsBackColor(sheet, [sel.row, tree.nodes.indexOf(node)]);
+                            SpreadJsObj.reloadRowsBackColor(sheet, [sel.row, tree.nodes.indexOf(node)]);
                         }
                     } else if (type === 'add') {
                         const sel = sheet.getSelections()[0];
                         if (sel) {
                             sheet.setSelection(tree.nodes.indexOf(refreshData.create[0]), sel.col, sel.rowCount, sel.colCount);
-                            // SpreadJsObj.reloadRowsBackColor(sheet, [sel.row, tree.nodes.indexOf(refreshData.create[0])]);
+                            SpreadJsObj.reloadRowsBackColor(sheet, [sel.row, tree.nodes.indexOf(refreshData.create[0])]);
                         }
                     }
                     self.refreshOperationValid();
@@ -1010,10 +1010,10 @@ $(document).ready(function() {
                 }
                 postData('update', updateData, function(result) {
                     detailObj.data.updateDatas(result.detail);
-                    detailObj.refreshSheet();
                     result.ledger.tree_id = curNode.tree_id;
                     const refreshNode = billsObj.tree.loadPostData({ update: result.ledger });
                     billsObj.refreshTree(refreshNode);
+                    detailObj.loadDetailData(curNode);
                     $('#import-deal-select').modal('hide');
                 });
             });

+ 9 - 0
app/service/cost_stage.js

@@ -53,6 +53,15 @@ module.exports = app => {
                 s.rela_stage = s.rela_stage ? JSON.parse(s.rela_stage) : null;
             });
         }
+        async calcRealtime(stage) {
+            const typeInfo = this.stageType[stage.stage_type];
+            if (!typeInfo) return;
+
+            stage.stage_tp = await this.ctx.service[typeInfo.dataService].getSum(stage);
+            for (const prop in stage.stage_tp) {
+                stage.stage_end_tp[prop] = this.ctx.helper.add(stage.stage_tp[prop], stage.stage_pre_tp[prop]);
+            }
+        }
         /**
          * 获取全部期
          * @param tid