清单对比，计量单元汇总条件新增“位置”

app/public/js/gcl_gather.js

@@ -352,6 +352,7 @@ const gclGatherModel = (function () {
             dx.gcl_id = node.id;
             if (d.name !== node.name) {
                 dx.bwmx = d.name;
+                dx.position = d.position;
                 dx.mx_id = d.id;
             } else if (dx.gcl_id !== d.id) {
                 dx.mx_id = d.id;

app/public/js/ledger_gather.js

@@ -113,6 +113,7 @@ $(document).ready(() => {
             {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: '@', visible: false},
             {title: '计量单元', colSpan: '1', rowSpan: '1', field: 'bwmx', hAlign: 0, width: 100, formatter: '@'},
+            {title: '位置', colSpan: '1', rowSpan: '1', field: 'position', hAlign: 0, width: 100, formatter: '@'},
             {title: '台账数量', colSpan: '1', rowSpan: '1', field: 'quantity', hAlign: 2, width: 80, type: 'Number'},
         ],
         emptyRows: 0,
@@ -140,6 +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: '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/service/stage.js

@@ -77,8 +77,10 @@ module.exports = app => {
             stage.auditors = await this.ctx.service.stageAudit.getAuditors(stage.id, stage.times); // 全部参与的审批人
             stage.auditorIds = this._.map(stage.auditors, 'aid');
             stage.curAuditors = stage.auditors.filter(x => { return x.status === status.checking; }); // 当前流程中审批中的审批人
+
             // 分组审批时，根据受限筛选当前审批人
             if (stage.curAuditors.length > 0 && stage.curAuditors[0].audit_type === auditConst.auditType.key.multi) {
+                stage.curAuditors.sort((a, b) => { return a.audit_group_order - b.audit_group_order; });
                 const filter = [];
                 stage.curAuditors.forEach(x => {
                     if (!x.audit_group_limit) {

app/view/ledger/gather.ejs

@@ -65,6 +65,10 @@
                                                 <input class="form-check-input" type="checkbox" id="gather-xmj-jldy" value="bwmx" checked name="gather-xmj">
                                                 <label class="form-check-label" for="gather-xmj-jldy">计量单元</label>
                                             </div>
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" id="gather-xmj-position" value="position" name="gather-xmj">
+                                                <label class="form-check-label" for="gather-xmj-position">位置</label>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>