Преглед изворни кода

查找定位,18部位问题

MaiXinRong пре 2 година
родитељ
комит
f66095b9af
2 измењених фајлова са 7 додато и 7 уклоњено
  1. 1 1
      app/public/js/ledger_check.js
  2. 6 6
      app/public/js/shares/cs_tools.js

+ 1 - 1
app/public/js/ledger_check.js

@@ -15,7 +15,7 @@ const ledgerCheckType = {
     calc: {value: 3, text: '清单数量不等于计量单元之和', fun: 'checkCalc', },
     zero: {value: 4, text: '清单数量或单价为0', fun: 'checkZero', },
     zeroPos: {value: 12, text: '计量单元数量为0', fun: 'checkZeroPos', },
-    pos_drawingCode: {value: 13, text: '计量单元图册号空', fun: 'checkPosDrawingCode', },
+    pos_drawingCode: {value: 13, text: '计量单元图册号空', fun: 'checkPosDrawingCode', },
     tp: {value: 5, text: '清单金额≠数量×单价', fun: 'checkTp', },
     over: {value: 6, text: '超计', fun: 'checkOver', },
     same_code: {value: 7, text: '重复项目节', fun: 'checkSameCode', },

+ 6 - 6
app/public/js/shares/cs_tools.js

@@ -529,20 +529,20 @@ const showSelectTab = function(select, spread, afterShow) {
         };
         const get18Bw = function(tree, data) {
             let parent = tree.getParent(data);
-            while (parent && parent.code.test(/^[a-zA-Z]/)) {
+            while (parent && (!parent.code || /^[a-zA-Z]/.test(parent.code || ''))) {
                 parent = tree.getParent(parent);
             }
-            return parent ? parent.code : '';
+            return parent ? parent.name : '';
         };
         const get08Bw = function(tree, data) {
             let parent = tree.getParent(data);
-            let lastXmjCode = '', level4XmjCode = '';
+            let lastXmj = '', level4Xmj = '';
             while (parent) {
-                if (parent.code && !lastXmjCode) lastXmjCode = parent.code;
-                if (parent.code && parent.level === 4) level4XmjCode = parent.code;
+                if (parent.code && !lastXmj) lastXmj = parent.name;
+                if (parent.code && parent.level === 4) level4Xmj = parent.name;
                 parent = tree.getParent(parent);
             }
-            return level4XmjCode || lastXmjCode;
+            return level4Xmj || lastXmj;
         };
         const getBw = function (data) {
             if (!data.b_code) return '';