Browse Source

feat: 清单规则编辑器中,隐藏“工程专业”列

vian 1 year ago
parent
commit
bbb84fa5f1

+ 2 - 2
web/maintain/bills_lib/html/qingdan.html

@@ -956,8 +956,8 @@
                     sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
                     sheet.setValue(i, 5, sheetBillsDatas.datasIdx['rowIdx'+ i].engineerContent);
                     sheet.setValue(i, 6, sheetBillsDatas.datasIdx['rowIdx'+ i].unitPrice);
-                    sheet.setValue(i, 7, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
-                    sheet.setValue(i, 8, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
+                    //sheet.setValue(i, 7, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
+                    sheet.setValue(i, 7, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
                 }
                 else {
                     sheet.clear(i, 0, 1, sheet.getColumnCount(), GC.Spread.Sheets.SheetArea.viewport,GC.Spread.Sheets.StorageType.data);

+ 2 - 2
web/maintain/bills_lib/scripts/bills_lib_setting.js

@@ -122,7 +122,7 @@ var billsLibSetting = {
             },
             width: 80
         },
-        {
+        /* {
             head: {
                 titleNames: ['工程专业'],
                 spanCols: [1],
@@ -138,7 +138,7 @@ var billsLibSetting = {
                 font: 'Arial'
             },
             width: 80
-        },
+        }, */
         {
             head: {
                 titleNames: ['固定ID'],

+ 5 - 5
web/maintain/bills_lib/scripts/db_controller.js

@@ -373,13 +373,13 @@ var dbController = {
         if (node) {
             updateId = node.getID();
             field = billsLibSetting.cols[args.col].data.field;
-            if (field === 'engineering') {
+            /* if (field === 'engineering') {
                 if (isNaN(args.editingText) || args.editingText % 1 !== 0) {
                     args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : '');
                     alert('工程专业只能输入整数!');
                     return;
                 }
-            } else if (field === 'unitPrice') {
+            } else  */if (field === 'unitPrice') {
                 if (isNaN(args.editingText)) {
                     args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : '');
                     alert('单价只能输入数值!');
@@ -1144,9 +1144,9 @@ var tools = {
                     unit = sheet.getValue(i, 3), ruleText = sheet.getValue(i, 4),
                     engineerContent = sheet.getValue(i, 5),
                     unitPrice = sheet.getValue(i, 6),
-                    engineering = sheet.getValue(i, 7),
-                    fixedFlag = sheet.getValue(i, 8);
-                let data = { kind: kind, code: code, name: name, unit: unit, ruleText: ruleText, engineerContent, unitPrice, engineering: engineering, fixedFlag: fixedFlag, rowIdx: i };
+                    // engineering = sheet.getValue(i, 7),
+                    fixedFlag = sheet.getValue(i, 7);
+                let data = { kind: kind, code: code, name: name, unit: unit, ruleText: ruleText, engineerContent, unitPrice, /* engineering: engineering, */ fixedFlag: fixedFlag, rowIdx: i };
                 sheetDatas.datas.push(data);
                 sheetDatas.datasIdx['rowIdx' + i] = data;
             }