资料归集批量删除相关

app/base/base_controller.js

@@ -35,6 +35,7 @@ class BaseController extends Controller {
                 }
             }
         }
+        if (ctx.controllerName === 'sp') ctx.menu = menuList.file;
         menuList.datacollect.display = ctx.session && ctx.session.sessionProject ? ctx.session.sessionProject.showDataCollect : false;
         menuList.payment.display = ctx.session && ctx.session.sessionProject ? ctx.session.sessionProject.showPayment : false;
         if (ctx.session && ctx.session.sessionProject && ctx.session.sessionProject.page_show && ctx.session.sessionProject.page_show.openManagement) {

app/public/js/file_detail.js

@@ -490,10 +490,10 @@ $(document).ready(function() {
             toastr.error('批量下载失败');
         });
     });
-    $('#batch-del-file').on('show.bs.modal', function(e) {
+    $('#batch-del-file-btn').click(() => {
         const checkes = $('[name=bd-check]:checked');
         if (checkes.length === 0) {
-            e.preventDefault();
+            return;
         } else {
             for (const c of checkes) {
                 const fid = c.getAttribute('fid');
@@ -502,10 +502,11 @@ $(document).ready(function() {
 
                 if (file.user_id !== userID) {
                     toastr.error(`文件【${file.filename + file.fileext}】不是您上传的文件，请勿删除`);
-                    e.preventDefault();
+                    return;
                 }
             }
         }
+        $('#batch-del-file').modal('show');
     });
     $('#batch-del-file-ok').click(function() {
         const del = [];

app/view/file/file.ejs

@@ -28,7 +28,7 @@
                         <% if (canUpload) { %>
                         <div class="py-2 pr-2"><a href="#add-file" data-toggle="modal" data-target="#add-file">上传文件</a></div>
                         <div class="p-2" id="rela-file-btn"><a href="#rela-file" data-toggle="modal" data-target="#rela-file">导入文件</a></div>
-                        <div class="p-2"><a href="#batch-del-file" data-toggle="modal" data-target="#batch-del-file">批量删除</a></div>
+                        <div class="p-2"><a href="javascript: void(0)" id="batch-del-file-btn">批量删除</a></div>
                         <% } %>
                         <div class="p-2"><a href="javascript: void(0)" id="batch-download">批量下载</a></div>
                         <div class="p-2">

publish.md

@@ -10,12 +10,24 @@
 ##特殊操作
 如果没有特殊说明，则在第默认操作的第3步前，执行相关脚本，如果有特殊要求，需特别说明
 
+### V3.5.31.0606
+2023-4-5 ~ 2023-6-6(uat) ~ ...
+#### uat
+```bash
+$ EGG_SERVER_ENV=uat npm run test-sim /db_script/tender_cache.js
+```
+#### prod
+```bash
+$ npm run test-sim /db_script/tender_cache.js
+```
+
+
 ### V3.5.30.0423 优化标段列表相关
 2023-03-31 ~ 2023-4-5(uat&prod)
 3.1 优化:
 #### uat
 ```bash
-$ EGG_SERVER_ENV=uat npm run test-sim /db_script/tender_cache.js
+$ EGG_SERVER_ENV=uat node db_script/tender_cache uat
 ```
 #### prod
 ```bash

sql/update.sql

@@ -8,78 +8,6 @@ ADD COLUMN `self_category_level`  varchar(255) NOT NULL DEFAULT '' AFTER `invali
 ALTER TABLE `zh_project_account`
 ADD COLUMN `show_revise_invalid`  tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否显示，台账修订作废' AFTER `self_category_level`;
 
-CREATE TABLE `zh_sub_project` (
-  `id` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT 'uuid',
-  `project_id` int(11) unsigned NOT NULL COMMENT '项目id',
-  `tree_pid` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT 'uuid',
-  `tree_order` int(11) unsigned NOT NULL,
-  `tree_level` int(11) unsigned NOT NULL,
-  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
-  `management` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '管理单位',
-  `user_id` int(11) unsigned NOT NULL COMMENT '用户id',
-  `rela_tender` varchar(1000) CHARACTER SET ascii NOT NULL DEFAULT '' COMMENT '关联标段id('',''分隔)',
-  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `is_folder` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '是否为文件夹',
-  `is_delete` tinyint(4) unsigned NOT NULL DEFAULT '0',
-  `budget_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT 'budget_id(zh_budget)',
-  `std_id` int(11) NOT NULL DEFAULT '0' COMMENT '概算标准id',
-  `std_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '概算标准名称',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `zh_sub_project_permission` (
-  `id` varchar(36) COLLATE utf8_unicode_ci NOT NULL,
-  `spid` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT 'sub_project_id(zh_sub_project)',
-  `pid` int(11) unsigned NOT NULL COMMENT 'project_id(zh_project)',
-  `uid` int(11) unsigned NOT NULL COMMENT 'user_id(zh_project_acccount)',
-  `manage_permission` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '管理，权限id列表('',''分隔)',
-  `budget_permission` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '动态投资，权限id列表('',''分隔)',
-  `file_permission` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '资料归集，权限id列表('',''分隔)',
-  `filing_type` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '资料归集，固定分类授权',
-  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
-  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后修改时间',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `zh_filing` (
-  `id` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT 'uuid',
-  `spid` varchar(36) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT 'sub_project_id(zh_sub_project)',
-  `tree_pid` varchar(36) COLLATE utf8_unicode_ci NOT NULL COMMENT 'uuid',
-  `tree_order` int(11) unsigned NOT NULL,
-  `tree_level` int(11) unsigned NOT NULL,
-  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '名称',
-  `filing_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '固定分类(具体见代码app/service/filing.js->filingType)',
-  `add_user_id` int(11) NOT NULL DEFAULT '0' COMMENT '添加人',
-  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `is_fixed` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '是否为固定项',
-  `is_deleted` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '是否已删除',
-  `file_count` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '文件数量',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='资料归集，资料分类';
-
-CREATE TABLE `zh_file` (
-  `id` varchar(36) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT 'uuid',
-  `spid` varchar(36) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT 'sub_project_id(zh_sub_project.id)',
-  `filing_id` varchar(36) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '分类id(zh_filing.id)',
-  `filing_type` tinyint(4) unsigned NOT NULL COMMENT '固定分类类型',
-  `user_id` int(11) unsigned NOT NULL COMMENT '用户id(zh_project_account.id)',
-  `user_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '用户名(缓存)',
-  `user_company` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '公司(缓存)',
-  `user_role` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '角色(缓存)',
-  `filename` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '文件名',
-  `fileext` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '文件类型',
-  `filesize` int(11) unsigned NOT NULL COMMENT '文件大小',
-  `filepath` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '文件路径(oss路径)',
-  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '最后更新时间',
-  `is_deleted` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '是否删除',
-  `is_rela` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '是否从标段内引用',
-  `rela_info` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '引用信息(json),非引用文件时为空字符串',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
 ALTER TABLE `zh_project` ADD `payment_setting` JSON NULL DEFAULT NULL COMMENT '支付审批模块设置' AFTER `fun_set`;
 
 CREATE TABLE `zh_payment_attachment`  (