本期已计量

app/middleware/stage_check.js

@@ -65,15 +65,15 @@ module.exports = options => {
             });
             // 权限相关
             // todo 校验权限 （标段参与人、分享、游客）
+            const accountId = this.session.sessionUser.accountId,
+                auditorIds = _.map(stage.auditors, 'aid');
             let auditAssists = yield this.service.stageAuditAss.getData(stage);
             auditAssists = auditAssists.filter(x => {
                 return x.user_id === stage.user_id || auditorIds.indexOf(x.user_id) >= 0;
             });
             stage.userAssists = auditAssists.filter(x => { return x.user_id === stage.user_id; }); // 原报协同人
             stage.auditAssists = auditAssists.filter(x => { return x.user_id !== stage.user_id; }); // 审批协同人
-            const accountId = this.session.sessionUser.accountId,
-                auditorIds = _.map(stage.auditors, 'aid'),
-                userAssistIds = _.map(stage.userAssists, 'ass_user_id'),
+            const userAssistIds = _.map(stage.userAssists, 'ass_user_id'),
                 auditAssistIds = _.map(stage.auditAssists, 'ass_user_id'),
                 shareIds = [];
             stage.users = stage.status === status.uncheck ? [stage.user_id, ...userAssistIds] : [stage.user_id, ...userAssistIds, ...auditorIds, ...auditAssistIds];

app/public/js/ledger.js

@@ -560,8 +560,9 @@ $(document).ready(function() {
                         }
                     }
                 }
-                if (col.field === 'node_type') {
+                if (col.field === 'node_type' && newValue && newValue !== '0') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
+                    console.log(newValue, sameNodeType);
                     if (sameNodeType) {
                         toastr.error('已存在该费用类别，请勿重复选择');
                         SpreadJsObj.reLoadRowData(info.sheet, info.row);

app/public/js/revise.js

@@ -516,7 +516,7 @@ $(document).ready(() => {
                         }
                     }
                 }
-                if (col.field === 'node_type') {
+                if (col.field === 'node_type' && newValue && newValue !== '0') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
                     if (sameNodeType) {
                         toastr.error('已存在该费用类别，请勿重复选择');

app/public/js/stage.js

@@ -1646,6 +1646,10 @@ $(document).ready(() => {
                 const posReadOnly = node.lock || (node.children && node.children.length > 0) || !node.b_code;
                 spSpread.getActiveSheet().zh_setting.readOnly = posReadOnly;
                 const posData = stagePos.ledgerPos[itemsPre + node.id] || [];
+                const posMeasure = $('#pos-measure')[0].checked;
+                posData.forEach(x => {
+                    x.visible = !posMeasure || (!!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty);
+                });
                 SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData, posReadOnly);
                 getNodeList(node.id);
             } else {
@@ -2033,6 +2037,7 @@ $(document).ready(() => {
             });
         }
     };
+    $('#pos-measure').click(stagePosSpreadObj.loadCurPosData);
     // 加载上下窗口resizer
     $.divResizer({
         select: '#main-resize',

app/view/stage/index.ejs

@@ -69,6 +69,21 @@
                             <li class="nav-item">
                                 <a class="nav-link active" href="#">计量单元</a>
                             </li>
+
+                            <li class="nav-item">
+                                <div class="ml-2">
+                                    <div class="input-group input-group-sm">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">
+                                                <div class="form-group form-check mb-0">
+                                                    <input type="checkbox" class="form-check-input group-checkbox" id="pos-measure">
+                                                    <label class="form-check-label" for="pos-measure">本期已计量</label><!--勾选状态增加颜色text-danger-->
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </li>
                             <!--工程量清单模式操作-->
                             <li class="nav-item">
                                 <div class="ml-2">