|
@@ -278,7 +278,16 @@ $(document).ready(() => {
|
|
|
changeList = result.changeList;
|
|
|
select.is_change = 1;
|
|
|
changeListData[gclIndex].is_change = 1;
|
|
|
- SpreadJsObj.reLoadRowData(gclSpreadSheet, gclIndex);
|
|
|
+ // 如果是已勾选清单,需要另外找值勾选
|
|
|
+ if ($('#show-select-btn').is(':checked')) {
|
|
|
+ const newGclIndex = gclSpreadSheet.zh_data.indexOf(gclInfo);
|
|
|
+ if (newGclIndex !== -1) {
|
|
|
+ gclSpreadSheet.zh_data[newGclIndex].is_change = 1;
|
|
|
+ SpreadJsObj.reLoadRowData(gclSpreadSheet, newGclIndex);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ SpreadJsObj.reLoadRowData(gclSpreadSheet, gclIndex);
|
|
|
+ }
|
|
|
checkSelectAll(gclInfo);
|
|
|
}, function () {
|
|
|
info.sheet.setValue(info.row, info.col, 0);
|
|
@@ -308,17 +317,36 @@ $(document).ready(() => {
|
|
|
checkSelectAll(gclInfo);
|
|
|
if (select.deal_id) {
|
|
|
changeListData[gclIndex].is_change = 0;
|
|
|
- SpreadJsObj.reLoadRowData(gclSpreadSheet, gclIndex);
|
|
|
+ if ($('#show-select-btn').is(':checked')) {
|
|
|
+ const newGclIndex = gclSpreadSheet.zh_data.indexOf(gclInfo);
|
|
|
+ if (newGclIndex !== -1) {
|
|
|
+ gclSpreadSheet.zh_data[newGclIndex].is_change = 0;
|
|
|
+ SpreadJsObj.reLoadRowData(gclSpreadSheet, newGclIndex);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ SpreadJsObj.reLoadRowData(gclSpreadSheet, gclIndex);
|
|
|
+ }
|
|
|
} else {
|
|
|
let isChange = false;
|
|
|
gclInfo.leafXmjs.forEach(function (item) {
|
|
|
- if (item.gcl_id === select.gcl_id && (item.mx_id === undefined || item.mx_id === select.mx_id) && item.is_change) {
|
|
|
+ if (_.findIndex(changeList, { gcl_id: item.gcl_id, mx_id: item.mx_id || '' }) !== -1) {
|
|
|
isChange = true;
|
|
|
+ return;
|
|
|
}
|
|
|
});
|
|
|
if (!isChange) {
|
|
|
changeListData[gclIndex].is_change = 0;
|
|
|
- SpreadJsObj.reLoadRowData(gclSpreadSheet, gclIndex);
|
|
|
+ // 如果是已勾选清单,需要另外找值勾选
|
|
|
+ if ($('#show-select-btn').is(':checked')) {
|
|
|
+ const newGclIndex = gclSpreadSheet.zh_data.indexOf(gclInfo);
|
|
|
+ if (newGclIndex !== -1) {
|
|
|
+ gclSpreadSheet.zh_data[newGclIndex].is_change = 0;
|
|
|
+ SpreadJsObj.reLoadRowData(gclSpreadSheet, newGclIndex);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ SpreadJsObj.reLoadRowData(gclSpreadSheet, gclIndex);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}, function () {
|