Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/complementary_ration_lib/js/ration_glj.js

@@ -256,7 +256,6 @@ var rationGLJOprObj = {
         }
     },
     onClipboardPasted: function (e, info) {
-        debugger;
         var me = rationGLJOprObj, repId = pageOprObj.rationLibId;
         me.tempCacheArr = [];
         let gljLibId = pageOprObj.gljLibId;

web/building_saas/main/js/models/quantity_detail.js

@@ -695,23 +695,20 @@ var quantity_detail = {
             return value
         };
         quantity_detail.prototype.editMainTreeNodeQuantity=function (value,node,fieldName,editingText) {
-            var me = this;
-            if(isNaN(value)){
-                alert("当前输入的数据类型不正确，请重新输入。");
-                projectObj.mainController.refreshTreeNode([node]);
-            }else {
-                value=value?value:0;
-                if(node.data.hasOwnProperty('isFromDetail')&&node.data.isFromDetail==1){
-                    hintBox.infoBox('操作确认', '已有工程量明细，是否清空明细表，采用手工输入的表达式？', 2, function () {
-                        node.data.isFromDetail=0;
-                        me.updateMainTreeNodeQuantity(value,node,editingText);
-                    }, function () {
-                        projectObj.mainController.refreshTreeNode([node]);
-                    },['确定','取消'],false);
-                    return;
-                }
-                me.updateMainTreeNodeQuantity(value,node,editingText);
-            }
+          /*   var me = this;
+            value=value?value:0;
+            if(node.data.hasOwnProperty('isFromDetail')&&node.data.isFromDetail==1){
+                hintBox.infoBox('操作确认', '已有工程量明细，是否清空明细表，采用手工输入的表达式？', 2, function () {
+                    node.data.isFromDetail=0;
+                    quantityEditObj.checkingAndUpdate(editingText,node);
+                   // me.updateMainTreeNodeQuantity(value,node,editingText);
+                }, function () {
+                    projectObj.mainController.refreshTreeNode([node]);
+                },['确定','取消'],false);
+                return;
+            } */
+            quantityEditObj.checkingAndUpdate(editingText,node);
+        
         };
         quantity_detail.prototype.updateMainTreeNodeQuantity = function(value,node,editingText){
             let me = this;

web/building_saas/main/js/views/zmhs_view.js

@@ -703,7 +703,6 @@ let zmhs_obj = {
         return allData;
         // 获取自动调整行数据
         function getAutoAdjustData(changedData, unchangedData) {
-            debugger;
             const changedMaxData = changedData[changedData.length - 1];
             // 如果不存在不变的数据，自动调整行号为：最大变化数据行
             if (!unchangedData.length) {

web/building_saas/standard_interface/config.js

@@ -103,14 +103,14 @@ const INTERFACE_CONFIG = (() => {
         [CONTROL]: '.xjglkzjx',
       },
     },
-    /* '甘肃@张掖': {
+    '甘肃@张掖': {
       scriptName: 'anhui_maanshan.js',
       fileSuffix: {
         [BID_INVITATION]: '.ZYEGLZB',
         [BID_SUBMISSION]: '.ZYEGLTB',
         [CONTROL]: '.ZYEGLKZJ',
       },
-    }, */
+    },
     '浙江@宁海': {
       scriptName: 'zhejiang_ninghai.js',
       fileSuffix: {

web/building_saas/standard_interface/export/anhui_chizhou.js

@@ -102,7 +102,6 @@ INTERFACE_EXPORT = (() => {
       function getRCJLB(AType){   // 1=人工；2=材料；3=机械组成物；4=设备；5=混凝土/砂浆/配合比；6=机械台班
           let rst = 2;
           AType+="";
-          debugger;
           if (AType == '1'){
             rst = '1';
           }

web/building_saas/standard_interface/import/zhejiang_ninghai.js

@@ -113,7 +113,7 @@ INTERFACE_IMPORT = (() => {
         const simpleName = item.name ? item.name.replace(/\s/g, '') : '';
         if (item.titleType === '1' || /100章至第700章|100章至700章/.test(simpleName)) {
           oneSevenBills = item;
-        } else if (/计日工合计/.test(simpleName)) {
+        } else if (item.titleType === '4' || /计日工合计|计日工/.test(simpleName)) {
           dayWorkBills = item;
         }
       });
@@ -137,8 +137,9 @@ INTERFACE_IMPORT = (() => {
         const detail = '计日工信息明细';
         dayWorkBills.children = extractItemsRecur(dayWorkSrc, [[title], [detail]], (src, curField) => {
           const name = getValue(src, ['_名称']);
+          const dataType = getValue(src, ['_数据类型']);
           const simpleName = name ? name.replace(/\s/g, '') : ''
-          if (curField === title && /计日工合计/.test(simpleName)) { // 计日工标题在根节点中已经提取了，不重复提取
+          if (curField === title && (dataType === '0' || /计日工合计|计日工/.test(simpleName))) { // 计日工标题在根节点中已经提取了，不重复提取
             return null;
           }
           const item = { name };