Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/report_archive_controller.js

@@ -57,7 +57,7 @@ module.exports = app => {
                     }
                 }
                 // const archives = await ctx.service.rptArchive.getPrjStgArchive(tender.data.project_id, stageList[stageList.length - 1].id);
-                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, stageList[stageList.length - 1].id);
+                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, ctx.stage.id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;
                 // stage_times = stageList[0].times;
@@ -452,6 +452,7 @@ module.exports = app => {
                 if (archives.length > 0) {
                     archiveList = JSON.parse(archives[0].content);
                 }
+                console.log('2:', archiveEncryptions, ctx.stage.id);
                 if (archiveEncryptions.length > 0) {
                     archiveEncryptionList = JSON.parse(archiveEncryptions[0].content);
                 }
@@ -467,7 +468,7 @@ module.exports = app => {
                     }
                 }
 
-                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, stageList[stageList.length - 1].id);
+                const archiveEncryptions = await ctx.service.rptArchiveEncryption.getPrjStgArchiveEncryption(tender.data.project_id, ctx.stage.id);
                 // stage_id = stageList[0].id;
                 // stage_order = stageList[0].order;
                 // stage_times = stageList[0].times;

app/controller/tender_controller.js

@@ -508,7 +508,7 @@ module.exports = app => {
                     { num: tender.undone_tp ? tender.undone_tp : 0, name: '未完成' },
                 ];
                 // 地图
