|
@@ -139,7 +139,10 @@ let rationOprObj = {
|
|
|
for (let j = 0; j < cacheSection.length; j++) {
|
|
|
if (updateArr[i]["ID"] && cacheSection[j]["ID"]) {
|
|
|
if (cacheSection[j]["ID"] == updateArr[i]["ID"]) {
|
|
|
- updateArr[i]['rationGljList'] = rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] ? rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] : [];
|
|
|
+ updateArr[i]['rationGljList'] = rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] ?
|
|
|
+ rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] :
|
|
|
+ cacheSection[j]['rationGljList'] ?
|
|
|
+ cacheSection[j]['rationGljList'] : [];
|
|
|
updateArr[i]['rationCoeList'] = cacheSection[j]['rationCoeList'] ? cacheSection[j]['rationCoeList'] : [];
|
|
|
updateArr[i]['rationAssList'] = cacheSection[j]['rationAssList'];
|
|
|
updateArr[i]['rationInstList'] = cacheSection[j]['rationInstList'];
|
|
@@ -147,7 +150,10 @@ let rationOprObj = {
|
|
|
}
|
|
|
} else {
|
|
|
if (cacheSection[j][me.setting.header[0].dataCode] == updateArr[i][me.setting.header[0].dataCode]) {
|
|
|
- updateArr[i]['rationGljList'] = rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] ? rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] : [];
|
|
|
+ updateArr[i]['rationGljList'] = rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] ?
|
|
|
+ rationGLJOprObj.cache['_GLJ_' + cacheSection[j]['ID']] :
|
|
|
+ cacheSection[j]['rationGljList'] ?
|
|
|
+ cacheSection[j]['rationGljList'] : [];
|
|
|
updateArr[i]['rationCoeList'] = cacheSection[j]['rationCoeList'] ? cacheSection[j]['rationCoeList'] : [];
|
|
|
updateArr[i]['rationAssList'] = cacheSection[j]['rationAssList'];
|
|
|
updateArr[i]['rationInstList'] = cacheSection[j]['rationInstList'];
|
|
@@ -436,6 +442,7 @@ let rationOprObj = {
|
|
|
},
|
|
|
//todo: overwrite?
|
|
|
onClipboardPasted: function(e, info) {
|
|
|
+ console.log('cp');
|
|
|
let me = rationOprObj;
|
|
|
let cacheSection = me.getCache();
|
|
|
let updateArr = [], addArr = [];
|
|
@@ -510,6 +517,7 @@ let rationOprObj = {
|
|
|
}
|
|
|
};
|
|
|
if (updateArr.length > 0 || addArr.length > 0) {
|
|
|
+ console.log(updateArr);
|
|
|
me.mixUpdate = 1;
|
|
|
me.mixUpdateRequest(updateArr, addArr, []);
|
|
|
}
|