1. 导入分项清单Excel相关调整

2. 下载台账Excel调整
3. 清单对比页面调整

app/lib/analysis_excel.js

@@ -302,7 +302,7 @@ class AnalysisExcelTree {
         this.colHeaderMatch = {
             code: {value: ['项目节编号', '预算项目节'], type: colDefineType.match},
             b_code: {value: ['清单子目号', '清单编号', '子目号'], type: colDefineType.match},
-            pos: {value: ['部位明细'], type: colDefineType.match},
+            pos: {value: ['计量单元'], type: colDefineType.match},
             name: {value: ['名称'], type: colDefineType.match},
             unit: {value: ['单位'], type: colDefineType.match},
             quantity: {value: ['清单数量'], type: colDefineType.match},

app/lib/export_excel.js

@@ -41,7 +41,7 @@ class exportLedger2Excel extends exportExcel {
     constructor(ctx) {
         super(ctx);
         this.setting = {
-            header: ['项目节编号', '清单子目号', '部位明细', '名称', '单位', '清单数量', '设计数量1', '设计数量2', '单价', '合价', '图号', '备注'],
+            header: ['项目节编号', '清单子目号', '计量单元', '名称', '单位', '清单数量', '设计数量1', '设计数量2', '单价', '合价', '图号', '备注'],
             width: [100, 70, 70, 300, 60, 80, 80, 80, 80, 80, 100, 100],
             hAlign: ['left', 'left', 'left', 'left','center', 'right', 'right', 'right', 'right', 'right', 'left', 'left'],
         };

app/public/js/ledger.js

@@ -1322,23 +1322,7 @@ $(document).ready(function() {
                 return !readOnly;
             }
         };
-        billsContextMenuOptions.items.sprImport = '-----------';
     }
-    billsContextMenuOptions.items.exportExcel = {
-        name: '导出表格数据',
-        icon: 'fa-file-excel-o',
-        callback: function (key, opt) {
-            const fileName = $('.text-truncate').attr('data-original-title') + '.xlsx';
-            SpreadExcelObj.exportSpread2XlsxWithHeader(ledgerSpread, fileName);
-        },
-        visible: function (key, opt) {
-            try {
-                return is_debug;
-            } catch (err) {
-                return false;
-            }
-        }
-    };
     $.contextMenu(billsContextMenuOptions);
 
     const posSearch = $.posSearch({selector: '#pos-search', searchSpread: posSpread});
@@ -2550,7 +2534,7 @@ $(document).ready(function() {
             cols: [
                 {title: '项目节编号', colSpan: '1', rowSpan: '1', field: 'code', hAlign: 0, width: 100, formatter: '@'},
                 {title: '清单子目号', colSpan: '1', rowSpan: '1', field: 'b_code', hAlign: 0, width: 70, formatter: '@'},
-                {title: '部位明细', colSpan: '1', rowSpan: '1', field: 'pos_code', hAlign: 1, width: 70, formatter: '@'},
+                {title: '计量单元', colSpan: '1', rowSpan: '1', field: 'pos_code', hAlign: 1, width: 70, formatter: '@'},
                 {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 300, formatter: '@'},
                 {title: '单位', colSpan: '1', rowSpan: '1', field: 'unit', hAlign: 1, width: 60, formatter: '@'},
                 {title: '清单数量', colSpan: '1', rowSpan: '1', field: 'quantity', hAlign: 2, width: 80, type: 'Number'},

app/view/ledger/gather.ejs

@@ -6,7 +6,7 @@
             <div>
                 <a class="btn btn-sm btn-light">
                     <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="compare-tag">
+                        <input type="checkbox" class="custom-control-input" id="compare-tag" checked="checked">
                         <label class="custom-control-label text-primary" for="compare-tag">签约-台账≠0</label>
                     </div>
                 </a>