交换数据接口相关

config/gulpConfig.js

@@ -109,6 +109,7 @@ module.exports = {
         'public/web/id_tree.js',
         'web/building_saas/main/js/models/cache_tree.js',
         'web/building_saas/main/js/calc/calc_fees.js',
+        'web/building_saas/main/js/models/exportStandardInterface.js',
         // 'web/building_saas/main/js/calc/ration_calc.js',
         // 'web/building_saas/main/js/calc/bills_calc.js',
         // 'public/calc_util.js',

modules/common/const/bills_fixed.js

@@ -45,7 +45,20 @@ const fixedFlag = {
     //专项技术措施暂估价
     SPECIAL_TECH_PROVISIONAL: 21,
     //专业发包工程管理费
-    LET_CONTRACT_MANAGEMENT: 22
+    LET_CONTRACT_MANAGEMENT: 22,
+    //人工
+    LABOUR: 23,
+    //材料
+    MATERIAL: 24,
+    //施工机械
+    MACHINE: 25,
+    //索赔
+    CLAIM: 26,
+    //现场签证
+    VISA: 27,
+    ADDITIONAL_TAX: 28,
+    //环境保护税
+    ENVIRONMENTAL_PROTECTION_TAX: 29
 };
 
 export default fixedFlag;

modules/pm/controllers/pm_controller.js

@@ -219,6 +219,8 @@ module.exports = {
                 }
                 //读取建设项目的项目属性
                 let constructionProperty = await ProjectsData.getConstructionProperty(projectID);
+                console.log(projectID);
+                console.log(constructionProperty);
                 //基本信息
                 projInfo.property.basicInformation = constructionProperty && constructionProperty.basicInformation ? constructionProperty.basicInformation : [];
                 //编制说明

modules/pm/facade/pm_facade.js

@@ -1062,7 +1062,7 @@ async function getProjectByGranularity(tenderID, granularity, userID, versionNam
         ENGINEERING: 2,
         TENDER: 3
     };
-    let theTender = await projectModel.findOne({ID: tenderID});
+    let theTender = await projectModel.findOne({userID: userID, ID: tenderID}); //加上session的userID，防止tenderID被篡改过
     if (!theTender) {
         return null;
     }
@@ -1083,9 +1083,9 @@ async function getProjectByGranularity(tenderID, granularity, userID, versionNam
     } else {
         engineerings = [theEngineering];
         if (granularity === GRANULARITY.ENGINEERING) {
-            theEngineering._doc.children = theTender;
-        } else {
             theEngineering._doc.children = await projectModel.find({ParentID: theEngineering.ID, $or: notDeleted});
+        } else {
+            theEngineering._doc.children = [theTender];
         }
     }
     constructionProject._doc.children = engineerings;

web/building_saas/fee_rates/fee_rate.html

@@ -5,7 +5,7 @@
     <div class="form-inline py-1">
         <label  class="mx-2" >使用费率文件：<span id="feeRateFileName">费率1</span>（<label class="a_color" id="pop-lv">与<span id="projectCount">3</span> 个单位工程同步</label>）
             <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-lv" id="changFeeRateFile"><i class="fa fa-exchange"></i> 选择其他</a>
-            <a class="btn btn-sm ml-1" href="#" data-toggle="modal" id="saveAs" data-target="#copy-lv"><i class="fa fa-files-o"></i> 另存单独用</a></label>
+            <a class="btn btn-sm ml-1" href="#" data-toggle="modal" id="saveAsFeeRate" data-target="#copy-lv"><i class="fa fa-files-o"></i> 另存单独用</a></label>
     </div>
 </div>
 <div class="toolsbar_feeRate px-1">

web/building_saas/main/html/main.html

@@ -1997,6 +1997,7 @@
     <script src="/lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js" type="text/javascript"></script>
     <script src="/lib/js-xlsx/xlsx.core.min.js"></script>
     <script src="/lib/lz-string/lz-string.min.js"></script>
+    <script src="/lib/fileSaver/FileSaver.min.js"></script>
     <!-- inject:js -->
     <!--<script type="text/javascript" src="/test/tmp_data/test_ration_calc/ration_calc_base.js"></script>-->
     <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>

web/building_saas/main/js/models/main_consts.js

@@ -246,9 +246,36 @@ const fixedFlag = {
     //专项技术措施暂估价
     SPECIAL_TECH_PROVISIONAL: 21,
     //专业发包工程管理费
-    LET_CONTRACT_MANAGEMENT: 22
+    LET_CONTRACT_MANAGEMENT: 22,
+    //人工
+    LABOUR: 23,
+    //材料
+    MATERIAL: 24,
+    //施工机械
+    MACHINE: 25,
+    //索赔
+    CLAIM: 26,
+    //现场签证
+    VISA: 27,
+    //附加税
+    ADDITIONAL_TAX: 28,
+    //环境保护税
+    ENVIRONMENTAL_PROTECTION_TAX: 29
+};
+//费用类别：固定行ID对应
+const FEE_TYPE = {
+    [fixedFlag.SUB_ENGINERRING]: '1100',
+    [fixedFlag.MEASURE]: '1200',
+    [fixedFlag.CONSTRUCTION_ORGANIZATION]: '120201',
+    [fixedFlag.SAFETY_CONSTRUCTION]: '1204',
+    [fixedFlag.OTHER]: '1300',
+    [fixedFlag.CHARGE]: '800',
+    [fixedFlag.TAX]: '900',
+    [fixedFlag.ADDED_VALUE_TAX]: '9001',
+    [fixedFlag.ADDITIONAL_TAX]: '9002',
+    [fixedFlag.ENVIRONMENTAL_PROTECTION_TAX]: '9003',
+    0: '1800',  //其他未定义的大项费用
 };
-
 const gljKeyArray =['code','name','specs','unit','type'];
 const rationKeyArray =['code','name','specs','unit','subType'];
 const gljLibKeyArray =['code', 'name', 'specs', 'unit', 'gljType'];

web/building_saas/main/js/models/project.js

@@ -52,7 +52,9 @@ var PROJECT = {
 
             me._project.loadMainTree();
             //me.test(result[0].data[0]);
-            callback(0);
+            if (callback) {
+                callback(0);
+            }
         };
         tools.eachItem=function(item){
             if (me.modules[item.moduleName]){
@@ -240,6 +242,12 @@ var PROJECT = {
                 }
             });
         };
