Преглед изворни кода

台账修订,按钮提示

MaiXinRong пре 5 година
родитељ
комит
3429aa2858

+ 3 - 2
app/controller/ledger_controller.js

@@ -21,6 +21,7 @@ const spreadConst = require('../const/spread');
 const fs = require('fs');
 const LzString = require('lz-string');
 const accountGroup = require('../const/account_group').group;
+const path = require('path');
 
 module.exports = app => {
 
@@ -494,8 +495,8 @@ module.exports = app => {
             if (file) {
                 try {
                     let fileName;
-                    if (file === 'template') {
-                        fileName = this.app.baseDir + '/app/public/files/template/ledger/导入分项清单Excel格式.xls';
+                    if (file === '导入分项清单EXCEL格式.xls') {
+                        fileName = path.join(this.app.baseDir, 'app', 'public', 'files', 'template', 'ledger', '导入分项清单EXCEL格式.xls');
                     } else if (file === 'ledger') {
                         const create_time = Date.parse(new Date()) / 1000;
                         fileName = this.app.baseDir + '/app/public/files/downloads/ledger/' + ctx.tender.id + '-' + create_time + '.xlsx';

BIN
app/public/files/template/ledger/导入分项清单EXCEL格式.xls


+ 1 - 1
app/view/ledger/explode_modal.ejs

@@ -6,7 +6,7 @@
                 <h5 class="modal-title">导入</h5>
             </div>
             <div class="modal-body">
-                <p>请上传符合格式的 <b>0号台帐</b> 格式的 .xls和.xlsx 文件,<a id="downloadLedgerTemplate" href="/tender/<%- ctx.tender.id %>/ledger/download/template">下载示例</a>。</p>
+                <p>请上传符合格式的 <b>0号台帐</b> 格式的 .xls和.xlsx 文件,<a id="downloadLedgerTemplate" href="/tender/<%- ctx.tender.id %>/ledger/download/导入分项清单EXCEL格式.xls">下载示例</a>。</p>
                 <div class="form-group">
                     <label for="exampleFormControlFile1">选择文件</label><i class="fa fa-spinner fa-pulse fa-lg fa-fw text-primary" id="select-excel-loading" style="display: none;"></i>
                     <input type="file" class="form-control-file" id="upload-ledger-file" accept="*.xls">

+ 3 - 3
app/view/revise/info.ejs

@@ -29,9 +29,9 @@
                     <a href="javascript: void(0);" name="base-opr" type="down-level" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="base-opr" type="down-move" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="base-opr" type="up-move" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                    <a href="javascript: void(0);" id="copy" class="btn btn-sm" data-toggle="tooltip disabled" data-placement="bottom" title="" data-original-title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
-                    <a href="javascript: void(0);" id="cut" class="btn btn-sm" data-toggle="tooltip disabled" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
-                    <a href="javascript: void(0);" id="paste" class="btn btn-sm" data-toggle="tooltip disabled" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
+                    <a href="javascript: void(0);" id="copy" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
+                    <a href="javascript: void(0);" id="cut" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
+                    <a href="javascript: void(0);" id="paste" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
                 </div>
                 <div class="d-inline-block">
                     <div class="input-group input-group-sm ml-2">

+ 4 - 4
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'),
         }
     };