2 Commit-ok 93aaf554e6 ... c836ea3e96

Szerző SHA1 Üzenet Dátum
  MaiXinRong c836ea3e96 Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev 1 hete
  MaiXinRong 2e6f0f9774 资料归集,管理分类,附加配置相关 1 hete

+ 11 - 0
app/public/js/filing_manage.js

@@ -267,6 +267,8 @@ $(document).ready(function() {
                     { title: '文件数', colSpan: '1', rowSpan: '1', field: 'file_count', hAlign: 1, width: 50, readOnly: true },
                     { title: '授权', colSpan: '1', rowSpan: '1', field: 'permission_count', hAlign: 1, width: 50, readOnly: true },
                     { 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: 'tips', hAlign: 0, width: 280, formatter: '@', wordWrap: 1 },
                 ],
                 emptyRows: 0,
@@ -349,6 +351,15 @@ $(document).ready(function() {
                     toastr.error(err.stack ? '保存配置数据错误' : err);
                 }
             });
+            $(`#${setting.modal}-recalc`).click(function() {
+                self.reCalcFilingType();
+                SpreadJsObj.reLoadSheetData(self.sheet);
+            });
+            if (is_debug) {
+                $(`#${setting.modal}-recalc`).show();
+            } else {
+                $(`#${setting.modal}-recalc`).hide();
+            }
         }
         reCalcFilingType() {
             for (const node of this.checkTree.nodes) {

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

@@ -4599,7 +4599,7 @@ $(document).ready(() => {
                 if (node.filter) return null;
                 if (node.settle_status === settleStatus.finish) return null;
 
-                posData = stagePos.getLedgerPos(node.id) || [];
+                const posData = stagePos.getLedgerPos(node.id) || [];
                 const changePos = posData.find(x => { return x.name === changeBills.bwmx; });
                 if (changePos && changePos.settle_status) return null;
 

+ 1 - 0
app/view/file/manage_modal.ejs

@@ -12,6 +12,7 @@
                 </div>
             </div>
             <div class="modal-footer">
+                <button class="btn btn-sm btn-success" id="multi-set-recalc" style="display: none">计算新类型</button>
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
                 <button class="btn btn-sm btn-primary" id="multi-set-ok">确定</button>
             </div>