|
@@ -752,7 +752,8 @@ var dbController = {
|
|
|
alert('工程专业只能输入整数!');
|
|
alert('工程专业只能输入整数!');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- } else */ if (field === "unitPrice") {
|
|
|
|
|
|
|
+ } else */
|
|
|
|
|
+ if (['unitPrice', 'unitPrice1', 'unitPrice2', 'unitPrice3', 'unitPrice4'].includes(field)) {
|
|
|
if (isNaN(args.editingText)) {
|
|
if (isNaN(args.editingText)) {
|
|
|
args.sheet.setValue(
|
|
args.sheet.setValue(
|
|
|
args.row,
|
|
args.row,
|
|
@@ -1262,7 +1263,7 @@ var tools = {
|
|
|
if (!isNaN(value) && value % 1 === 0) {
|
|
if (!isNaN(value) && value % 1 === 0) {
|
|
|
validData[setting.cols[j].data.field] = value;
|
|
validData[setting.cols[j].data.field] = value;
|
|
|
}
|
|
}
|
|
|
- } else if (setting.cols[j].data.field === "unitPrice") {
|
|
|
|
|
|
|
+ } else if (['unitPrice', 'unitPrice1', 'unitPrice2', 'unitPrice3', 'unitPrice4'].includes(setting.cols[j].data.field)) {
|
|
|
if (!isNaN(value)) {
|
|
if (!isNaN(value)) {
|
|
|
validData[setting.cols[j].data.field] = value;
|
|
validData[setting.cols[j].data.field] = value;
|
|
|
}
|
|
}
|
|
@@ -1638,9 +1639,13 @@ var tools = {
|
|
|
ruleText = sheet.getValue(i, 4),
|
|
ruleText = sheet.getValue(i, 4),
|
|
|
engineerContent = sheet.getValue(i, 5),
|
|
engineerContent = sheet.getValue(i, 5),
|
|
|
unitPrice = sheet.getValue(i, 6),
|
|
unitPrice = sheet.getValue(i, 6),
|
|
|
|
|
+ unitPrice1 = sheet.getValue(i, 7),
|
|
|
|
|
+ unitPrice2 = sheet.getValue(i, 8),
|
|
|
|
|
+ unitPrice3 = sheet.getValue(i, 9),
|
|
|
|
|
+ unitPrice4 = sheet.getValue(i, 10),
|
|
|
// engineering = sheet.getValue(i, 7),
|
|
// engineering = sheet.getValue(i, 7),
|
|
|
- fixedFlag = sheet.getValue(i, 7),
|
|
|
|
|
- landType = sheet.getValue(i, 8);
|
|
|
|
|
|
|
+ fixedFlag = sheet.getValue(i, 11),
|
|
|
|
|
+ landType = sheet.getValue(i, 12);
|
|
|
let data = {
|
|
let data = {
|
|
|
kind: kind,
|
|
kind: kind,
|
|
|
code: code,
|
|
code: code,
|
|
@@ -1650,6 +1655,10 @@ var tools = {
|
|
|
engineerContent,
|
|
engineerContent,
|
|
|
landType,
|
|
landType,
|
|
|
unitPrice,
|
|
unitPrice,
|
|
|
|
|
+ unitPrice1,
|
|
|
|
|
+ unitPrice2,
|
|
|
|
|
+ unitPrice3,
|
|
|
|
|
+ unitPrice4,
|
|
|
/* engineering: engineering, */ fixedFlag: fixedFlag,
|
|
/* engineering: engineering, */ fixedFlag: fixedFlag,
|
|
|
rowIdx: i,
|
|
rowIdx: i,
|
|
|
};
|
|
};
|