Pārlūkot izejas kodu

中间计量排序调整

MaiXinRong 1 gadu atpakaļ
vecāks
revīzija
8dd4149ab5
3 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
  1. 1 1
      app/lib/stage_im.js
  2. 1 1
      app/public/js/stage.js
  3. 4 4
      app/public/js/stage_im.js

+ 1 - 1
app/lib/stage_im.js

@@ -1035,7 +1035,7 @@ class StageIm {
     }
 
     _sortImData() {
-        const st = (['fj', 'sz'].indexOf(this.tender.s_type) > 0 && [imType.zl.value, imType.bw.value].indexOf(stage.im_type) >= 0)
+        const st = (['fj', 'sz'].indexOf(this.tender.info.s_type) > 0 && [imType.zl.value, imType.bw.value].indexOf(stage.im_type) >= 0)
             ? SortType.TZ
             : (stage.im_type !== imType.tz.value && stage.im_type !== imType.bb.value ? SortType.GCL : SortType.TZ);
         if (st === SortType.GCL) {

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

@@ -2354,7 +2354,7 @@ $(document).ready(() => {
             exprCacheKey: ['bqhtje'],
         });
         // 加载中间计量
-        stageIm.init(tender, stage, imType, tenderInfo.decimal, stage.assist ? stage.assist.ass_ledger_id : '');
+        stageIm.init(tenderInfo, stage, imType, tenderInfo.decimal, stage.assist ? stage.assist.ass_ledger_id : '');
         stageIm.loadData(result.ledgerData, result.posData, result.detailData, result.stageChange, result.import_change, result.detailAtt);
 
         errorList.loadHisErrorData();

+ 4 - 4
app/public/js/stage_im.js

@@ -17,7 +17,7 @@ const stageIm = (function () {
         GCL: 'gcl',
         TZ: 'tz'
     };
-    let tender, stage, imType, decimal, filter, details, changes, importChanges, detailsAtt, ImData, pre, orgImData;
+    let tenderInfo, stage, imType, decimal, filter, details, changes, importChanges, detailsAtt, ImData, pre, orgImData;
     let up_field = 'unit_price';
     const gsTreeSetting = {
         id: 'ledger_id',
@@ -59,8 +59,8 @@ const stageIm = (function () {
     };
     const gsPos = new StagePosData(gsPosSetting);
 
-    function init (t, s, i, d, f) {
-        tender = t;
+    function init (ti, s, i, d, f) {
+        tenderInfo = ti;
         stage = s;
         imType = i;
         decimal = d;
@@ -956,7 +956,7 @@ const stageIm = (function () {
     }
 
     function _sortImData() {
-        const st = (['fj', 'sz'].indexOf(tender.s_type) > 0 && [imType.zl.value, imType.bw.value].indexOf(stage.im_type) >= 0)
+        const st = (['fj', 'sz'].indexOf(tenderInfo.s_type) > 0 && [imType.zl.value, imType.bw.value].indexOf(stage.im_type) >= 0)
             ? SortType.TZ
             : (stage.im_type !== imType.tz.value && stage.im_type !== imType.bb.value ? SortType.GCL : SortType.TZ);
         if (st === SortType.GCL) {