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

app/public/js/budget_compare.js

@@ -27,7 +27,7 @@ $(document).ready(() => {
             {title: '投资估算|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'gu_dgn_qty', hAlign: 2, width: 80, bc_type: 'number'},
             {title: '|经济指标', colSpan: '|1', rowSpan: '|1', field: 'gu_dgn_price', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'gu_tp', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
-            {title: '初步概算|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'gai_dgn_qty', hAlign: 2, width: 80, bc_type: 'number'},
+            {title: '设计概算|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'gai_dgn_qty', hAlign: 2, width: 80, bc_type: 'number'},
             {title: '|经济指标', colSpan: '|1', rowSpan: '|1', field: 'gai_dgn_price', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
             {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'gai_tp', hAlign: 2, width: 80, type: 'Number', bc_type: 'number'},
             {title: '施工图预算|数量1/数量2', colSpan: '3|1', rowSpan: '1|1', field: 'yu_dgn_qty', hAlign: 2, width: 80, bc_type: 'number'},

app/public/js/budget_info.js

@@ -282,9 +282,9 @@ $(document).ready(() => {
                 for (const level2 of level2List) {
                     jianAnHtml += `<tr>
                                             <td class="text-left pl-3">${level2.name}</td>
-                                            <td>${level2.gai_tp ? level2.gai_tp/10000 : 0}</td>
-                                            <td>${level2.final_tp ? level2.final_tp/10000 : 0}</td>
-                                            <td class="${ZhCalc.sub(level2.final_tp, level2.gai_tp) > 0 ? 'text-danger' : ZhCalc.sub(level2.final_tp, level2.gai_tp) === 0 ? '' : 'text-success'}">${ZhCalc.sub(level2.final_tp, level2.gai_tp)/10000}</td>
+                                            <td>${level2.gai_tp ? ZhCalc.div(level2.gai_tp, 10000) : 0}</td>
+                                            <td>${level2.final_tp ? ZhCalc.div(level2.final_tp, 10000) : 0}</td>
+                                            <td class="${ZhCalc.sub(level2.final_tp, level2.gai_tp) > 0 ? 'text-danger' : ZhCalc.sub(level2.final_tp, level2.gai_tp) === 0 ? '' : 'text-success'}">${ZhCalc.div(ZhCalc.sub(level2.final_tp, level2.gai_tp), 10000)}</td>
                                         </tr>`;
                 }
                 $('#jianan-table').html(jianAnHtml);
@@ -306,9 +306,9 @@ $(document).ready(() => {
                     total_gu_tp = ZhCalc.sub(ZhCalc.sum(_.map(level1List, 'gu_tp')), huishouInfo.gu_tp);
                     total_yu_tp = ZhCalc.sub(ZhCalc.sum(_.map(level1List, 'yu_tp')), huishouInfo.yu_tp);
                     total_price = ZhCalc.sub(ZhCalc.sum(_.map(level1List, 'total_price')), huishouInfo.total_price);
-                    total_rate = ZhCalc.round(ZhCalc.div(ZhCalc.sub(total_final_tp, total_gai_tp), total_gai_tp), 2);
-                    $('#total_gai_tp').text(total_gai_tp ? total_gai_tp/10000 : 0);
-                    $('#total_final_tp').text(total_final_tp ? total_final_tp/10000 : 0);
+                    total_rate = ZhCalc.div(ZhCalc.sub(total_final_tp, total_gai_tp), total_gai_tp);
+                    $('#total_gai_tp').text(total_gai_tp ? ZhCalc.div(total_gai_tp, 10000) : 0);
+                    $('#total_final_tp').text(total_final_tp ? ZhCalc.div(total_final_tp, 10000) : 0);
                     // level1List.push(huishouInfo);
                 } else {
                     total_gai_tp = ZhCalc.sum(_.map(level1List, 'gai_tp'));
@@ -316,12 +316,12 @@ $(document).ready(() => {
                     total_gu_tp = ZhCalc.sum(_.map(level1List, 'gu_tp'));
                     total_yu_tp = ZhCalc.sum(_.map(level1List, 'yu_tp'));
                     total_price = ZhCalc.sum(_.map(level1List, 'total_price'));
-                    total_rate = ZhCalc.round(ZhCalc.div(ZhCalc.sub(total_final_tp, total_gai_tp), total_gai_tp), 2);
-                    $('#total_gai_tp').text(total_gai_tp ? total_gai_tp/10000 : 0);
-                    $('#total_final_tp').text(total_final_tp ? total_final_tp/10000 : 0);
+                    total_rate = ZhCalc.div(ZhCalc.sub(total_final_tp, total_gai_tp), total_gai_tp);
+                    $('#total_gai_tp').text(total_gai_tp ? ZhCalc.div(total_gai_tp, 10000) : 0);
+                    $('#total_final_tp').text(total_final_tp ? ZhCalc.div(total_final_tp, 10000) : 0);
                 }
             }
-            $('#total_rate').text((total_rate ? total_rate : 0) + '%');
+            $('#total_rate').text((total_rate ? ZhCalc.round(ZhCalc.mul(total_rate,100), 2) : 0) + '%');
             if (total_rate > 0) {
                 $('#total_rate').parents('.canyu-band').removeClass('text-success').addClass('text-danger');
             } else if (total_rate < 0) {
@@ -331,12 +331,12 @@ $(document).ready(() => {
             }
             console.log(level1List);
             option.series[0].data = [
-                total_gu_tp/10000,
-                total_gai_tp/10000,
-                total_yu_tp/10000,
-                total_price/10000,
-                ZhCalc.add(total_change_tp, total_price)/10000,
-                total_final_tp/10000,
+                ZhCalc.div(total_gu_tp, 10000),
+                ZhCalc.div(total_gai_tp, 10000),
+                ZhCalc.div(total_yu_tp, 10000),
+                ZhCalc.div(total_price, 10000),
+                ZhCalc.div(ZhCalc.add(total_change_tp, total_price), 10000),
+                ZhCalc.div(total_final_tp, 10000),
             ];
             if (huishouInfo) level1List.push(huishouInfo);
             option2.legend.data = _.map(level1List, 'name');
@@ -345,7 +345,10 @@ $(document).ready(() => {
                     name: level1.name,
                     type: 'line',
                     stack: 'Total',
-                    data: [level1.gu_tp/10000, level1.gai_tp/10000, level1.yu_tp/10000, level1.total_price/10000, level1.final_tp/10000]
+                    data: [ZhCalc.div(level1.gu_tp, 10000), ZhCalc.div(level1.gai_tp, 10000),
+                        ZhCalc.div(level1.yu_tp, 10000), ZhCalc.div(level1.total_price, 10000),
+                        ZhCalc.div(level1.final_tp, 10000)
+                    ]
                 });
             }
         }

app/view/budget/detail_modal.ejs

@@ -7,7 +7,7 @@
                 <h5 class="modal-title">设置小数位数</h5>
             </div>
             <div class="modal-body">
-                <h6 id="del-node-hint">设置对投资估算、初步概算、施工图预算同时生效。</h6>
+                <h6 id="del-node-hint">设置对投资估算、设计概算、施工图预算同时生效。</h6>
                 <div class="form-group">
                     <div class="row">
                         <div class="col-4">
@@ -46,4 +46,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

app/view/budget/list.ejs

@@ -13,7 +13,7 @@
                 </div>
                 <% } else { %>
                 <table class="table table-hover table-bordered">
-                    <tr class="text-center"><th style="min-width: 200px">项目名称</th><th>概预算标准</th><th>创建时间</th><th>投资估算</th><th>初步概算</th><th>施工图预算</th><th>操作</th></tr>
+                    <tr class="text-center"><th style="min-width: 200px">项目名称</th><th>概预算标准</th><th>创建时间</th><th>投资估算</th><th>设计概算</th><th>施工图预算</th><th>操作</th></tr>
                     <tbody id="budgetList">
                     </tbody>
                 </table>
@@ -25,4 +25,4 @@
 <script>
     const budgetList = JSON.parse(unescape('<%- escape(JSON.stringify(budgetList)) %>'));
     const category = JSON.parse(unescape('<%- escape(JSON.stringify(categoryData)) %>'));
-</script>
+</script>

app/view/budget/sub_menu_list.ejs

@@ -2,7 +2,7 @@
 <nav-menu title="投资概况" url="/budget/<%= ctx.budget.id %>" ml="3" active="<%= ctx.url === '/budget/' + ctx.budget.id ? 1 : -1 %>"></nav-menu>
 <nav-menu title="造价对比" url="/budget/<%= ctx.budget.id %>/compare" ml="3" active="<%= ctx.url.indexOf('/compare') %>"></nav-menu>
 <nav-menu title="投资估算" url="/budget/<%= ctx.budget.id %>/gu" ml="3" active="<%= ctx.url.indexOf('/gu') %>"></nav-menu>
-<nav-menu title="初步概算" url="/budget/<%= ctx.budget.id %>/gai%>" ml="3" active="<%= ctx.url.indexOf('/gai') %>"></nav-menu>
+<nav-menu title="设计概算" url="/budget/<%= ctx.budget.id %>/gai%>" ml="3" active="<%= ctx.url.indexOf('/gai') %>"></nav-menu>
 <nav-menu title="施工图预算" url="/budget/<%= ctx.budget.id %>/yu" ml="3" active="<%= ctx.url.indexOf('/yu') %>"></nav-menu>
 <% if (!ctx.budget.readOnly && ctx.url.indexOf('/compare') === -1 && ctx.url !== '/budget/' + ctx.budget.id) { %>
 <div class="contarl-box"><button class="btn btn-primary btn-sm btn-block" data-toggle="modal" data-target="#budget-set">设置</button></div>

app/view/dashboard/index.ejs

@@ -99,7 +99,7 @@
                                                     <td><a href="/tender/<%- t.id %>"><%- t.name %></a></td>
                                                     <td>台账</td>
                                                     <td><%- (t.begin_time ? ctx.moment(t.begin_time).format('YYYY/MM/DD HH:mm') : '') %></td>
-                                                    <td><a href="/tender/<%- t.id %>/ledger/audit" class="btn btn-outline-primary btn-sm btn-table" role="button">审 批</a></td>
+                                                    <td><a href="/tender/<%- t.id %>/ledger/audit" class="btn btn-outline-primary btn-sm btn-table" role="button">审批</a></td>
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="5">
@@ -131,7 +131,7 @@
                                                     <td><a href="/tender/<%- audit.tid %>"><%- audit.name %></a> <a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>">第<%- audit.sorder %>期</a></td>
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.begin_time).format('YYYY/MM/DD HH:mm') %></td>
-                                                    <td><a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审 批</a></td>
+                                                    <td><a href="/tender/<%- audit.tid %>/measure/stage/<%- audit.sorder %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
                                                 </tr>
                                             <% } else { %>
                                                 <tr data-type="2">
@@ -241,9 +241,9 @@
                                                     <td>第<%- audit.sorder %>期</td>
                                                     <td><%- ctx.moment(audit.begin_time).format('YYYY/MM/DD HH:mm') %></td>
                                                     <% if (audit.type) { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审 批</a></td>
+                                                    <td><a href="/payment/<%- audit.tender_id %>/safe/<%- audit.td_id %>/bills" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
                                                     <% } else { %>
-                                                    <td><a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审 批</a></td>
+                                                    <td><a href="/payment/<%- audit.tender_id %>/detail/<%- audit.td_id %>" class="btn btn-outline-primary btn-sm btn-table" role="button"><% if (audit.sstatus === acStage.status.checkNoPre) { %>重新<% } %>审批</a></td>
                                                     <% } %>
                                                 </tr>
                                             <% } else { %>