Browse Source

变更台账新增部位相关

MaiXinRong 1 year atrás
parent
commit
2e631c1dd1

+ 1 - 1
app/public/js/change_revise.js

@@ -3014,7 +3014,7 @@ $(document).ready(() => {
         const mainNode = mainTree.nodes[sel.row];
         if (!stdNode) return;
 
-        if (info.sheet.zh_setting.stdType === 'gcl') {
+        if (updateData.postData.stdType === 'gcl') {
             if (mainNode.code && mainNode.code !== '' && !mainTree.isLeafXmj(mainNode)) {
                 toastr.warning('非最底层项目下,不应添加节点');
                 return;

+ 23 - 2
app/public/js/revise_history.js

@@ -11,6 +11,7 @@ const ckBillsSpread = window.location.pathname + '-billsSelect';
 
 $(document).ready(() => {
     autoFlashHeight();
+    let reviseAtt;
     // 初始化spread
     const billsSpread = SpreadJsObj.createNewSpread($('#bills-spread')[0]);
     const billsSheet = billsSpread.getActiveSheet();
@@ -129,6 +130,7 @@ $(document).ready(() => {
                         SpreadJsObj.resetTopAndSelect(posSheet);
                         posSpreadObj.loadCurPosData();
                         posSearch.search($('#pos-keyword').val());
+                        reviseAtt.getCurAttHtml(SpreadJsObj.getSelectObject(billsSheet));
                     }
                 }
             }
@@ -156,7 +158,7 @@ $(document).ready(() => {
         },
     };
     // 加载清单&计量单元数据
-    postData('load', {filter:'reviseBills;revisePos'}, function (result) {
+    postData('load', {filter:'reviseBills;revisePos;att'}, function (result) {
         billsTree.loadDatas(result.reviseBills);
         treeCalc.calculateAll(billsTree);
         SpreadJsObj.loadSheetData(billsSheet, SpreadJsObj.DataType.Tree, billsTree);
@@ -167,6 +169,25 @@ $(document).ready(() => {
         pos.loadDatas(result.revisePos);
         posSpreadObj.loadCurPosData();
         SpreadJsObj.resetTopAndSelect(posSheet);
+
+        reviseAtt = $.ledger_att({
+            selector: '#fujian',
+            key: 'id',
+            masterKey: 'lid',
+            uploadUrl: 'file/upload',
+            deleteUrl: 'file/delete',
+            checked: true,
+            zipName: `${tenderName}-台账修订-附件.zip`,
+            readOnly: true, // todo fileUploadPermission,
+            locate: function (att) {
+                if (!att) return;
+                SpreadJsObj.locateTreeNode(billsSheet, att.node.tree_id, true);
+                billsTreeSpreadObj.loadRelaAtt();
+                posSpreadObj.loadCurPosData();
+            }
+        });
+        reviseAtt.loadDatas(result.att || []);
+        reviseAtt.getCurAttHtml(SpreadJsObj.getSelectObject(billsSheet));
     }, null);   
 
     $.divResizer({
@@ -224,7 +245,7 @@ $(document).ready(() => {
             const close = $('.active', '#side-menu').length === 0;
             $('a', '#side-menu').removeClass('active');
             tab.addClass('active');
-            $('.tab-content .tab-pane').removeClass('active');
+            $('.tab-content .tab-select-show').removeClass('active');
             tabPanel.addClass('active');
             showSideTools(tab.hasClass('active'));
             if (tab.attr('content') === '#search' && !searchLedger) {

+ 9 - 2
app/view/revise/history.ejs

@@ -60,7 +60,7 @@
             <div class="c-body" id="right-view" style="display: none; width: 33%;">
                 <div class="resize-x" id="revise-right-spr" r-Type="width" div1="#left-view" div2="#right-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
                 <div class="tab-content">
-                    <div id="xd-content" class="tab-pane">
+                    <div id="xd-content" class="tab-pane tab-select-show">
                         <div class="sjs-sh-2" style="overflow:auto">
                             <div class="form-group mt-2">
                                 <label >提交人</label>
@@ -76,7 +76,10 @@
                             </div>
                         </div>
                     </div>
-                    <div id="search" class="tab-pane">
+                    <div id="search" class="tab-pane tab-select-show">
+                    </div>
+                    <!--附件-->
+                    <div id="fujian" class="tab-pane tab-select-show">
                     </div>
                 </div>
             </div>
@@ -91,6 +94,9 @@
                 <li class="nav-item">
                     <a class="nav-link" content="#search" href="javascript: void(0);">查找定位</a>
                 </li>
+                <li class="nav-item" style="display: none">
+                    <a class="nav-link" content="#fujian" href="javascript: void(0);">附件</a>
+                </li>
             </ul>
         </div>
     </div>
@@ -103,4 +109,5 @@
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const nodeType = JSON.parse('<%- JSON.stringify(nodeType) %>');
     const settleStatus = JSON.parse('<%- JSON.stringify(settleStatus) %>');
+    const tenderName = '<%- ctx.tender.name %>';
 </script>

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

@@ -222,7 +222,7 @@
                     <a class="nav-link" content="#bills-tag" href="javascript: void(0);">书签</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" content="#fujian" href="javascript: void(0);">附件</a>
+                    <a class="nav-link" content="#fujian" href="javascript: void(0);" style="display: none">附件</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" content="#error-list" id="error-list-tab" href="javascript: void(0);" style="display: none;">错误列表</a>