|
@@ -395,6 +395,7 @@ $(document).ready(() => {
|
|
|
SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, newMaterialBillsData);
|
|
|
// materialSpreadObj.materialSheetReset();
|
|
|
sheet.setSelection(newMaterialBillsData.length - 1, 0, 1, 1);
|
|
|
+ console.log(sheet);
|
|
|
materialSpreadObj.refreshActn();
|
|
|
// 月信息价需要同时添加空白的list
|
|
|
if (months.length > 0) {
|
|
@@ -439,9 +440,9 @@ $(document).ready(() => {
|
|
|
});
|
|
|
newIndex = _.findIndex(newMaterialBillsData, { id: select.id });
|
|
|
}
|
|
|
- sheet.deleteRows(newIndex, 1);
|
|
|
- sheet.zh_data.splice(newIndex, 1);
|
|
|
-
|
|
|
+ // sheet.deleteRows(newIndex, 1);
|
|
|
+ // sheet.zh_data.splice(newIndex, 1);
|
|
|
+ materialSpreadObj.materialSheetReset();
|
|
|
resetTpTable();
|
|
|
// SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
|
|
|
sheet.setSelection(newIndex > 0 ? newIndex - 1 : 0, sel.length > 0 ? sel[0].col : 0, 1, 1);
|
|
@@ -1645,8 +1646,6 @@ $(document).ready(() => {
|
|
|
msg.push('成功更新工料 ' + result.updateNum + ' 条');
|
|
|
}
|
|
|
toastr.success(msg.length > 1 ? msg.join(',并') : msg[0]);
|
|
|
- } else {
|
|
|
- toastr.warning('导入的工料数据都已存在');
|
|
|
}
|
|
|
$('#import-info').modal('hide');
|
|
|
});
|