Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/extend/helper.js

@@ -144,25 +144,25 @@ module.exports = {
             } else {
                 let num = val.toString();
                 if (num.lastIndexOf('.') === -1) {
-                    num += '.';
-                    num += this.makezero(decimals);
+                    // num += '.';
+                    // num += this.makezero(decimals);
                     val = num;
                 } else {
                     const valdecimals = num.split('.')[1].length;
                     if (parseInt(valdecimals) < parseInt(decimals)) {
-                        num += this.makezero(parseInt(decimals) - parseInt(valdecimals));
+                        // num += this.makezero(parseInt(decimals) - parseInt(valdecimals));
                         val = num;
                     } else if (parseInt(valdecimals) > parseInt(decimals)) {
                         val = parseFloat(val) !== 0 ? Math.round(this.accMul(val, this.makemultiple(decimals))) / this.makemultiple(decimals) : this.makedecimalzero(decimals);
                         let num = val.toString();
                         if (num.lastIndexOf('.') === -1) {
-                            num += '.';
-                            num += this.makezero(decimals);
+                            // num += '.';
+                            // num += this.makezero(decimals);
                             val = num;
                         } else {
                             const valdecimals = num.split('.')[1].length;
                             if (parseInt(valdecimals) < parseInt(decimals)) {
-                                num += this.makezero(parseInt(decimals) - parseInt(valdecimals));
+                                // num += this.makezero(parseInt(decimals) - parseInt(valdecimals));
                                 val = num;
                             }
                         }

app/public/js/change_calculation.js

@@ -120,6 +120,9 @@ Number.prototype.sub = function (arg){
 
 //四舍五入
 function roundnum(val,decimals){
+    if (val === '' || val === null) {
+        return '';
+    }
     if(val !== ''){
         val = parseFloat(val);
         let _sign = (val < 0) ? -1 : 1;

app/public/js/change_set.js

@@ -213,6 +213,10 @@ $(document).ready(() => {
             if ( result.err === 0) {
                 $('.reduction-code').attr('data-code', $('input[name="code"]').val());
                 toastr.success(result.msg);
+                $('#show-save-btn').hide();
+                $('.title-main').removeClass('bg-warning');
+                $('#back-change-list').val($('#change-list').val());
+                $('#back-change-whitelist').val($('#change-whitelist').val());
             } else {
                 toastr.error(result.msg);
             }
@@ -220,6 +224,18 @@ $(document).ready(() => {
         return false;
     });
 
+    $('#cancel_change').on('click', function () {
+        $('#show-save-btn').hide();
+        $('.title-main').removeClass('bg-warning');
+        $('#change-list').val($('#back-change-list').val());
+        $('#change-whitelist').val($('#back-change-whitelist').val());
+        tableDataRemake(changeListData);
+        // 重新绘制table
+        maketablelist();
+
+        toastr.success('已还原到上次保存状态');
+    });
+
     // 审批人分组选择
     $('#account_group').change(function () {
         let account_html = '<option value="0">选择审批人</option>';
@@ -754,6 +770,7 @@ function totalamount(decimal){
     });
     $('.ctatalamount').eq(1).text(ctotalnum != 0 ? roundnum(ctotalnum,decimal) : zero);
     $('.otatalamount').eq(1).text(ototalnum != 0 ? roundnum(ototalnum,decimal) : zero);
+    judgeChange();
 }
 
 // 找出单位对应的小数位数值
@@ -768,3 +785,20 @@ function findDecimal(unit) {
     }
     return value;
 }
+// 判断是否有更改过
+function judgeChange() {
+    let change = false;
+    if ($('#change-list').val() !== $('#back-change-list').val()) {
+        change = true;
+    }
+    if ($('#change-whitelist').val() !== $('#back-change-whitelist').val()) {
+        change = true;
+    }
+    if (change) {
+        $('#show-save-btn').show();
+        $('.title-main').addClass('bg-warning');
+    } else {
+        $('#show-save-btn').hide();
+        $('.title-main').removeClass('bg-warning');
+    }
+}

app/view/change/info.ejs

@@ -119,16 +119,16 @@
     </div>
 </div>
 <div class="panel-content">
-    <div class="panel-title">
+    <div class="panel-title pr-0">
         <div class="title-main d-flex justify-content-between">
             <h2 id="info_title" class="show_title">变更信息</h2>
-            <div id="bills_title" class="show_title" style="display: none">
+            <div id="bills_title" class="show_title" style="line-height:34px;display: none">
                 <div>
                     <% if (auditStatus === 1 || auditStatus === 2) { %>
                     <div class="d-inline-block">
                         <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加台帐清单</a>
                     </div>
-                    <div class="d-inline-block">
+                    <div class="d-inline-block mr-3">
                         <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加空白清单</a>
                     </div>
                     <% } %>
@@ -148,7 +148,7 @@
                     <% } %>
                 </div>
             </div>
-            <div id="files_title" class="show_title" style="display: none">
+            <div id="files_title" class="show_title" style="line-height:34px;display: none">
                 <% if (auditStatus === 1 || auditStatus === 2 || auditStatus === 6) { %>
                 <a href="#addfujian" data-toggle="modal" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单">
                     <i class="fa fa-cloud-upload" aria-hidden="true"></i> 上传附件
@@ -161,9 +161,11 @@
             <input id="changeId" value="<%= change.cid %>" type="hidden">
             <!--info状态区分-->
             <% if (auditStatus === 1 || auditStatus === 2) { %>
-            <div>
-                <button class="btn btn-sm btn-success pull-right" id="save_change"><i class="fa fa-save"></i> 保存修改</button>
-            </div>
+                <div class="ml-auto px-4" id="show-save-btn" style="display: none">
+                    <span>您修改了变更内容，记得保存修改。</span>
+                    <button class="btn btn-sm btn-primary" id="save_change"><i class="fa fa-save"></i> 保存修改</button>
+                    <button class="btn btn-sm btn-light" id="cancel_change">取消</button>
+                </div>
             <% } %>
         </div>
     </div>
@@ -279,6 +281,12 @@
                 <input type="hidden" name="changeaudit" id="changeaudit" value="">
                 <input type="hidden" name="changestatus" id="changeStatus">
                 <input type="hidden" name="cid" value="<%= change.cid %>">
+
+                <!--保留旧数据回溯-->
+                <input type="hidden" id="back-change-list" value="<%= changeListData %>">
+                <input type="hidden" id="back-change-whitelist" value="<%= changeWhiteListData %>">
+                <!--<input type="hidden" id="change-info" value="">-->
+                <input type="hidden" id="back-change-info" value="<%= JSON.stringify(change) %>">
             </form>
             <% } else { %>
             <div class="row">
@@ -408,7 +416,7 @@
             <div class="sjs-height-0">
             <!--变更清单-->
             <% if (auditStatus === 1 || auditStatus === 2) { %>
-            <table class="table table-striped table-bordered nowrap qd-table table-list" id="tablelist" cellspacing="0" style="width:100%">
+            <table class="table table-striped table-bordered nowrap qd-table table-list" id="tablelist" cellspacing="0" style="margin-top:0 !important;width:100%">
                 <thead>
                 <tr>
                     <th rowspan="2" class="text-center">清单编号</th>

config/config.default.js

@@ -129,17 +129,17 @@ module.exports = appInfo => {
     config.customLogger = {
         // 操作失败日志
         fail: {
-            file: path.join(appInfo.root, 'logs', appInfo.name + '-' + config.version, 'fail.log'),
+            file: path.join(appInfo.root, 'logs', appInfo.name, config.version, 'fail.log'),
         },
         // 以下为业务日志
         ledger: {
-            file: path.join(appInfo.root, 'logs', appInfo.name + '-' + config.version, 'ledger.log'),
+            file: path.join(appInfo.root, 'logs', appInfo.name, config.version, 'ledger.log'),
         },
         stage: {
-            file: path.join(appInfo.root, 'logs', appInfo.name + '-' + config.version, 'stage.log'),
+            file: path.join(appInfo.root, 'logs', appInfo.name, config.version, 'stage.log'),
         },
         mixed: {
-            file: path.join(appInfo.root, 'logs', appInfo.name + '-' + config.version, 'mixed.log'),
+            file: path.join(appInfo.root, 'logs', appInfo.name, config.version, 'mixed.log'),
         }
     };
 

config/config.qa.js

@@ -17,9 +17,9 @@ module.exports = appInfo => {
             // 端口号
             port: '3306',
             // 用户名
-            user: 'root',
+            user: 'zh_calc',
             // 密码
-            password: 'root',
+            password: 'calc2019',
             // 数据库名
             database: 'calculation',
         },
@@ -34,18 +34,15 @@ module.exports = appInfo => {
     // redis设置
     config.redis = {
         client: {
-            host: '192.168.1.70',
+            host: '127.0.0.1',
             port: '6379',
-            password: 'test',
+            password: '',
             db: '0',
         },
         agent: true,
         version: '1.0.0',
     };
 
-    //config.filePath = appInfo.baseDir + '/app/public/files';
-    config.filePath = '//Mai/share_calc';
-
     // session配置
     config.session = {
         key: 'ZHC_SESS',
@@ -56,15 +53,5 @@ module.exports = appInfo => {
         rolling: true, // 每次都更新session有效期
     };
 
-    // 是否压缩替换前端js
-    config.min = false;
-
-    config.logger = {
-        consoleLevel: 'WARN',
-        disableConsoleAfterReady: false,
-    };
-
-    config.is_debug = true;
-
     return config;
 };

package.json

@@ -60,7 +60,7 @@
     "stop": "egg-scripts stop",
     "start-qa": "set EGG_SERVER_ENV=qa&&egg-scripts start --daemon --port 7002",
     "dev": "egg-bin dev --port 7002",
-    "dev-local": "set EGG_SERVER_ENV=qa&&egg-bin dev --port 7002",
+    "dev-local": "set EGG_SERVER_ENV=local&&egg-bin dev --port 7002",
     "dev-qa": "set EGG_SERVER_ENV=qa&&egg-bin dev --port 7002",
     "dev-test": "set EGG_SERVER_ENV=test&&egg-bin dev --port 7002",
     "test": "npm run lint -- --fix&&npm run test-local",