Forráskód Böngészése

1. 台账分解,部位明细,右键菜单

MaiXinRong 6 éve
szülő
commit
92b75541cf

+ 2 - 1
app/public/js/ledger.js

@@ -675,7 +675,6 @@ $(document).ready(function() {
     } else {
         SpreadJsObj.forbiddenSpreadContextMenu('#ledger-spread', ledgerSpread);
     }
-    SpreadJsObj.forbiddenSpreadContextMenu('#pos-spread', posSpread);
 
     treeOperationObj.refreshOperationValid(ledgerSpread.getActiveSheet());
 
@@ -1012,6 +1011,8 @@ $(document).ready(function() {
                 },
             }
         });
+    } else {
+        SpreadJsObj.forbiddenSpreadContextMenu('#pos-spread', posSpread);
     }
 
     let stdChapter, stdBills, dealBills, searchLedger;

+ 2 - 0
app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -328,6 +328,8 @@ const SpreadJsObj = {
             }
             if (col.formatter) {
                 cell.formatter(col.formatter);
+            } else if (col.type === 'Number') {
+                cell.formatter('0.######');
             }
             if (sheet.zh_setting.getColor && Object.prototype.toString.apply(sheet.zh_setting.getColor) === "[object Function]") {
                 cell.backColor(sheet.zh_setting.getColor(data, col, sheet.getDefaultStyle().backColor));

+ 6 - 0
app/view/stage/index.ejs

@@ -32,6 +32,12 @@
                     </div>
                 </div>
             </div>
+            <div class="ml-auto">
+                <!--完成中间计量-->
+                <% if (!ctx.stage.check_detail) { %>
+                <span class="text-success" id="locked-hint">已完成,请继续完成「上报审批」 <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/unlock">解锁编辑</a></span>
+                <% } %>
+            </div>
         </div>
     </div>
     <div class="content-wrap pr-46">

+ 6 - 0
app/view/stage/pay.ejs

@@ -21,6 +21,12 @@
                     </div>
                 </div>
             </div>
+            <div class="ml-auto">
+                <!--完成中间计量-->
+                <% if (!ctx.stage.check_detail) { %>
+                <span class="text-success" id="locked-hint">已完成,请继续完成「上报审批」 <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/unlock">解锁编辑</a></span>
+                <% } %>
+            </div>
         </div>
     </div>
     <div class="content-wrap">