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

app/controller/template_controller.js

@@ -31,6 +31,9 @@ module.exports = app => {
                         case '导入工程量清单EXCEL格式.xls':
                             fileName = path.join(this.app.baseDir, 'app', 'public', 'files', 'template', 'ledger', '导入工程量清单EXCEL格式.xls');
                             break;
+                        case '估概预算示例EXCEL格式.xlsx':
+                            fileName = path.join(this.app.baseDir, 'app', 'public', 'files', 'template', file);
+                            break;
                         default:
                             throw '参数错误'
                     }

app/public/js/budget_detail.js

@@ -796,7 +796,7 @@ $(document).ready(() => {
         importExcel.doImport({
             template: {
                 hint: '导入Excel',
-                url: '/template/导入分项清单EXCEL格式.xlsx',
+                url: '/template/估概预算示例EXCEL格式.xlsx',
             },
             filter: needGcl,
             callback: function (sheet, filter) {