瀏覽代碼

未计量相关

MaiXinRong 3 月之前
父節點
當前提交
85e0d633e5
共有 2 個文件被更改,包括 24 次插入1 次删除
  1. 10 1
      app/public/js/stage.js
  2. 14 0
      app/view/stage/index.ejs

+ 10 - 1
app/public/js/stage.js

@@ -2028,8 +2028,16 @@ $(document).ready(() => {
                 spSpread.getActiveSheet().zh_setting.readOnly = posReadOnly;
                 const posData = stagePos.ledgerPos[itemsPre + node.id] || [];
                 const posMeasure = $('#pos-measure')[0].checked;
+                const posUnMeasure = $('#pos-un-measure')[0].checked;
                 posData.forEach(x => {
-                    x.visible = !posMeasure || (!!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty);
+                    x.visible = true;
+                    if (posMeasure && x.visible) {
+                        x.visible = !!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty;
+                    }
+                    if (posUnMeasure && x.visible) {
+                        // 不考虑不计价
+                        x.visible = !x.end_contract_qty && !x.end_qc_qty && !x.end_gather_qty; // && !x.qc_minus_qty;
+                    }
                 });
                 SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData, posReadOnly);
                 getNodeList(node.id);
@@ -2482,6 +2490,7 @@ $(document).ready(() => {
         }
     };
     $('#pos-measure').click(stagePosSpreadObj.loadCurPosData);
+    $('#pos-un-measure').click(stagePosSpreadObj.loadCurPosData);
     // 加载上下窗口resizer
     $.divResizer({
         select: '#main-resize',

+ 14 - 0
app/view/stage/index.ejs

@@ -90,6 +90,20 @@
                                     </div>
                                 </div>
                             </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-un-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">