Kaynağa Gözat

导出接口:人材机消耗量为0的时候,定额人材机也不输出

zeweizhong 6 yıl önce
ebeveyn
işleme
c61fe268b9

+ 4 - 4
lib/jquery-contextmenu/jquery.contextMenu.js

@@ -204,13 +204,13 @@
                 if (!$menu) {
                     return;
                 }
-                const offsetWidth = $menu.offsetWidth;
-                const curLeft = parseFloat(window.getComputedStyle($menu).left);
+                const parentOffsetWidth = $menu.parentElement.offsetWidth;
+                const curLeft = parseFloat(window.getComputedStyle($menu).left) || 0;
                 const maxDiff = 8;
                 const minDiff = 4;
-                const diff = offsetWidth - curLeft;
+                const diff = parentOffsetWidth - curLeft;
                 if (diff > maxDiff || diff < minDiff) {
-                    const fixedLeft = offsetWidth - 5;
+                    const fixedLeft = parentOffsetWidth - 5;
                     $menu.style.left = `${fixedLeft}px`;
                 }
             },

+ 4 - 2
web/building_saas/main/js/models/exportStandardInterface.js

@@ -1400,14 +1400,16 @@ const XMLStandard = (function () {
                 //定额人材机排序
                 rationGljData = gljUtil.sortRationGLJ(rationGljData);
                 for (let rGlj of rationGljData) {
-                    if (skipGLJTypes.includes(rGlj.type)) {
+                    const totalQuantity = gljUtil.getTotalQuantity(rGlj,  rationData, decimal.glj.quantity, decimal.ration.quantity);
+                    const parsedTotalQuantity = parseFloat(totalQuantity);
+                    if (skipGLJTypes.includes(rGlj.type) || !parsedTotalQuantity) {
                         continue;
                     }
                     let gljSource = {
                         code: rGlj.code,
                         //code: getGljCode(rGlj.projectGLJID),
                         quantity: rGlj.quantity,
-                        totalQuantity: gljUtil.getTotalQuantity(rGlj,  rationData, decimal.glj.quantity, decimal.ration.quantity)
+                        totalQuantity
                     };
                     let gljContent = new GljContent(gljSource);
                     gljAnalyze.children.push(gljContent);