|
@@ -368,6 +368,8 @@
|
|
|
codeEditor.setSize('auto','350px');
|
|
|
autoFlashHeight();
|
|
|
let BillsFixedFlagList = JSON.parse('<%- BillsFixedFlagList %>');
|
|
|
+ // 清单类型下拉
|
|
|
+ const kindList = [{ name: '分部', value: 2 }, { name: '清单', value: 3 }];
|
|
|
let userAccount = '<%= userAccount %>';
|
|
|
let maxJobsNumber;
|
|
|
let maxItemsNumber;
|
|
@@ -478,6 +480,11 @@
|
|
|
sheet.resumeEvent();
|
|
|
}
|
|
|
|
|
|
+ // 获取清单类型名称
|
|
|
+ function getKindName(kind) {
|
|
|
+ return (kindList.find(item => item.value === kind))?.name || '';
|
|
|
+ }
|
|
|
+
|
|
|
function showBillsSheet(datas, jobsSheet, itemsSheet, setting) {
|
|
|
billsSpread = new GC.Spread.Sheets.Workbook($('#spreadBills')[0], {sheetCount: 1});
|
|
|
let billsSheet = billsSpread.getSheet(0);
|
|
@@ -493,6 +500,9 @@
|
|
|
data.fixedFlag = findData.name;
|
|
|
}
|
|
|
}
|
|
|
+ if (data.kind) {
|
|
|
+ data.kind = getKindName(data.kind);
|
|
|
+ }
|
|
|
}
|
|
|
billsTree.loadDatas(datas);
|
|
|
let controller = TREE_SHEET_CONTROLLER.createNew(billsTree.tree, billsSpread.getActiveSheet(), setting);
|
|
@@ -532,6 +542,10 @@
|
|
|
let nameList = BillsFixedFlagList.map((data) => data.name);
|
|
|
let comboCol = setting.cols.findIndex((data) => data.data.field === 'fixedFlag');
|
|
|
setCombo(billsSheet, comboCol, nameList);
|
|
|
+ // 设置清单类型下拉
|
|
|
+ let kindComboList = kindList.map((data) => data.name);
|
|
|
+ let kindCol = setting.cols.findIndex((data) => data.data.field === 'kind');
|
|
|
+ setCombo(billsSheet, kindCol, kindComboList);
|
|
|
}
|
|
|
|
|
|
function switchFcs(controller, billsSheet, billsSpread, jobsSheet, itemsSheet){
|
|
@@ -836,6 +850,7 @@
|
|
|
sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
|
|
|
// sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
|
|
|
sheet.setValue(i, 9, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
|
|
|
+ sheet.setValue(i, 10, sheetBillsDatas.datasIdx['rowIdx'+ i].kind);
|
|
|
}
|
|
|
else {
|
|
|
sheet.clear(i, 0, 1, sheet.getColumnCount(), GC.Spread.Sheets.SheetArea.viewport,GC.Spread.Sheets.StorageType.data);
|
|
@@ -872,6 +887,11 @@
|
|
|
if (findData) {
|
|
|
value = findData.value;
|
|
|
}
|
|
|
+ } else if (field === 'kind') {
|
|
|
+ const findData = kindList.find((x) => x.name === value);
|
|
|
+ if (findData) {
|
|
|
+ value = findData.value;
|
|
|
+ }
|
|
|
}
|
|
|
curData[field] = value;
|
|
|
});
|
|
@@ -884,7 +904,12 @@
|
|
|
const findData = BillsFixedFlagList.find((x) => x.value === value);
|
|
|
if (findData) {
|
|
|
value = findData.name;
|
|
|
- }
|
|
|
+ }
|
|
|
+ } else if (field === 'kind') {
|
|
|
+ const findData = kindList.find((x) => x.value === value);
|
|
|
+ if (findData) {
|
|
|
+ value = findData.name;
|
|
|
+ }
|
|
|
}
|
|
|
node.data[field] = value;
|
|
|
sheetBillsDatas.datasIdx['rowIdx' + row][field] = value;
|