Bläddra i källkod

中山接口和bugs

zhangweicheng 5 år sedan
förälder
incheckning
54d298cb95

+ 13 - 12
config/config.js

@@ -103,18 +103,19 @@ module.exports = {
   qa_sc: {
     title: "纵横公路云造价",
     startPort: 3060,
-    server: "192.168.1.90",
-    port: "60666",
-    dbname: 'smartcost',
-    options: {
-      user: 'smartcost',
-      pass: 'smartcost3850888',
-      auth: {
-        "authdb": "admin"
-      },
-      connectTimeoutMS: 60000,
-      useMongoClient: true
-    },
+    dbURL:"mongodb://smartcost:smartcost3850888@192.168.1.90:60666,192.168.1.90:60667/smartcost?authSource=admin;replicaSet=sc",
+    // server: "192.168.1.90",
+    // port: "60666",
+    // dbname: 'smartcost',
+    // options: {
+    //   user: 'smartcost',
+    //   pass: 'smartcost3850888',
+    //   auth: {
+    //     "authdb": "admin"
+    //   },
+    //   connectTimeoutMS: 60000,
+    //   useMongoClient: true
+    // },
     importURL: "192.168.1.90:3050",
     importPort: 3050,
     socketPort: 2200

+ 2 - 2
web/building_saas/main/js/views/main_tree_col.js

@@ -361,8 +361,8 @@ let MainTreeCol = {
       },
       lockUnitPrice: function (node) {
         //仅未使用基数计算的清单有效
-        if(!(node.data.calcBase&&node.data.calcBase!="")) return sheetCommonObj.getCheckBox();
-    },
+        if(node.sourceType == ModuleNames.bills&& !(node.data.calcBase&&node.data.calcBase!="")) return sheetCommonObj.getCheckBox();
+       },
         evaluationProject:function (node) {
             if(node.sourceType == ModuleNames.ration) return new GC.Spread.Sheets.CellTypes.CheckBox();
         },

+ 1 - 0
web/building_saas/main/js/views/project_view.js

@@ -3431,6 +3431,7 @@ $('#calcBaseFeeRateConf').click(function () {
     if(calcBaseValue !== selected.data.calcBase){
         needToSave = true;
         selected.data.userCalcBase = calcBaseValue;
+        selected.updateData.lockUnitPrice = null;
         projectObj.project.calcBase.calculate(selected);
     }
     if(validateFeeRate){

+ 27 - 1
web/building_saas/standard_interface/export/guangdong_zhongshan.js

@@ -116,6 +116,28 @@ INTERFACE_EXPORT = (() => {
     "清单 第900章 附属区房建工程":true
   }
 
+  const ListCodeMap = {
+    "第100章至900章清单":"1",
+    "清单 第100章 总则": "一",
+    "清单 第200章 路基": "二",
+    "清单 第300章 路面": "三",
+    "清单 第400章 桥梁、涵洞工程": "四",
+    "清单 第500章 隧道": "五",
+    "清单 第600章 交通安全设施": "六",
+    "清单 第700章 绿化及环境保护设施": "七",
+    "清单 第800章 机电工程": "八",
+    "清单 第900章 附属区房建工程": "九",
+    "已包含在清单合计中的材料、工程设备、专业工程暂估价合计": "10",
+    "清单合计减去材料、工程设备、专业工程暂估价合计": "11",
+    "计日工合计": "12",
+    "劳务": "12.1",
+    "材料": "12.2",
+    "机械": "12.3",
+    "暂列金额(不含计日工总额)": "13",
+    "投标报价": "14"
+  } 
+
+
   const ratioCodeMap = { 
     "01ZJF":"0",
     "02JXF":"1",
@@ -1051,9 +1073,13 @@ INTERFACE_EXPORT = (() => {
           }
           let fail = billNameChecking(bNode,tenderProject.projectInfo.name,fixedFlag)
           //fail: { hint: '错误提示', type: '提示所属(基本就是单位工程名称)' }
+          let ListCode = "";
+          if (ListCodeMap[data.name]) ListCode = ListCodeMap[data.name];
+          if (data.code && data.code != "") ListCode = data.code;
+
           const attrs = [{
               name: "ListCode",
-              value: data.code,
+              value: ListCode,
             },
             {
               name: "ListName",