-                const hadMap = true;
+                const hadMap = false;
                 const renderData = {
                     tenders,
                     categoryData,

app/lib/sum_load.js

@@ -40,7 +40,7 @@ class loadGclBaseTree {
         for (const child of parent.children) {
             const checkLeaf = (child.is_leaf && node.is_leaf) || (!child.is_leaf && !node.is_leaf);
             if (child.b_code === node.b_code && child.name === node.name && child.unit === node.unit
-                && checkLeaf && (!check || check(child, node))) {
+                && checkLeaf && !child.hasPos && (!check || check(child, node))) {
                 return child;
             }
         }
@@ -75,6 +75,7 @@ class loadGclBaseTree {
                 sjcl_qyt: 0,
                 quantity: 0,
                 is_leaf: source.is_leaf,
+                hasPos: false,
             };
             this.keyNodeId += 1;
             parent.children.push(node);
@@ -146,7 +147,7 @@ class updateReviseGclTree extends loadGclBaseTree {
         this.baseNodes = [];
         this.errors = [];
     }
-    loadBase(datas) {
+    loadBase(datas, pos) {
         datas.sort((x, y) => { return x.level === y.level ? x.order - y.order : x.level - y.level; });
         const Index = {};
         for (const d of datas) {
@@ -154,6 +155,7 @@ class updateReviseGclTree extends loadGclBaseTree {
             if (!parent) continue;
 
             if (!parent.children) parent.children = [];
+            const relaPos = pos.filter(x => {return x.lid === d.id});
             const baseNode = {
                 id: d.id,
                 ledger_id: d.ledger_id,
@@ -174,6 +176,7 @@ class updateReviseGclTree extends loadGclBaseTree {
                 sjcl_qty: 0,
                 qtcl_qty: 0,
                 quantity: 0,
+                hasPos: relaPos.length > 0,
             };
             parent.children.push(baseNode);
             Index[baseNode.ledger_id] = baseNode;
@@ -226,7 +229,7 @@ class gatherStageGclTree extends loadGclBaseTree {
         super(ctx, setting);
         this.baseNodes = [];
     }
-    loadBase(datas) {
+    loadBase(datas, pos) {
         datas.sort((x, y) => { return x.level === y.level ? x.order - y.order : x.level - y.level; });
         const Index = {};
         for (const d of datas) {
@@ -234,6 +237,7 @@ class gatherStageGclTree extends loadGclBaseTree {
             if (!parent) continue;
 
             if (!parent.children) parent.children = [];
+            const relaPos = pos.filter(x => {return x.lid === d.id});
             const baseNode = {
                 id: d.id,
                 ledger_id: d.ledger_id,
@@ -251,6 +255,7 @@ class gatherStageGclTree extends loadGclBaseTree {
                 contract_qty: 0,
                 contract_tp: 0,
                 is_tp: d.is_tp,
+                hasPos: relaPos.length > 0,
             };
             parent.children.push(baseNode);
             Index[baseNode.ledger_id] = baseNode;
@@ -274,7 +279,7 @@ class gatherStageGclTree extends loadGclBaseTree {
     gather(source, parent) {
         parent = parent ? parent : this.parent;
         const node = this.addNode(source, parent, function (node, source) {
-            return (source.is_tp && node.is_tp) || (!source.is_tp && !node.is_tp);
+            return  (source.is_tp && node.is_tp) || (!source.is_tp && !node.is_tp);
         });
         if (node.is_tp) {
             node.contract_tp = this.ctx.helper.add(node.contract_tp, source.contract_tp);
@@ -360,7 +365,8 @@ class sumLoad {
             parent: select, maxId, type: 'ledger', defaultData,
         });
         const posterity = await this.ctx.service.reviseBills.getPosterityByParentId(this.ctx.tender.id, select.ledger_id);
-        this.loadTree.loadBase(posterity);
+        const pos = await this.ctx.service.revisePos.getData(this.ctx.tender.id);
+        this.loadTree.loadBase(posterity, pos);
 
         for (const tender of tenders) {
             const billsData = await this.ctx.service.ledger.getData(tender.tid);
@@ -415,7 +421,8 @@ class sumLoad {
             parent: select, maxId, type: 'ledger', defaultData,
         });
         const posterity = await this.ctx.service.ledger.getPosterityByParentId(this.ctx.tender.id, select.ledger_id);
-        this.loadTree.loadBase(posterity);
+        const pos = await this.ctx.service.revisePos.getData(this.ctx.tender.id);
+        this.loadTree.loadBase(posterity, pos);
 
         for (const tender of tenders) {
             if (!tender.stage) continue;

app/public/css/main.css

@@ -1306,9 +1306,11 @@ overflow-y: auto;
 }
 .circle-num{
   position: absolute;
-  top: 2px;
-  left: 15px;
-  font-size: 24px;
+  top: 50%;
+  margin-top: -16px;
+  width: 42px;
+  text-align: center;
+  font-size: 22px;
   font-weight: 500;
 }
 .circle-text{
@@ -1320,4 +1322,123 @@ overflow-y: auto;
 .dropdown-wd{
   width: 80px;
   text-align: center;
+}
+.btn-blueOne{
+  color: #fff;
+  background-color: rgba(24,144,255);
+  border-color: rgba(24,144,255);
+}
+.btn-blueOne:hover {
+  color: #fff;
+  background-color: rgba(24,144,255);
+  border-color: rgba(24,144,255);
+}
+.btn-green{
+  color: #fff;
+  background-color: rgba(69,183,149);
+  border-color: rgba(69,183,149);
+}
+.btn-green:hover{
+  color: #fff;
+  background-color: rgba(69,183,149);
+  border-color: rgba(69,183,149);
+}
+.btn-yellow{
+  color: #fff;
+  background-color: rgba(250,204,20);
+  border-color: rgba(250,204,20);
+}
+.btn-yellow:hover{
+  color: #fff;
+  background-color: rgba(250,204,20);
+  border-color: rgba(250,204,20);
+}
+.btn-purple{
+  color: #fff;
+  background-color: rgba(145,82,225);
+  border-color: rgba(145,82,225);
+}
+.btn-purple:hover {
+  color: #fff;
+  background-color: rgba(145,82,225);
+  border-color: rgba(145,82,225);
+}
+.btn-blueTwo{
+  color: #fff;
+  background-color: rgba(58,207,221);
+  border-color: rgba(58,207,221);
+}
+.btn-blueTwo:hover {
+  color: #fff;
+  background-color: rgba(58,207,221);
+  border-color: rgba(58,207,221);
+}
+.btn-red{
+  color: #fff;
+  background-color: rgba(204,73,80);
+  border-color: rgba(204,73,80);
+}
+.btn-red:hover {
+  color: #fff;
+  background-color: rgba(255,255,225);
+  border-color: rgba(255,255,225);
+}
+.bg-blueOne{
+  color: #fff;
+  background-color: rgba(24,144,255) !important;
+  border-color: rgba(24,144,255) !important;
+}
+.bg-green{
+  color: #fff;
+  background-color: rgba(69,183,149) !important;
+  border-color: rgba(69,183,149,1) !important;
+}
+.bg-yellow{
+  color: #fff;
+  background-color: rgba(250,204,20) !important;
+  border-color: rgba(250,204,20,1) !important;
+}
+.bg-purple{
+  color: #fff;
+  background-color: rgba(145,82,225) !important;
+  border-color: rgba(145,82,225) !important;
+}
+.bg-blueTwo{
+  color: #fff;
+  background-color: rgba(58,207,221) !important;
+  border-color: rgba(58,207,221) !important;
+}
+.bg-red{
+  color: #fff;
+  background-color: rgba(204,73,80) !important;
+  border-color: rgba(204,73,80) !important;
+}
+.btn-relative{
+  position: relative;
+}
+.icon-absolute{
+  position: absolute;
+  left: -3px;
+  top: -9px;
+}
+.icon-size{
+  font-size: 38px !important;
+}
+.text-blueOne{
+  color: rgba(24,144,255);
+}
+.text-green{
+  color: rgba(69,183,149);
+}
+.text-yellow{
+  color: rgba(250,204,20);
+}
+.text-purple{
+  color: rgba(145,82,225);
+}
+.text-blueTwo{
+  color: rgba(58,207,221);
+}
+.text-red{
+  color: rgba(204,73,80);
 }

app/public/report/js/rpt_archive.js

@@ -128,7 +128,7 @@ let rptArchiveObj = {
             try {
                 if (can_netcasign) {
                     const msgSign = _.find(ARCHIVE_ENCRYPTION_LIST, {rpt_id: me.currentNode.ID});
-                    console.log(msgSign);
+                    console.log(current_stage_id, msgSign, me.currentArchiveUuid);
                     me.currentEncryptionList = msgSign;
                     const uSignLogList = _.filter(signLogList, { uuid: me.currentArchiveUuid });
                     let html = '';

app/view/report/index_sign.ejs

@@ -470,8 +470,8 @@
                                 const encrypt = rptArchiveObj.currentEncryptionList.encryption[val];
                                 console.log(encrypt);
                                 const requestJson = {
-                                    width: encrypt.areas[0].width,
-                                    height: encrypt.areas[0].height,
+                                    width: encrypt.areas[0].width*0.75,
+                                    height: encrypt.areas[0].height*0.75,
                                     x: encrypt.areas[0].Left*0.75,
                                     y: encrypt.areas[0].Top*0.75,
                                     // page: rptArchiveObj.currentEncryptionList.total_page ? rptArchiveObj.currentEncryptionList.total_page : 1,