|
@@ -144,6 +144,7 @@ $(document).ready(() => {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+ console.log(xmjs, changeList);
|
|
|
SpreadJsObj.loadSheetData(xmjSpreadSheet, SpreadJsObj.DataType.Data, xmjs);
|
|
|
checkSelectAll(data);
|
|
|
},
|
|
@@ -265,7 +266,7 @@ $(document).ready(() => {
|
|
|
xmj_fbgc: xmjInfo.fbgc || '',
|
|
|
xmj_fxgc: xmjInfo.fxgc || '',
|
|
|
gcl_id: select.gcl_id,
|
|
|
- mx_id: select.mx_id,
|
|
|
+ mx_id: select.mx_id || '',
|
|
|
}
|
|
|
_.assign(data, newData);
|
|
|
}
|
|
@@ -596,7 +597,7 @@ $(document).ready(() => {
|
|
|
xmj_fbgc: leaf.fbgc || '',
|
|
|
xmj_fxgc: leaf.fxgc || '',
|
|
|
gcl_id: leaf.gcl_id,
|
|
|
- mx_id: leaf.mx_id,
|
|
|
+ mx_id: leaf.mx_id || '',
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -625,7 +626,7 @@ $(document).ready(() => {
|
|
|
let hadContinue = false;
|
|
|
for (const c of cList) {
|
|
|
const cInfo = c.deal_id ? _.find(changeList, { lid: c.deal_id }) : _.find(changeList, function (item) {
|
|
|
- return item.gcl_id === c.gcl_id && item.mx_id === c.mx_id;
|
|
|
+ return item.gcl_id === c.gcl_id && item.mx_id === (c.mx_id || '');
|
|
|
});
|
|
|
if (_.find(changeUsedData, {cbid: cInfo.id})) {
|
|
|
hadContinue = true;
|