Selaa lähdekoodia

台账修订,审批问题

MaiXinRong 1 vuosi sitten
vanhempi
commit
b9e4211fd6
2 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 4 2
      app/const/source_type.js
  2. 1 1
      app/lib/revise_price.js

+ 4 - 2
app/const/source_type.js

@@ -4,14 +4,16 @@ const sourceTypeData = [
     { id: 1, name: '标段&期', key: 'tender' },
     { id: 10, name: '预付款', key: 'advance' },
     { id: 20, name: '变更令', key: 'change' },
-    { id: 21, name: '变更计划', key: 'change_plan' },
-    { id: 22, name: '变更项', key: 'change_project' },
+    { id: 21, name: '变更方案', key: 'change_plan' },
+    { id: 22, name: '变更项', key: 'change_project' },
     { id: 23, name: '变更申请', key: 'change_apply' },
     { id: 30, name: '材料调差', key: 'material' },
     { id: 100, name: '支付审批', key: 'payment' },
     { id: 101, name: '安全生产费', key: 'payment_safe' },
     { id: 200, name: '动态投资', key: 'budget' },
 ];
+
+// sourceType = { tender: 1, advance: 10, ... };
 const sourceType = (function (data){
     const result = {};
     for (const d of data) {

+ 1 - 1
app/lib/revise_price.js

@@ -379,7 +379,7 @@ class revisePriceCalc {
 
         this.price = await this.ctx.service.revisePrice.getAllDataByCondition({ where: { rid: revise.id } });
         this.settleStatus = this.ctx.service.settle.settleStatus;
-        this.settleBills = revise.readySettle ? await this.ctx.service.settleBills.getAllDataByCondition({ where: { settle_id: revise.readySettle.id, settle_status: settleStatus.finish } }) : [];
+        this.settleBills = revise.readySettle ? await this.ctx.service.settleBills.getAllDataByCondition({ where: { settle_id: revise.readySettle.id, settle_status: this.settleStatus.finish } }) : [];
         this.settlePos = revise.readySettle ? await this.ctx.service.settlePos.getAllDataByCondition({ where: { settle_id: revise.readySettle.id }}) : [];
         const pcTp = await this.calcReviseLedger(revise, transaction);
         // 引用到所有工程变更