Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/ledger_gather.js

@@ -178,7 +178,7 @@ $(document).ready(() => {
 
         const chapterData = gclGatherModel.gatherChapterData(chapter, ['total_price'], filter);
         for (const c of chapterData) {
-            c.compare_tp = ZhCalc.sub(c.deal_bills_tp, c.total_price);
+            c.compare_tp = ZhCalc.sub(c.total_price, c.deal_bills_tp);
         }
         generateChapterHtml(chapterData);
     }, null, true);

app/public/js/stage.js

@@ -1197,11 +1197,9 @@ $(document).ready(() => {
         });
     }
     stageTreeSpreadObj.loadExprToInput(slSpread.getActiveSheet());
-    //let check_correct = false;
     $.contextMenu({
         selector: '#stage-ledger',
         build: function ($trigger, e) {
-            e.data.items.correct_percent.selected = check_correct;
             const target = SpreadJsObj.safeRightClickSelection($trigger, e, slSpread);
             return target.hitTestType === spreadNS.SheetArea.viewport || target.hitTestType === spreadNS.SheetArea.rowHeader;
         },
@@ -1238,22 +1236,6 @@ $(document).ready(() => {
                     }
                 },
             },
-            // 'correct_percent': {
-            //     name: '使用数量矫正完成率',
-            //     type: 'checkbox',
-            //     events: {
-            //         change: function (e) {
-            //             check_correct = e.data.commands.correct_percent.$input[0].checked;
-            //             const sheet = slSpread.getActiveSheet();
-            //             const col = sheet.zh_setting.cols.find(x => {
-            //                 return x.field === 'end_gather_percent' || x.field === 'end_correct_percent'
-            //             });
-            //             col.field = check_correct ? 'end_correct_percent' : 'end_gather_percent';
-            //             SpreadJsObj.reLoadColsData(sheet, [col]);
-            //             e.data.$menu.hide();
-            //         }
-            //     },
-            // }
         }
     });
 

app/view/ledger/gather.ejs

@@ -46,7 +46,7 @@
                         <div class="side-bar-1"></div>
                         <div class="sjs-sh-1">
                             <table class="table table-bordered">
-                                <tr><th>章节</th><th>章节名称</th><th>签约金额</th><th>台账金额</th><th>签约-台账</th></tr>
+                                <tr><th>章节</th><th>章节名称</th><th>签约金额</th><th>台账金额</th><th>台账-签约</th></tr>
                                 <tbody id="chapter-list"></tbody>
                             </table>
                         </div>