Procházet zdrojové kódy

1.导入时不要识别建筑面积“JZMJ”
2.删除空编码清单,恢复删除节点无效问题

zeweizhong před 6 roky
rodič
revize
15b80a2cc3

+ 1 - 1
web/building_saas/main/js/controllers/block_controller.js

@@ -599,7 +599,7 @@ let BlockController = {
             let newID = uuid.v1(); //新的清单ID
             billsIDMap[temData.ID] = newID;
             temData.ID = newID; //新的清单ID
-            if(temData.code.length == 12){//是从清单库来的  //temData.billsLibId && temData.billsLibId!=""    2019-09-03  修改需求,不做清单库ID判断
+            if(temData.code && temData.code.length == 12){//是从清单库来的  //temData.billsLibId && temData.billsLibId!=""    2019-09-03  修改需求,不做清单库ID判断
                 let value = temData.code.substr(0,9);
                 if (value&&value.length === 9) {//&& /^[\d]+$/.test(value) 去掉全数字判断    07-31 zhang
                     temData.code = me.newFormatCode(value);

+ 1 - 1
web/building_saas/main/js/models/importStandardInterface.js

@@ -1352,7 +1352,7 @@ const ImportXML = (() => {
             JSCS_JXF: '{技术措施项目定额施工机具使用费}',
             JSCS_ZCF: '{技术措施项目主材费}',
             JSCS_GR: '{技术措施项目人工工日}',
-            JZMJ: '{建筑面积}',
+            //JZMJ: '{建筑面积}',
             RCJJC: '{人材机价差}',
             RGJC: '{人工价差}',
             CLJC: '{材料价差}',