|
|
@@ -482,7 +482,9 @@ let repositoryGljObj = {
|
|
|
},
|
|
|
|
|
|
getCurrentComponent: function (gljComponent, sort = false) {
|
|
|
- let me = repositoryGljObj, rst = [];
|
|
|
+ let me = repositoryGljObj,
|
|
|
+ rst = [],
|
|
|
+ IDCodeMapping = {};
|
|
|
for(let i = 0; i < gljComponent.length; i++){
|
|
|
let obj = {};
|
|
|
for(let j = 0; j < me.gljList.length; j++){
|
|
|
@@ -497,6 +499,7 @@ let repositoryGljObj = {
|
|
|
obj.consumeAmt = gljComponent[i].consumeAmt;
|
|
|
obj.consumeAmtProperty = gljComponent[i].consumeAmtProperty ? gljComponent[i].consumeAmtProperty : {};
|
|
|
rst.push(obj);
|
|
|
+ IDCodeMapping[obj.ID] = obj.code;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -507,6 +510,16 @@ let repositoryGljObj = {
|
|
|
else if(a.code < b.code) r = -1;
|
|
|
return r;
|
|
|
});
|
|
|
+ gljComponent.sort(function (a, b) {
|
|
|
+ let aV = IDCodeMapping[a.ID],
|
|
|
+ bV = IDCodeMapping[b.ID];
|
|
|
+ if (aV > bV) {
|
|
|
+ return 1;
|
|
|
+ } else if (aV < bV) {
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+ });
|
|
|
}
|
|
|
return rst;
|
|
|
},
|
|
|
@@ -1687,26 +1700,12 @@ let repositoryGljObj = {
|
|
|
}
|
|
|
return 0;
|
|
|
}
|
|
|
- /* if(this.currentOprParent){
|
|
|
- datas.sort(function (a, b) {
|
|
|
- let rst = 0;
|
|
|
- if(a.code > b.code){
|
|
|
- rst = 1;
|
|
|
- }
|
|
|
- else if(a.code < b.code){
|
|
|
- rst = -1;
|
|
|
- }
|
|
|
- return rst;
|
|
|
- });
|
|
|
- }
|
|
|
- else {*/
|
|
|
- //排序符号-
|
|
|
- datas.sort(function (a, b) {
|
|
|
- let aArr = a.code.split('-'),
|
|
|
- bArr = b.code.split('-');
|
|
|
- return recurCompare(aArr, bArr, 0);
|
|
|
- });
|
|
|
- // }
|
|
|
+ //排序符号-
|
|
|
+ datas.sort(function (a, b) {
|
|
|
+ let aArr = a.code.split('-'),
|
|
|
+ bArr = b.code.split('-');
|
|
|
+ return recurCompare(aArr, bArr, 0);
|
|
|
+ });
|
|
|
},
|
|
|
//工料机排序
|
|
|
sortGlj: function() {
|