更改名称

app/controller/payment_controller.js

@@ -192,9 +192,9 @@ module.exports = app => {
                             await ctx.service.paymentTender.update(updateData, conditionData);
                         } else {
                             const folderInfo = await ctx.service.paymentFolder.getDataById(conditionData.id);
-                            if (!folderInfo) throw '目录不存在';
+                            if (!folderInfo) throw '文件夹不存在';
                             if (folderInfo.uid !== ctx.session.sessionUser.accountId && !ctx.session.sessionUser.is_admin) {
-                                throw '您没有权限重命名此目录';
+                                throw '您没有权限重命名此文件夹';
                             }
                             await ctx.service.paymentFolder.update(updateData, conditionData);
                         }

app/public/js/payment_index.js

@@ -2,7 +2,7 @@ $(function () {
     autoFlashHeight();
     const EmptyTenderHtml = [
         '<div class="jumbotron">',
-        '<h3 class="display-6">还没有标段及目录数据</h3>',
+        '<h3 class="display-6">还没有标段及文件夹数据</h3>',
         '</div>'
     ];
 
@@ -88,7 +88,7 @@ $(function () {
                 html.push('<div class="dropdown-divider"></div>\n');
             }
             if (auditPermission.admin && node.parent_id !== undefined && !node.is_tender) {
-                html.push('<a class="dropdown-item show_new_folder_btn" href="#add-folder" data-toggle="modal" data-target="#add-folder" data-parentName="'+ node.name +'" data-parentId="'+ node.id +'"><i class="fa fa-folder-o mr-2"></i>新建子目录</a>\n');
+                html.push('<a class="dropdown-item show_new_folder_btn" href="#add-folder" data-toggle="modal" data-target="#add-folder" data-parentName="'+ node.name +'" data-parentId="'+ node.id +'"><i class="fa fa-folder-o mr-2"></i>新建子文件夹</a>\n');
             }
             if (auditPermission.admin && node.is_leaf) {
                 html.push('<a class="dropdown-item show_new_tender_btn" href="javascript:void(0);"><i class="fa fa-folder-o mr-2"></i>新建标段</a>\n');
@@ -147,14 +147,14 @@ $(function () {
         if (parseInt($(this).attr('data-parentId')) === 0) {
             $('#parent_folder').hide();
             $('#parent_folder_name').val('');
-            $('#add-folder').find('.modal-title').text('新建目录');
-            $('#new_folder_name').siblings('label').text('目录名称');
+            $('#add-folder').find('.modal-title').text('新建文件夹');
+            $('#new_folder_name').siblings('label').text('文件夹名称');
             $('#parent_id').val(0);
         } else {
             $('#parent_folder').show();
             $('#parent_folder_name').val($(this).attr('data-parentName'));
-            $('#add-folder').find('.modal-title').text('新建子目录');
-            $('#new_folder_name').siblings('label').text('子目录名称');
+            $('#add-folder').find('.modal-title').text('新建子文件夹');
+            $('#new_folder_name').siblings('label').text('子文件夹名称');
             $('#parent_id').val($(this).attr('data-parentId'));
         }
     });
@@ -194,11 +194,11 @@ $(function () {
         const id = parseInt($(this).attr('data-id'));
         const info = type === 'tender' ? _.find(allTenders, { id }) : _.find(allFolders, { id });
         if (!info) {
-            toastr.error('目录或标段不存在');
+            toastr.error('文件夹或标段不存在');
             return;
         }
         $('#edit_name_input').val(info.name);
-        $('#edit-name').find('.modal-title').text(type === 'tender' ? '修改标段' : '修改目录');
+        $('#edit-name').find('.modal-title').text(type === 'tender' ? '修改标段' : '修改文件夹');
         $('#edit_name_id').val(info.id);
         $('#edit_name_type').val(type);
         $('#edit-name').modal('show');
@@ -242,12 +242,12 @@ $(function () {
     $('body').on('click', '.show_new_tender_btn', function () {
         const fid = $('.c-body table').find('.table-warning').attr('fid');
         if (!fid) {
-            toastr.error('请选中目录');
+            toastr.error('请选中文件夹');
             return;
         }
         const folderInfo = _.find(allFolders, { id: parseInt(fid) });
         if (!folderInfo || folderInfo.is_leaf === 0) {
-            toastr.error('目录不存在或存在子目录不能新建标段');
+            toastr.error('文件夹不存在或存在子文件夹不能新建标段');
             return;
         }
         $('#add-tender').modal('show');
@@ -271,11 +271,11 @@ $(function () {
         const id = parseInt($(this).attr('data-id'));
         const info = type === 'tender' ? _.find(allTenders, { id }) : _.find(allFolders, { id });
         if (!info) {
-            toastr.error('目录或标段不存在');
+            toastr.error('文件夹或标段不存在');
             return;
         }
         $('#edit_name_input').val(info.name);
-        $('#del-project').find('.modal-title').text(type === 'tender' ? '删除标段' : '删除目录');
+        $('#del-project').find('.modal-title').text(type === 'tender' ? '删除标段' : '删除文件夹');
         $('#del-project').find('h6 span').text(info.name);
         $('#del_id').val(info.id);
         $('#del_type').val(type);

app/service/payment_folder.js

@@ -21,13 +21,13 @@ module.exports = app => {
             try {
                 const tenderCount = await this.ctx.service.paymentTender.count({ folder_id: parentId });
                 if (tenderCount > 0) {
-                    throw '目录下存在标段无法创建子目录';
+                    throw '文件夹下存在标段无法创建子文件夹';
                 }
                 let level = 1;
                 let parent_path = '';
                 if (parentId !== 0) {
                     const parentFolderInfo = await this.getDataById(parentId);
-                    if (!parentFolderInfo) throw '父目录不存在';
+                    if (!parentFolderInfo) throw '父文件夹不存在';
                     level = parentFolderInfo.level + level;
                     if (parentFolderInfo.is_leaf) {
                         await transaction.update(this.tableName, { id: parentFolderInfo.id, is_leaf: 0 });
@@ -61,7 +61,7 @@ module.exports = app => {
             try {
                 const info = await this.getDataById(id);
                 if (info.uid !== this.ctx.session.sessionUser.accountId && !this.ctx.session.sessionUser.is_admin) {
-                    throw '您没有权限删除此目录';
+                    throw '您没有权限删除此文件夹';
                 }
                 let ids = [info.id];
                 if (info.parent_id === 0) {
@@ -86,7 +86,7 @@ module.exports = app => {
                 // 判断是否存在标段，有则无法删除目录
                 const tenderCount = await this.ctx.service.paymentTender.count({ folder_id: ids });
                 if (tenderCount > 0) {
-                    throw '目录下存在标段，无法删除';
+                    throw '文件夹下存在标段，无法删除';
                 }
                 await transaction.delete(this.tableName, { id: ids });
                 await transaction.commit();

app/service/payment_tender.js

@@ -55,7 +55,7 @@ module.exports = app => {
             try {
                 const folderInfo = await this.ctx.service.paymentFolder.getDataById(folderId);
                 if (!folderInfo || folderInfo.is_leaf === 0) {
-                    throw '目录不存在或存在子目录不能新建标段';
+                    throw '文件夹不存在或存在子目录不能新建标段';
                 }
                 const insertData = {
                     pid: projectId,
@@ -104,7 +104,7 @@ module.exports = app => {
                 }
                 const folderInfo = await this.ctx.service.paymentFolder.getDataById(tenderInfo.folder_id);
                 if (!folderInfo) {
-                    throw '目录不存在';
+                    throw '文件夹不存在';
                 }
                 // 判断folderInfo下是否还存在tender，不存在则把had_tender为0，并判断父节点是否需要也为0
                 const leafTenderCount = await transaction.count(this.tableName, { folder_id: folderInfo.id });

app/view/payment/index.ejs

@@ -5,7 +5,7 @@
             <div>
                 <% if (auditPermission.admin) { %>
                 <a href="javascript:void(0);" style="display: none" id="show_new_tender_btn" class="btn btn-sm btn-primary pull-right show_new_tender_btn">新建标段</a>
-                <a href="#add-folder" data-toggle="modal" data-target="#add-folder" data-parentId="0" class="btn btn-sm btn-primary pull-right mr-2 show_new_folder_btn">新建目录</a>
+                <a href="#add-folder" data-toggle="modal" data-target="#add-folder" data-parentId="0" class="btn btn-sm btn-primary pull-right mr-2 show_new_folder_btn">新建文件夹</a>
                 <% } %>
                 <% if (ctx.session.sessionUser.is_admin) { %>
                 <a href="#authority-list" data-toggle="modal" data-target="#authority-list" class="btn btn-sm btn-outline-secondary pull-right mr-2">权限管理</a>

app/view/payment/modal.ejs

@@ -4,16 +4,16 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">新建目录</h5>
+                <h5 class="modal-title">新建文件夹</h5>
             </div>
             <div class="modal-body">
                 <div class="form-group" id="parent_folder" style="display: none">
-                    <label for="parent_folder_name">父目录名称</label>
+                    <label for="parent_folder_name">父文件夹名称</label>
                     <input type="text" class="form-control form-control-sm" id="parent_folder_name" readonly>
                 </div>
                 <div class="form-group">
-                    <label for="new_folder_name">目录名称</label>
-                    <input type="text" class="form-control form-control-sm" id="new_folder_name" placeholder="请输入目录名称" required>
+                    <label for="new_folder_name">文件夹名称</label>
+                    <input type="text" class="form-control form-control-sm" id="new_folder_name" placeholder="请输入文件夹名称" required>
                     <div class="invalid-feedback">
                         <!--名称超过100个字，请缩减名称-->
                     </div>
@@ -31,7 +31,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">修改目录</h5>
+                <h5 class="modal-title">修改文件夹</h5>
             </div>
             <div class="modal-body">
                 <form>
@@ -62,7 +62,7 @@
             </div>
             <div class="modal-body">
                 <div class="form-group">
-                    <label for="add_tender_folder_name">目录名称</label>
+                    <label for="add_tender_folder_name">文件夹名称</label>
                     <input type="text" class="form-control form-control-sm" id="add_tender_folder_name" readonly>
                 </div>
                 <div class="form-group">