资料归集，授权用户，显示归档单位

app/public/js/file_detail.js

@@ -1233,6 +1233,7 @@ $(document).ready(function() {
                 cols: [
                     { title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 200, formatter: '@', cellType: 'tree'},
                     { title: '选择', colSpan: '1', rowSpan: '1', field: 'check', hAlign: 1, width: 45, cellType: 'checkbox' },
+                    { title: '归档单位', colSpan: '1', rowSpan: '1', field: 'file_company', hAlign: 0, width: 80, formatter: '@' },
                 ],
                 emptyRows: 0,
                 headRows: 1,
@@ -1478,6 +1479,7 @@ $(document).ready(function() {
                     is_fixed: node.is_fixed,
                     filing_type: node.filing_type + '',
                     tips: node.tips,
+                    file_company: node.file_company,
                     file_count: node.file_count,
                 });
             }

app/public/js/filing_manage.js

@@ -269,6 +269,7 @@ $(document).ready(function() {
                     { title: '固定', colSpan: '1', rowSpan: '1', field: 'is_fixed', hAlign: 1, width: 50, cellType: 'checkbox' },
                     { title: '类型', colSpan: '1', rowSpan: '1', field: 'filing_type', hAlign: 1, width: 50, readOnly: true, visible: is_debug, },
                     { title: '新类型', colSpan: '1', rowSpan: '1', field: 'new_filing_type', hAlign: 1, width: 50, readOnly: true, visible: is_debug, },
+                    { title: '归档单位', colSpan: '1', rowSpan: '1', field: 'file_company', hAlign: 0, width: 80, formatter: '@' },
                     { title: '提示', colSpan: '1', rowSpan: '1', field: 'tips', hAlign: 0, width: 280, formatter: '@', wordWrap: 1 },
                 ],
                 emptyRows: 0,
@@ -398,7 +399,7 @@ $(document).ready(function() {
             const data = [];
             const getUpdateData = function(children) {
                 for (const [i, node] of children.entries()) {
-                    data.push({ id: node.id, is_fixed: node.is_fixed, filing_type: node.new_filing_type, tree_order: i + 1, tips: node.tips || '' });
+                    data.push({ id: node.id, is_fixed: node.is_fixed, filing_type: node.new_filing_type, tree_order: i + 1, tips: node.tips || '', file_company: node.file_company || '' });
                     // data.push({ id: node.id, is_fixed: node.is_fixed, filing_type: node.filing_type, file_count: node.file_count, new_filing_type: node.new_filing_type, tree_order: i + 1, tips: node.tips || '' });
                     if (node.children) getUpdateData(node.children);
                 }
@@ -423,6 +424,7 @@ $(document).ready(function() {
                     org_is_fixed: node.is_fixed,
                     is_fixed: node.is_fixed,
                     filing_type: node.filing_type,
+                    file_company: node.file_company,
                     tips: node.tips,
                     file_count: node.file_count,
                     permission_count: node.permission_count,

app/service/filing.js

@@ -94,7 +94,7 @@ module.exports = app => {
                 const newData = {
                     id: f.newId, tree_pid : parent ? parent.newId : rootId, tree_level: f.tree_level, tree_order: f.tree_order,
                     spid, add_user_id: this.ctx.session.sessionUser.accountId, is_fixed: f.is_fixed,
-                    filing_type: f.filing_type, name: f.name, tips: f.tips,
+                    filing_type: f.filing_type, name: f.name, tips: f.tips, file_company: f.file_company,
                 };
                 insertData.push(newData);
             }
@@ -297,7 +297,7 @@ module.exports = app => {
 
             const sourceData = await this.getAllDataByCondition({ where: { spid } });
 
-            const validFields = ['id', 'is_fixed', 'name', 'filing_type', 'tree_order', 'tips'];
+            const validFields = ['id', 'is_fixed', 'name', 'filing_type', 'tree_order', 'tips', 'file_company'];
             const updateData = [];
             for (const d of data) {
                 if (!d.id) throw '提交数据格式错误';

app/view/file/file_modal.ejs

@@ -1,6 +1,6 @@
 <% if (ctx.session.sessionUser.is_admin) { %>
 <div class="modal" id="filing-permission">
-    <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-dialog modal-lgx" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">授权用户</h5>