|
@@ -1334,6 +1334,7 @@ $(document).ready(function() {
|
|
|
* 加载计量单元 根据当前台账选择节点
|
|
|
*/
|
|
|
loadCurPosData: function () {
|
|
|
+ //spreadJsObj.reinitSheet(posSpread.getActiveSheet());
|
|
|
const node = treeOperationObj.getSelectNode(ledgerSpread.getActiveSheet());
|
|
|
if (node) {
|
|
|
const posData = pos.ledgerPos[itemsPre + node.id] || [];
|
|
@@ -1518,6 +1519,9 @@ $(document).ready(function() {
|
|
|
* @param info
|
|
|
*/
|
|
|
clipboardPasted: function (e, info) {
|
|
|
+ if (info.sheet.getColumnCount() > info.sheet.zh_setting.cols.length) {
|
|
|
+ info.sheet.setColumnCount(info.sheet.zh_setting.cols.length);
|
|
|
+ }
|
|
|
const node = treeOperationObj.getSelectNode(ledgerSpread.getActiveSheet());
|
|
|
if (node.code && (node.code !== '')) {
|
|
|
toastr.error('项目节不可含有清单明细');
|
|
@@ -1548,6 +1552,8 @@ $(document).ready(function() {
|
|
|
for (let iCol = 0; iCol < info.cellRange.colCount; iCol++) {
|
|
|
const curCol = info.cellRange.col + iCol;
|
|
|
const colSetting = info.sheet.zh_setting.cols[curCol];
|
|
|
+ if (!colSetting) continue;
|
|
|
+
|
|
|
posData[colSetting.field] = trimInvalidChar(info.sheet.getText(curRow, curCol));
|
|
|
|
|
|
if (colSetting.type === 'Number') {
|