feat: 清单库增加土地类型 （#GLY-4672）

modules/all_models/stdBills_bills.js

@@ -35,6 +35,7 @@ const stdBills_bills = new Schema({
     erratumRecord: String, // 勘误记录
     unitPrice: Number, // 单价
     isBillBudget: Boolean, // 清单预算标记
+    landType: String, // 土地类型
 },
     { versionKey: false }
 );

web/maintain/bills_lib/html/qingdan.html

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

web/maintain/bills_lib/scripts/bills_lib_setting.js

@@ -56,7 +56,7 @@ var billsLibSetting = {
         },
         {
             head: {
-                titleNames: ['计量单位'],
+                titleNames: ['单位'],
                 spanCols: [1],
                 spanRows: [2],
                 vAlign: [1, 1],
@@ -69,7 +69,7 @@ var billsLibSetting = {
                 hAlign: 0,
                 font: 'Arial'
             },
-            width: 140
+            width: 50
         },
         {
             head: {
@@ -157,6 +157,23 @@ var billsLibSetting = {
             width: 100
         },
         {
+            head: {
+                titleNames: ['土地类型'],
+                spanCols: [1],
+                spanRows: [2],
+                vAlign: [1, 1],
+                hAlign: [1, 1],
+                font: 'Arial'
+            },
+            data: {
+                field: 'landType',
+                vAlign: 1,
+                hAlign: 0,
+                font: 'Arial'
+            },
+            width: 70
+        },
+        {
             width: 60,
             head: {
                 titleNames: ["清单预算\n标记"],

web/maintain/bills_lib/scripts/db_controller.js

@@ -301,9 +301,9 @@ var dbController = {
 
       let updateNode = node.preSibling
         ? {
-            ID: node.preSibling.getID(),
-            NextSiblingID: node.getNextSiblingID(),
-          }
+          ID: node.preSibling.getID(),
+          NextSiblingID: node.getNextSiblingID(),
+        }
         : null;
       billsAjax.deleteBills(
         userAccount,
@@ -1382,7 +1382,8 @@ var tools = {
           engineerContent = sheet.getValue(i, 5),
           unitPrice = sheet.getValue(i, 6),
           // engineering = sheet.getValue(i, 7),
-          fixedFlag = sheet.getValue(i, 7);
+          fixedFlag = sheet.getValue(i, 7),
+          landType = sheet.getValue(i, 8);
         let data = {
           kind: kind,
           code: code,
@@ -1390,6 +1391,7 @@ var tools = {
           unit: unit,
           ruleText: ruleText,
           engineerContent,
+          landType,
           unitPrice,
           /* engineering: engineering, */ fixedFlag: fixedFlag,
           rowIdx: i,