|
@@ -370,6 +370,13 @@ var dbController = {
|
|
|
return;
|
|
|
}
|
|
|
} */
|
|
|
+ if (field === 'unitPrice') {
|
|
|
+ if (isNaN(args.editingText)) {
|
|
|
+ args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : '');
|
|
|
+ alert('单价只能输入数值!');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
node.data[field] = args.editingText;
|
|
|
sheetBillsDatas.datasIdx['rowIdx' + args.row][field] = args.editingText;
|
|
|
billsAjax.updateBills(userAccount, billsLibId, updateId, field, args.editingText);
|
|
@@ -696,11 +703,16 @@ var tools = {
|
|
|
validData[setting.cols[j].data.field] = value;
|
|
|
}
|
|
|
}
|
|
|
- else */ if (setting.cols[j].data.field === 'fixedFlag') {
|
|
|
+ else */
|
|
|
+ if (setting.cols[j].data.field === 'fixedFlag') {
|
|
|
let findData = BillsFixedFlagList.find((x) => x.name === value);
|
|
|
if (findData) {
|
|
|
validData[setting.cols[j].data.field] = findData.value;
|
|
|
}
|
|
|
+ } else if (setting.cols[j].data.field === 'unitPrice') {
|
|
|
+ if (!isNaN(value)) {
|
|
|
+ validData[setting.cols[j].data.field] = value;
|
|
|
+ }
|
|
|
} else if (setting.cols[j].data.field === 'kind') {
|
|
|
let findData = kindList.find((x) => x.name === value);
|
|
|
if (findData) {
|
|
@@ -1023,8 +1035,9 @@ var tools = {
|
|
|
for (let i = 0; i < controller.tree.items.length; i++) {
|
|
|
let kind = sheet.getValue(i, 0), code = sheet.getValue(i, 1), name = sheet.getValue(i, 2),
|
|
|
unit = sheet.getValue(i, 3), ruleText = sheet.getValue(i, 4),
|
|
|
+ unitPrice = sheet.getValue(i, 5),
|
|
|
fixedFlag = sheet.getValue(i, 10);
|
|
|
- let data = { code: code, name: name, unit: unit, ruleText: ruleText, fixedFlag, kind, rowIdx: i };
|
|
|
+ let data = { code: code, name: name, unit: unit, ruleText: ruleText, fixedFlag, kind, rowIdx: i, unitPrice };
|
|
|
sheetDatas.datas.push(data);
|
|
|
sheetDatas.datasIdx['rowIdx' + i] = data;
|
|
|
}
|