排序修改

app/public/js/shenpi.js

@@ -645,7 +645,7 @@ $(document).ready(function () {
         },
         setAllRightPwd: function(uid) {
             selects = [];
-            for (const l of ledgerTree.datas) {
+            for (const l of ledgerTree.nodes) {
                 const coo = _.find(ledger_cooperation_list, { 'ledger_id': l.ledger_id, 'user_id': parseInt(uid) });
                 if (l.pwd && !coo) {
                     delete l.pwd;
@@ -781,7 +781,7 @@ $(document).ready(function () {
                         flag = false;
                     }
                     $('#cooperation-num').text(ledger_cooperation_list.length);
-                    setLeftTable(ledgerTree.datas, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
+                    setLeftTable(ledgerTree.nodes, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
                     selects = [select];
                     // if(select) {
                     //     setAllChildrenCanEdit(select, flag);
@@ -841,7 +841,7 @@ $(document).ready(function () {
             }
             $('#stage_audits').html(newhtml);
             if(ledger_data) {
-                setLeftTable(ledgerTree.datas, ledger_cooperation_list, cur_uid, yb.name + '（原报）');
+                setLeftTable(ledgerTree.nodes, ledger_cooperation_list, cur_uid, yb.name + '（原报）');
                 ledgerSpreadObj.setAllRightPwd(cur_uid);
             }
         }
@@ -850,14 +850,14 @@ $(document).ready(function () {
                 ledger_data = true;
                 const ledgerList = setRightData(data.ledgerList, data.ledgerCooperationList);
                 ledgerTree.loadDatas(ledgerList);
-                ledger_cooperation_list = data.ledgerCooperationList;
-                const yb = _.find(accountList, { 'id': cur_uid });
-                setLeftTable(ledgerList, ledger_cooperation_list, cur_uid, yb.name + '（原报）');
                 // treeCalc.calculateAll(ledgerTree);
                 selects = [];
                 // updateByCanEdit(ledgerTree.nodes, _.filter(ledger_cooperation_list, { user_id: cur_uid }), false);
                 ledgerTree.loadPostData({update: selects});
                 console.log(ledgerTree);
+                ledger_cooperation_list = data.ledgerCooperationList;
+                const yb = _.find(accountList, { 'id': cur_uid });
+                setLeftTable(ledgerTree.nodes, ledger_cooperation_list, cur_uid, yb.name + '（原报）');
                 SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), SpreadJsObj.DataType.Tree, ledgerTree);
                 ledgerSpreadObj.setFontColor();
             }, null, true);
@@ -868,7 +868,7 @@ $(document).ready(function () {
     $('#stage_audits').change(function () {
         const uid = $(this).val();
         const title = $("#stage_audits option:selected").text();
-        setLeftTable(ledgerTree.datas, ledger_cooperation_list, uid, title);
+        setLeftTable(ledgerTree.nodes, ledger_cooperation_list, uid, title);
         ledgerSpreadObj.setAllRightPwd(uid);
     });
 
@@ -884,8 +884,8 @@ $(document).ready(function () {
         postData('/tender/' + cur_tenderid + '/shenpi/audit/save', data, function (result) {
             const lcindex = _.findIndex(ledger_cooperation_list, { ledger_id, user_id });
             ledger_cooperation_list.splice(lcindex, 1);
-            setLeftTable(ledgerTree.datas, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
-            const select = _.find(ledgerTree.datas, { ledger_id });
+            setLeftTable(ledgerTree.nodes, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
+            const select = _.find(ledgerTree.nodes, { ledger_id });
             delete select.pwd;
             // const refreshNode = ledgerTree.loadPostData({update: select});
             selects = [select];
@@ -946,8 +946,8 @@ $(document).ready(function () {
         postData('/tender/' + cur_tenderid + '/shenpi/audit/save', data, function (result) {
             const lcindex = _.findIndex(ledger_cooperation_list, { ledger_id, user_id });
             ledger_cooperation_list.splice(lcindex, 1, result);
-            setLeftTable(ledgerTree.datas, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
-            const select = _.find(ledgerTree.datas, { ledger_id });
+            setLeftTable(ledgerTree.nodes, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
+            const select = _.find(ledgerTree.nodes, { ledger_id });
             select.pwd = validText;
             const refreshNode = ledgerTree.loadPostData({update: select});
             ledgerSpreadObj.refreshTree(ledgerSpread.getActiveSheet(), refreshNode);
@@ -1063,36 +1063,6 @@ function setAllChildrenCanEdit(ledgerInfo, flag) {
         }
     }
 }
-// 编号排序，多重判断
-function sortByCode(a, b) {
-    let code1 = a.code.split('-');
-    let code2 = b.code.split('-');
-    let code1length = code1.length;
-    let code2length = code2.length;
-    for (let i = 0; i < code1length; i ++) {
-        if (i+1 <= code2length) {
-            if (code1[i] != code2[i]) {
-                if (!/^\d+$/.test(code1[i])) {
-                    return code1[i].charCodeAt() - code2[i].charCodeAt();
-                } else {
-                    return parseInt(code1[i]) - parseInt(code2[i]);
-                }
-            } else if (i+1 == code1length && code1[i] == code2[i]) {
-                if (code1length == code2length) {
-                    return 0;
-                } else {
-                    return code1length - code2length;
-                }
-            }
-        } else {
-            if (i+1 >= code1length) {
-                return 1;
-            } else {
-                return -1;
-            }
-        }
-    }
-}
 function setLeftTable(ledgerList, coolist, uid, title) {
     $('#stage_audit').text(title);
     const showCooList = _.filter(coolist, { 'user_id': parseInt(uid) });
@@ -1113,7 +1083,11 @@ function setLeftTable(ledgerList, coolist, uid, title) {
     }
 
     let html = '';
-    for (const sc of showCooList.sort(sortByCode)) {
+    // showCooList 需要根据右边台账顺序进行排序
+    showCooList.sort(function (a, b) {
+        return _.findIndex(ledgerList, { ledger_id: a.ledger_id }) - _.findIndex(ledgerList, { ledger_id: b.ledger_id });
+    });
+    for (const sc of showCooList) {
         const pichtml = sc.sign_path ? `<img src="/${sc.sign_path}" width="60"><input type="file" data-id="${sc.id}" class="upload-img-file" style="display: none;"><a href="javascript: void(0);" class="d-inline-flex upload-img">更改</a>`
             : `<img src="" style="display: none" width="60"><input type="file" data-id="${sc.id}" class="upload-img-file" style="display: none;"><a href="javascript: void(0);" class="btn btn-outline-primary btn-sm upload-img">上传签名</a>`;
         html += `<tr>` +