清单对比，附属工程量汇总，汇总计量单元

app/public/js/gcl_gather.js

@@ -324,7 +324,8 @@ const gclGatherModel = (function () {
         if (!gclPart || gclPart.length === 0) return;
 
         for (const ag of gclPart) {
-            const condition = _.assign({ is_aux: ag.is_aux, name: ag.name, unit: ag.unit }, cacheLeafXmj);
+            const pos = gsPos.getPos(ag.pid);
+            const condition = _.assign({ is_aux: ag.is_aux, name: ag.name, unit: ag.unit, bwmx: pos.name }, cacheLeafXmj);
             let nag = _.find(gcl.ancGcl, condition);
             if (!nag) {
                 nag = condition;

app/public/js/ledger_gather.js

@@ -141,7 +141,7 @@ $(document).ready(() => {
             {title: '分部工程', colSpan: '1', rowSpan: '1', field: 'fbgc', hAlign: 0, width: 100, formatter: '@', visible: false},
             {title: '分项工程', colSpan: '1', rowSpan: '1', field: 'fxgc', hAlign: 0, width: 100, formatter: '@', visible: false},
             {title: '细目', colSpan: '1', rowSpan: '1', field: 'jldy', hAlign: 0, width: 100, formatter: '@'},
-            {title: '位置', colSpan: '1', rowSpan: '1', field: 'position', hAlign: 0, width: 100, formatter: '@'},
+            {title: '计量单元', colSpan: '1', rowSpan: '1', field: 'bwmx', hAlign: 0, width: 100, formatter: '@', visible: false},
             {title: '辅材', colSpan: '1', rowSpan: '1', field: 'is_aux', hAlign: 1, width: 60, formatter: '@', fixed: 1, cellType: 'checkbox'},
             {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 100, formatter: '@', fixed: 1},
             {title: '单位', colSpan: '1', rowSpan: '1', field: 'unit', hAlign: 1, width: 50, formatter: '@', fixed: 1},

app/view/ledger/gather.ejs

@@ -93,6 +93,10 @@
                                                 <input class="form-check-input" type="checkbox" id="gather-anc-gcl-xm" value="jldy" checked name="gather-anc-gcl">
                                                 <label class="form-check-label" for="gather-anc-gcl-xm">细目</label>
                                             </div>
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" id="gather-anc-gcl-jldy" value="bwmx" name="gather-anc-gcl">
+                                                <label class="form-check-label" for="gather-anc-gcl-jldy">计量单元</label>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>