Merge remote-tracking branch 'remotes/origin/dev' into uat

app/const/account_permission.js

@@ -28,7 +28,7 @@ const permission = {
         children: [
             { title: '创建标段', value: 1 },
             { title: '查阅所有标段', value: 2 },
-            { title: '维护签约清单', value: 3, hint: '开启该选项，台帐审批通过后，可上传签约清单', hintIcon: 'fa-question-circle' },
+            { title: '维护签约清单', value: 3, hint: '开启该选项，台账审批通过后，可上传签约清单', hintIcon: 'fa-question-circle' },
         ],
     },
     // cooperation: {

app/public/js/material_exponent.js

@@ -400,14 +400,16 @@ $(document).ready(() => {
     };
     materialExponentSpreadObj.refreshActn();
     materialExponentSpread.bind(spreadNS.Events.SelectionChanged, materialExponentSpreadObj.selectionChanged);
-    materialExponentSpread.bind(spreadNS.Events.ClipboardPasted, materialExponentSpreadObj.clipboardPasted);
-    SpreadJsObj.addDeleteBind(materialExponentSpread, materialExponentSpreadObj.deletePress);
+
+
 
     if (!readOnly) {
         $('#add').click(materialExponentSpreadObj.add);
         $('#del').click(materialExponentSpreadObj.del);
         materialExponentSpread.bind(spreadNS.Events.EditEnded, materialExponentSpreadObj.editEnded);
         materialExponentSpread.bind(spreadNS.Events.ButtonClicked, materialExponentSpreadObj.buttonClicked);
+        materialExponentSpread.bind(spreadNS.Events.ClipboardPasted, materialExponentSpreadObj.clipboardPasted);
+        SpreadJsObj.addDeleteBind(materialExponentSpread, materialExponentSpreadObj.deletePress);
         // 右键菜单
         $.contextMenu({
             selector: '#material-exponent-spread',

app/public/js/stage.js

@@ -1207,7 +1207,7 @@ $(document).ready(() => {
                     const [leafUsedBills, usedPos] = stageIm.getFirstUsed(node);
                     if (leafUsedBills) {
                         if (!$('#zhongjian').hasClass('active')) {
-                            const tab = $('#zhongjian'), tabPanel = $(tab.attr('content'));
+                            const tab = $('#zhongjiantab'), tabPanel = $(tab.attr('content'));
                             $('a', '.side-menu').removeClass('active');
                             $('.tab-content .tab-select-show').removeClass('active');
                             tab.addClass('active');

app/reports/util/rpt_excel_util.js

@@ -10,8 +10,7 @@ const jpcCmnHelper = require('../rpt_component/helper/jpc_helper_common');
 const DPI = jpcCmnHelper.getScreenDPI()[0];
 const fsUtil = require('../public/fsUtil');
 const dftHeadXml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
-const uuidV1 = require('uuid/v1');
-const atob = require('atob');
+const uuidV1 = require('uuid').v1;
 
 function writeContentTypes(sheets, isSinglePage, hasSignature) {
     const rst = [];

app/reports/util/rpt_pdf_util.js

@@ -11,7 +11,7 @@ const fs = require('fs');
 const jpcCmnHelper = require('../rpt_component/helper/jpc_helper_common');
 const DPI = jpcCmnHelper.getScreenDPI()[0] * PDF_SCALE;
 const JV = require('../rpt_component/jpc_value_define');
-const uuidV1 = require('uuid/v1');
+const uuidV1 = require('uuid').v1;
 
 let fontUtil = require('./rpt_font_util');
 

app/view/advance/index.ejs

@@ -28,11 +28,11 @@
                     </div>
                 </div>
             </div>
-            <div>
+            <div class="ml-auto">
                 <% if(showAddBtn) { %>
                     <form action="<%- preUrl %>" method="POST">
                         <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                        <button type="submit" class="btn btn-primary btn-sm pull-right">开始新一期</button>
+                        <button type="submit" class="btn btn-primary btn-sm">开始新一期</button>
                     </form>
                     <!-- <a id="advance_add" href="" class="btn btn-primary btn-sm pull-right"></a> -->
                 <% } %>

app/view/ledger/audit.ejs

@@ -22,16 +22,16 @@
             <div></div>
             <div class="ml-auto">
                 <% if (tender.ledger_status === auditConst.status.checkNo) { %>
-                    <a href="#sp-list"  data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark mr-1 sp-list-btn">退回意见</a>
+                    <a href="#sp-list"  data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark mr-1 sp-list-btn">退回意见</a>
                 <% } else if (tender.ledger_status === auditConst.status.checking) { %>
                     <% if (curAuditor.audit_id === ctx.session.sessionUser.accountId) { %>
-                        <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right mr-1">审批通过</a>
-                        <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right mr-1">审批退回</a>
+                        <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm mr-1">审批通过</a>
+                        <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm mr-1">审批退回</a>
                     <% } else {%>
-                        <a href="#sp-list"  data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark mr-1 sp-list-btn">审批中</a>
+                        <a href="#sp-list"  data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark mr-1 sp-list-btn">审批中</a>
                     <% } %>
                 <% } else if (tender.ledger_status === auditConst.status.checked) { %>
-                <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success btn-sm pull-right text-dark mr-1 sp-list-btn">审批通过</a>
+                <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success btn-sm text-dark mr-1 sp-list-btn">审批通过</a>
                 <% } %>
             </div>
         </div>

app/view/ledger/explode.ejs

@@ -48,17 +48,17 @@
                     <a class="btn btn-sm btn-primary mr-1" href="#ledger-check-modal" data-toggle="modal" data-target="#ledger-check-modal">数据检查</a>
                 <% } %>
                 <% if (tender.ledger_status === auditConst.status.checkNo) { %>
-                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark sp-list-btn">审批退回</a>
+                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark sp-list-btn">审批退回</a>
                 <% } else if (tender.ledger_status === auditConst.status.checking) { %>
-                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark sp-list-btn">审批中</a>
+                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-dark sp-list-btn">审批中</a>
                 <% } else if (tender.ledger_status === auditConst.status.checked) { %>
-                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right sp-list-btn">审批完成</a>
+                    <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm sp-list-btn">审批完成</a>
                 <% } %>
                 <% if (ctx.session.sessionUser.accountId === tender.user_id) { %>
                     <% if (tender.ledger_status === auditConst.status.uncheck) { %>
-                        <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
+                        <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm">上报审批</a>
                     <% } else if (tender.ledger_status === auditConst.status.checkNo) { %>
-                        <a href="#sp-list" data-type="show" data-toggle="modal" data-target="#sp-list" class="btn btn-primary btn-sm pull-right sp-list-btn" style="margin-right: 5px;">重新上报</a>
+                        <a href="#sp-list" data-type="show" data-toggle="modal" data-target="#sp-list" class="btn btn-primary btn-sm sp-list-btn" style="margin-right: 5px;">重新上报</a>
                     <% } %>
                 <% } %>
             </div>

app/view/measure/stage.ejs

@@ -10,9 +10,9 @@
                 <% if (ctx.session.sessionUser.accountId === ctx.tender.data.user_id && ctx.tender.data.ledger_status === auditConst.status.checked &&
                         (stages.length === 0 || stages[0].status === auditConst.status.checked)) { %>
                 <% if (ctx.helper.checkZero(ctx.tender.info.deal_param.contractPrice) && stages.length === 0) { %>
-                    <a href="#add-qi" data-toggle="modal" data-target="#tips" class="btn btn-primary btn-sm pull-right">开始新一期</a>
+                    <a href="#add-qi" data-toggle="modal" data-target="#tips" class="btn btn-primary btn-sm">开始新一期</a>
                 <% } else { %>
-                    <a href="#add-qi" data-toggle="modal" data-target="#add-qi" class="btn btn-primary btn-sm pull-right">开始新一期</a>
+                    <a href="#add-qi" data-toggle="modal" data-target="#add-qi" class="btn btn-primary btn-sm">开始新一期</a>
                 <% } %>
                 <% } %>
             </div>

app/view/revise/history.ejs

@@ -26,7 +26,7 @@
                 </div>
             </div>
             <div class="ml-auto">
-                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批完成</a>
+                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm">审批完成</a>
             </div>
         </div>
     </div>

app/view/revise/index.ejs

@@ -13,10 +13,10 @@
                     </div>
                 </div>
             </div>
-            <div>
+            <div class="ml-auto">
                 <% if (addValid) { %>
                 <div class="d-inline-block">
-                    <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm pull-right">新建修订</a>
+                    <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm">新建修订</a>
                 </div>
                 <% } %>
             </div>

app/view/stage/index.ejs

@@ -545,7 +545,7 @@
             <!--右侧菜单-->
             <ul class="nav flex-column right-nav">
                 <li class="nav-item">
-                    <a class="nav-link" content="#zhongjian" href="javascript: void(0);">中间计量</a>
+                    <a class="nav-link" content="#zhongjian" id="zhongjiantab" href="javascript: void(0);">中间计量</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" content="#search" href="javascript: void(0);">查找定位</a>

app/view/stage/modal.ejs

@@ -438,7 +438,7 @@
                 </div>
                 <div class="modal-height-300">
                     <table class="table table-bordered">
-                        <thead><tr><th>序号</th><th>计量单元</th><th>台帐数量</th><th><input id="cbr-check-all" type="checkbox"></th></tr></thead>
+                        <thead><tr><th>序号</th><th>计量单元</th><th>台账数量</th><th><input id="cbr-check-all" type="checkbox"></th></tr></thead>
                         <tbody id="cbr-pos-list"></tbody>
                     </table>
                 </div>

app/view/sum/index.ejs

@@ -4,8 +4,8 @@
             <div>
                 计量台账
             </div>
-            <div>
-                <a href="#add-qi" data-toggle="modal" data-target="#add-qi" class="btn btn-primary btn-sm pull-right">开始新一期</a>
+            <div class="ml-auto">
+                <a href="#add-qi" data-toggle="modal" data-target="#add-qi" class="btn btn-primary btn-sm">开始新一期</a>
             </div>
         </div>
     </div>

app/view/tender/shenpi_modal.ejs

@@ -42,12 +42,12 @@
                             <td></td>
                         </tr>
                         <tr>
-                            <td>台帐审批</td>
+                            <td>台账审批</td>
                             <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
                             <td><input type="checkbox"></td>
                         </tr>
                         <tr>
-                            <td>台帐修订</td>
+                            <td>台账修订</td>
                             <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
                             <td><input type="checkbox"></td>
                         </tr>

package.json

@@ -42,6 +42,7 @@
         "ueditor": "^1.2.3",
         "uglify-es": "^3.3.9",
         "uglify-js": "^3.3.27",
+        "uuid": "^3.2.1",
         "xmlreader": "^0.2.3",
         "zlib": "^1.0.5"
     },

sql/update.sql

@@ -24,3 +24,5 @@ CREATE TABLE `zh_shenpi_audit` (
   `audit_id` int(11) NOT NULL COMMENT '审批人id',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='审批流程人设置表';
+
+-- 2020/11/4 更新到uat