+        project.prototype.loadDataSync = async function () {
+            let data = await ajaxPost('/project/getData', {user_id: tools._userID, project_id: tools._ID});
+            if (data) {
+                tools.doAfterLoad(data);
+            }
+        };
 
         project.prototype.beginUpdate = function(operation){
             if (tools.updateLock === 0){

web/building_saas/main/js/models/project_glj.js

@@ -56,7 +56,6 @@ ProjectGLJ.prototype.loadData = function (callback = null) {
 
 ProjectGLJ.prototype.loadToCache = function (data) {
     this.datas = data;
-    projectObj.project.projectGLJ = this;
 }
 
 

web/building_saas/main/js/views/fee_rate_view.js

@@ -1039,7 +1039,7 @@ $(function(){
         //if(newVal&&newVal!=feeRateFile.libID)  feeRateObject.changeFeeRateStandard(newVal);
     });
 
-    $('#saveAs').bind('click', function (){
+    $('#saveAsFeeRate').bind('click', function (){
         var feeRateFile = projectObj.project.FeeRate.getActivateFeeRate();
         $('#copyFeeRateName').val(feeRateFile.name+'副本');
         $('#valid_name').val(feeRateFile.name+'副本');

web/building_saas/main/js/views/project_view.js

@@ -2357,10 +2357,12 @@ $('#compilationIllustration').keyup(function () {
 });
 $('#property_ok').click(async function () {
     //test-----
-    /*let xmlObj = new XMLStandard();
-    let testData = await xmlObj.loadData(projectObj.project.ID());
-    console.log(testData);
-    console.log(xmlObj);*/
+  /*  $.bootstrapLoading.start();
+    let xmlObj = new XMLStandard(userID, 1);
+    await xmlObj.toXml(projectObj.project.ID());
+    console.log(xmlObj);
+    $.bootstrapLoading.end();
+    return;*/
     //test-----
     let project = projectObj.project,
         projectID = project.ID(),