|
@@ -152,6 +152,7 @@ $(document).ready(() => {
|
|
SpreadJsObj.reLoadRowData(changeSpreadSheet, changeList.length - 1);
|
|
SpreadJsObj.reLoadRowData(changeSpreadSheet, changeList.length - 1);
|
|
changeSpreadSheet.setStyle(changeSpreadSheet.getRowCount() - 1, -1, style1);
|
|
changeSpreadSheet.setStyle(changeSpreadSheet.getRowCount() - 1, -1, style1);
|
|
changeSpreadSheet.setSelection(changeList.length - 1, 0, 1, 1);
|
|
changeSpreadSheet.setSelection(changeList.length - 1, 0, 1, 1);
|
|
|
|
+ changeSpreadObj.resetXmjSpread();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -164,6 +165,7 @@ $(document).ready(() => {
|
|
changeSpreadSheet.deleteRows(index, 1);
|
|
changeSpreadSheet.deleteRows(index, 1);
|
|
const sel = changeSpreadSheet.getSelections();
|
|
const sel = changeSpreadSheet.getSelections();
|
|
changeSpreadSheet.setSelection(0, 0, 1, 1);
|
|
changeSpreadSheet.setSelection(0, 0, 1, 1);
|
|
|
|
+ changeSpreadObj.resetXmjSpread(SpreadJsObj.getSelectObject(changeSpreadSheet));
|
|
if (select.lid != 0) {
|
|
if (select.lid != 0) {
|
|
tableDataRemake(changeListData);
|
|
tableDataRemake(changeListData);
|
|
}
|
|
}
|
|
@@ -171,6 +173,16 @@ $(document).ready(() => {
|
|
});
|
|
});
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ resetXmjSpread: function(data = null) {
|
|
|
|
+ const xmj = [];
|
|
|
|
+ if (data && data.lid != 0 && data.xmj_code !== '' && data.xmj_code !== null) {
|
|
|
|
+ if (data.bwmx === data.xmj_jldy) {
|
|
|
|
+ data.bwmx = '';
|
|
|
|
+ }
|
|
|
|
+ xmj.push(data);
|
|
|
|
+ }
|
|
|
|
+ SpreadJsObj.loadSheetData(xmjSpread.getActiveSheet(), SpreadJsObj.DataType.Data, xmj);
|
|
|
|
+ },
|
|
selectionChanged: function (e, info) {
|
|
selectionChanged: function (e, info) {
|
|
const sel = info.sheet.getSelections()[0];
|
|
const sel = info.sheet.getSelections()[0];
|
|
const col = info.sheet.zh_setting.cols[sel.col];
|
|
const col = info.sheet.zh_setting.cols[sel.col];
|
|
@@ -178,6 +190,7 @@ $(document).ready(() => {
|
|
if (col && col.field === 'del_list') {
|
|
if (col && col.field === 'del_list') {
|
|
changeSpreadObj.del();
|
|
changeSpreadObj.del();
|
|
}
|
|
}
|
|
|
|
+ changeSpreadObj.resetXmjSpread(data);
|
|
},
|
|
},
|
|
deletePress: function (sheet) {
|
|
deletePress: function (sheet) {
|
|
return;
|
|
return;
|
|
@@ -320,6 +333,7 @@ $(document).ready(() => {
|
|
changeList = result;
|
|
changeList = result;
|
|
SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
|
|
SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
|
|
changeSpreadObj.makeSjsFooter();
|
|
changeSpreadObj.makeSjsFooter();
|
|
|
|
+ changeSpreadObj.resetXmjSpread(SpreadJsObj.getSelectObject(changeSpreadSheet));
|
|
}, function () {
|
|
}, function () {
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
|
|
return;
|
|
return;
|
|
@@ -385,6 +399,7 @@ $(document).ready(() => {
|
|
SpreadJsObj.initSheet(changeSpreadSheet, changeSpreadSetting);
|
|
SpreadJsObj.initSheet(changeSpreadSheet, changeSpreadSetting);
|
|
SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
|
|
SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
|
|
changeSpreadObj.makeSjsFooter();
|
|
changeSpreadObj.makeSjsFooter();
|
|
|
|
+ changeSpreadObj.resetXmjSpread(SpreadJsObj.getSelectObject(changeSpreadSheet));
|
|
});
|
|
});
|
|
|
|
|
|
if (!readOnly) {
|
|
if (!readOnly) {
|
|
@@ -426,6 +441,7 @@ $(document).ready(() => {
|
|
disabled: function (key, opt) {
|
|
disabled: function (key, opt) {
|
|
const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
|
|
const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
|
|
const sel = changeSpreadSheet.getSelections()[0];
|
|
const sel = changeSpreadSheet.getSelections()[0];
|
|
|
|
+ changeSpreadObj.resetXmjSpread(select);
|
|
console.log(select, sel);
|
|
console.log(select, sel);
|
|
if (!readOnly && select && sel.row !== changeSpreadSheet.getRowCount() - 1) {
|
|
if (!readOnly && select && sel.row !== changeSpreadSheet.getRowCount() - 1) {
|
|
return false;
|
|
return false;
|
|
@@ -549,6 +565,8 @@ $(document).ready(() => {
|
|
changeList = result;
|
|
changeList = result;
|
|
SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
|
|
SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
|
|
changeSpreadObj.makeSjsFooter();
|
|
changeSpreadObj.makeSjsFooter();
|
|
|
|
+ const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
|
|
|
|
+ changeSpreadObj.resetXmjSpread(select);
|
|
$('#addlist').modal('hide');
|
|
$('#addlist').modal('hide');
|
|
}, function () {
|
|
}, function () {
|
|
$('#addlist').modal('hide');
|
|
$('#addlist').modal('hide');
|