中间计量排序调整

app/lib/stage_im.js

@@ -12,6 +12,10 @@ const Ledger = require('./ledger');
 const imType = require('../const/tender').imType;
 const mergeChar = ';';
 const version = '1.0';
+const SortType = {
+    GCL: 'gcl',
+    TZ: 'tz'
+};
 
 class StageIm {
     constructor(ctx) {
@@ -1030,10 +1034,29 @@ class StageIm {
         }
     }
 
+    _sortImData() {
+        const st = (['fj', 'sz'].indexOf(this.tender.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.TZ : SortType.GCL);
+        if (st === SortType.GCL) {
+            const helper = this.ctx.helper;
+            this.ImData.sort(function(x, y) {
+                const iCode = helper.compareCode(x.code, y.code);
+                return iCode === 0 ? x.lIndex - y.lIndex : iCode;
+            });
+        } else {
+            this.ImData.sort(function(x, y) {
+                return x.lIndex - y.lIndex;
+            });
+        }
+
+    }
+
     // 生成中间计量数据
     async buildImData() {
         this.up_field = 'unit_price';
         const self = this;
+        this.tender = this.ctx.tender;
         this.stage = this.ctx.stage;
         // 初始化
         await this._loadMainData();
@@ -1044,12 +1067,7 @@ class StageIm {
         // 生成数据
         this._recursiveBuildImData(this.billsTree.children);
         // 排序
-        if (this.stage.im_type !== imType.tz.value && this.stage.im_type !== imType.bb.value) {
-            this.ImData.sort(function(x, y) {
-                const iCode = self.ctx.helper.compareCode(x.code, y.code);
-                return iCode === 0 ? x.lIndex - y.lIndex : iCode;
-            });
-        }
+        this._sortImData();
         // 生成数据(需要缓存，并清理缓存)
         const pre = (this.stage.im_pre && this.stage.im_pre !== '') ? this.stage.im_pre + this.splitChar : '';
         for (const [i, im] of this.ImData.entries()) {

app/public/js/stage.js

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

app/public/js/stage_im.js

@@ -13,7 +13,11 @@ const stageIm = (function () {
     const resetFields = ['peg', 'bw', 'xm', 'drawing_code', 'calc_memo', 'position', 'jldy'];
     const splitChar = '-';
     const mergeChar = ';';
-    let stage, imType, decimal, filter, details, changes, importChanges, detailsAtt, ImData, pre, orgImData;
+    const SortType = {
+        GCL: 'gcl',
+        TZ: 'tz'
+    };
+    let tender, stage, imType, decimal, filter, details, changes, importChanges, detailsAtt, ImData, pre, orgImData;
     let up_field = 'unit_price';
     const gsTreeSetting = {
         id: 'ledger_id',
@@ -55,7 +59,8 @@ const stageIm = (function () {
     };
     const gsPos = new StagePosData(gsPosSetting);
 
-    function init (s, i, d, f) {
+    function init (t, s, i, d, f) {
+        tender = t;
         stage = s;
         imType = i;
         decimal = d;
@@ -951,7 +956,10 @@ const stageIm = (function () {
     }
 
     function _sortImData() {
-        if (stage.im_type !== imType.tz.value && stage.im_type !== imType.bb.value) {
+        const st = (['fj', 'sz'].indexOf(tender.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.TZ : SortType.GCL);
+        if (st === SortType.GCL) {
             ImData.sort(function (x, y) {
                 const iCode = compareCode(x.code, y.code);
                 return iCode === 0 ? x.lIndex - y.lIndex : iCode;
@@ -1233,5 +1241,6 @@ const stageIm = (function () {
         getRelaImData: getRelaImData,
         getRelaImData4Rela: getRelaImData4Rela,
         resetFields,
+        SortType,
     }
 })();