清单设置调整

app/public/js/material_checklist.js

@@ -313,6 +313,7 @@ $(document).ready(() => {
         const isCheck = $(this).is(':checked');
         let newMaterialChecklistData = materialChecklistData;
         if (isCheck) {
+            $('#bills0_checkList').prop('checked', false);
             newMaterialChecklistData = _.filter(materialChecklistData, { had_bills: 0 });
         }
         SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), SpreadJsObj.DataType.Data, newMaterialChecklistData);
@@ -324,6 +325,33 @@ $(document).ready(() => {
             loadMaterialData(-1, 0);
         }
     });
+    // 筛选调差工料清单为0
+    $('#bills0_checkList').click(function () {
+        const isCheck = $(this).is(':checked');
+        let newMaterialChecklistData = materialChecklistData;
+        if (isCheck) {
+            newMaterialChecklistData = [];
+            $('#notBills_checkList').prop('checked', false);
+            const materialList0 = _.uniq(_.map(_.filter(materialListData, { quantity: 0 }), 'gcl_id'));
+            if (materialList0.length > 0) {
+                const hadMaterialChecklistData = _.filter(materialChecklistData, { had_bills: 1 });
+                for (const h of hadMaterialChecklistData) {
+                    const gcl = _.find(gclGatherData, { b_code: h.b_code, name: h.name, unit: h.unit, unit_price: h.unit_price });
+                    if (gcl && gcl.leafXmjs.length > 0 && _.indexOf(materialList0, gcl.leafXmjs[0].gcl_id) !== -1) {
+                        newMaterialChecklistData.push(h);
+                    }
+                }
+            }
+        }
+        SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), SpreadJsObj.DataType.Data, newMaterialChecklistData);
+        SpreadJsObj.resetTopAndSelect(ledgerSpread.getActiveSheet());
+        if (newMaterialChecklistData.length > 0) {
+            const index = _.findIndex(gclGatherData, { b_code: newMaterialChecklistData[0].b_code, name: newMaterialChecklistData[0].name, unit: newMaterialChecklistData[0].unit, unit_price: newMaterialChecklistData[0].unit_price });
+            loadMaterialData(index, 0);
+        } else {
+            loadMaterialData(-1, 0);
+        }
+    });
     // 添加调差工料
     $('#add_material_bill').click(function () {
         // 获取已选工料

app/view/change/information.ejs

@@ -448,7 +448,7 @@
     let changeInfo = Object.assign({}, back_changeInfo);
     let changeUsedData = JSON.parse(unescape('<%- escape(JSON.stringify(changeUsedData)) %>'));
 </script>
-<script src="/public/js/change_information_set.js"></script>
+<script src="/public/js/change_information_set.js?202001181"></script>
 <script src="/public/js/change_audit.js"></script>
 <% } else if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
 <script>
@@ -456,7 +456,7 @@
     const aidList = _.map(auditList2, 'uid');
     aidList.splice(0, 1);
 </script>
-<script src="/public/js/change_information_show.js"></script>
+<script src="/public/js/change_information_show.js?202001181"></script>
 <% } else if (auditStatus === 6) { %>
 <script>
     const auditList2 = JSON.parse(unescape('<%- escape(JSON.stringify(auditList2)) %>'));
@@ -466,5 +466,5 @@
     const changeLedgerList = JSON.parse(unescape('<%- escape(JSON.stringify(changeLedgerList)) %>'));
     const changePosList = JSON.parse(unescape('<%- escape(JSON.stringify(changePosList)) %>'));
 </script>
-<script src="/public/js/change_information_approval.js"></script>
+<script src="/public/js/change_information_approval.js?202001181"></script>
 <% } %>

app/view/material/checklist.ejs

@@ -13,7 +13,15 @@
                     <a class="btn btn-sm btn-light">
                         <div class="custom-control custom-checkbox">
                             <input type="checkbox" class="custom-control-input" id="notBills_checkList">
-                            <label class="custom-control-label text-primary" for="notBills_checkList">筛选无调差工料清单</label>
+                            <label class="custom-control-label text-primary" for="notBills_checkList">无调差工料</label>
+                        </div>
+                    </a>
+                </div>
+                <div class="d-inline-block">
+                    <a class="btn btn-sm btn-light">
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="bills0_checkList">
+                            <label class="custom-control-label text-primary" for="bills0_checkList">工料含量为0</label>
                         </div>
                     </a>
                 </div>