Browse Source

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

vian 1 year ago
parent
commit
c93634f7b8

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

@@ -834,7 +834,7 @@
                     sheet.setValue(i, 1, sheetBillsDatas.datasIdx['rowIdx'+ i].name);
                     sheet.setValue(i, 1, sheetBillsDatas.datasIdx['rowIdx'+ i].name);
                     sheet.setValue(i, 2, sheetBillsDatas.datasIdx['rowIdx'+ i].unit);
                     sheet.setValue(i, 2, sheetBillsDatas.datasIdx['rowIdx'+ i].unit);
                     sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
                     sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
-                    sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
+                    // sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
                     sheet.setValue(i, 9, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
                     sheet.setValue(i, 9, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
                 }
                 }
                 else {
                 else {

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

@@ -71,23 +71,23 @@ var billsLibSetting = {
             },
             },
             width: 420
             width: 420
         },
         },
-        {
-            head: {
-                titleNames: ['工程专业'],
-                spanCols: [1],
-                spanRows: [2],
-                vAlign: [1, 1],
-                hAlign: [1, 1],
-                font: ' Arial'
-            },
-            data: {
-                field: 'engineering',
-                vAlign: 1,
-                hAlign: 1,
-                font: 'Arial'
-            },
-            width: 80
-        },
+        /*  {
+             head: {
+                 titleNames: ['工程专业'],
+                 spanCols: [1],
+                 spanRows: [2],
+                 vAlign: [1, 1],
+                 hAlign: [1, 1],
+                 font: ' Arial'
+             },
+             data: {
+                 field: 'engineering',
+                 vAlign: 1,
+                 hAlign: 1,
+                 font: 'Arial'
+             },
+             width: 80
+         }, */
         {
         {
             head: {
             head: {
                 titleNames: ['工程经济\n指标类别'],
                 titleNames: ['工程经济\n指标类别'],

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

@@ -363,13 +363,13 @@ var dbController = {
         if (node) {
         if (node) {
             updateId = node.getID();
             updateId = node.getID();
             field = billsLibSetting.cols[args.col].data.field;
             field = billsLibSetting.cols[args.col].data.field;
-            if (field === 'engineering') {
+            /* if (field === 'engineering') {
                 if (isNaN(args.editingText) || args.editingText % 1 !== 0) {
                 if (isNaN(args.editingText) || args.editingText % 1 !== 0) {
                     args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : '');
                     args.sheet.setValue(args.row, args.col, dbController.currentEditData ? dbController.currentEditData : '');
                     alert('工程专业只能输入整数!');
                     alert('工程专业只能输入整数!');
                     return;
                     return;
                 }
                 }
-            }
+            } */
             node.data[field] = args.editingText;
             node.data[field] = args.editingText;
             sheetBillsDatas.datasIdx['rowIdx' + args.row][field] = args.editingText;
             sheetBillsDatas.datasIdx['rowIdx' + args.row][field] = args.editingText;
             billsAjax.updateBills(userAccount, billsLibId, updateId, field, args.editingText);
             billsAjax.updateBills(userAccount, billsLibId, updateId, field, args.editingText);
@@ -691,12 +691,12 @@ var tools = {
                               validData[col.data.field] = value;
                               validData[col.data.field] = value;
                           }
                           }
                       });*/
                       });*/
-                    if (setting.cols[j].data.field === 'engineering') {
+                    /* if (setting.cols[j].data.field === 'engineering') {
                         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 === 'fixedFlag') {
+                    else */ if (setting.cols[j].data.field === 'fixedFlag') {
                         let findData = BillsFixedFlagList.find((x) => x.name === value);
                         let findData = BillsFixedFlagList.find((x) => x.name === value);
                         if (findData) {
                         if (findData) {
                             validData[setting.cols[j].data.field] = findData.value;
                             validData[setting.cols[j].data.field] = findData.value;