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

modules/all_models/bills.js

@@ -20,6 +20,7 @@ let billsSchema = new Schema({
   chapterID: Number,
   billsLibId: Number,
   code: String,
+  sectionCode: String, // 清单章节号，池州接口需要
   fullCode: String,
   type: {
     type: Number,

web/building_saas/main/js/views/glj_col.js

@@ -288,6 +288,10 @@ let gljCol = {
             }
         };
 
+        colSettingObj.setVisible('feesIndex.common.tenderUnitFee', showFields);
+        colSettingObj.setVisible('feesIndex.common.tenderTotalFee', showFields);
+        colSettingObj.updateColSetting(true);
+
         if (needRefresh){
             if(projectGljObject.projectGljSpread) {
                 projectGljObject.projectGljSheet = projectGljObject.projectGljSpread .getSheet(0);

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

@@ -898,9 +898,6 @@ var projectObj = {
             }
             if (!err) {
                 that.project.projectGLJ.calcQuantity(true);//计算分部分项和技术措施项目消耗量;
-                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
-                    that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
-                subObj.initSubSpread();//初始化主界面下方的表格
 
                 let quantityTime = +new Date();
                // that.project.property = projectObj.project.projectInfo.property;
@@ -962,6 +959,9 @@ var projectObj = {
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, that.treeSelectedChanged);
+                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
+                that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
+                subObj.initSubSpread();//初始化主界面下方的表格
                 if(!projectReadOnly){
                     that.mainSpreadEscKey(that.mainSpread, that.mainSpreadEditStarting, that.mainSpreadEditEnded);
                     sheetCommonObj.bindEnterKey(that.mainSpread, that.mainSpreadEnterKey);

web/building_saas/main/js/views/tender_price_view.js

@@ -509,6 +509,14 @@ $(function () {
                 delete projectObj.project.property.needRestoreGgljPriceTenderCoe;
                 $('#gljPriceTenderCoe').val(1);
             }
+
+            if ($('#cbShowTenderFields').prop("checked") == false){
+              $('#cbShowTenderFields').prop("checked", true);
+              projectObj.project.saveProperty('tenderSetting.showTenderFields', true);
+              projectObj.project.property.tenderSetting.showTenderFields = true;
+              gljCol.showTenderFields(true, true);
+            }
+
             tender_obj.showTenderData();
             projectObj.project.projectGLJ.calcQuantity();
             // 刷新造价书界面的相关显示。刷新放在这里是为了切换UI时体验更流畅。
@@ -537,9 +545,30 @@ $(function () {
         // datas.push({type:ModuleNames.project,data:{'ID' : projectObj.project.ID(),'property.hasTender': false}});
         me.updateTenderData(datas,function () {
             // me.refreshTenderTreeByDatas(datas);
-            $('#calcTender').trigger('click');
-        });
+          let callback = function () {
+            if (projectObj.project.property.needRestoreGgljPriceTenderCoe){         // 入库存储，清理标记，刷新UI显示
+              projectObj.project.saveProperty('tenderSetting.gljPriceTenderCoe', 1);
+              delete projectObj.project.property.needRestoreGgljPriceTenderCoe;
+              $('#gljPriceTenderCoe').val(1);
+            }
+
+            if ($('#cbShowTenderFields').prop("checked") == true){
+              $('#cbShowTenderFields').prop("checked", false);
+              projectObj.project.saveProperty('tenderSetting.showTenderFields', false);
+              projectObj.project.property.tenderSetting.showTenderFields = false;
+              gljCol.showTenderFields(false, true);
+            }
 
+            tender_obj.showTenderData();
+            projectObj.project.projectGLJ.calcQuantity();
+            // 刷新造价书界面的相关显示。刷新放在这里是为了切换UI时体验更流畅。
+            if($('#linkJSCX').hasClass('active'))
+              calcProgramObj.refreshCalcProgram(projectObj.project.mainTree.selected, 2)
+            if($('#linkGLJ').hasClass('active'))
+              gljOprObj.refreshView();
+          };
+          projectObj.project.calcProgram.doTenderCalc(callback);
+        });
     });
 
     $('#cbShowTenderFields').on('click', function () {

web/building_saas/standard_interface/export/anhui_chizhou.js

@@ -282,8 +282,8 @@ INTERFACE_EXPORT = (() => {
                 serialNo++;
                 let zmh = (AItem.parent == vTree.roots[0]) ? getNum(AItem.data.name) : AItem.data.code;
                 const attrs = [
-                    {name: "序号", value: AItem.row()}, //AItem.data.ID
-                    {name: "清单章节号", value: zmh},
+                    {name: "序号", value: serialNo},
+                    {name: "清单章节号", value: AItem.data.sectionCode ? AItem.data.sectionCode : zmh},
                     {name: "子目号", value: zmh},
                     {name: "子目名称", value: AItem.data.name},
                     {name: "单位", value: AItem.data.unit},
@@ -377,7 +377,7 @@ INTERFACE_EXPORT = (() => {
 
             vJRG = vTree.roots.find(function getElement(e) {return e.getFlag() == fixedFlag.DAYWORK_LABOR});
             let attrs = [
-                { name: '序号', value: vJRG.row() },
+                { name: '序号', value: 1 },
                 { name: '名称', value: vJRG.data.name },
                 { name: '数据类型', value: 0 },
                 { name: '合价', value: isBidInvitation ? 0 : ( vJRG.data.feesIndex && vJRG.data.feesIndex.common ? vJRG.data.feesIndex.common.tenderTotalFee : 0) },
@@ -395,11 +395,12 @@ INTERFACE_EXPORT = (() => {
                 else
                     return 0;
             }
-
+            let jrgNo = 1;
             for (let i = 0; i < vJRG.children.length; i++) {
                 vKind = vJRG.children[i];
+                jrgNo++;
                 let attrs = [
-                    { name: '序号', value: vKind.row() },
+                    { name: '序号', value: jrgNo },
                     { name: '名称', value: vKind.data.name },
                     { name: '数据类型', value: getDataType_JRG(vKind.data.name) },
                     { name: '合价', value: isBidInvitation ? 0 : (vKind.data.feesIndex && vKind.data.feesIndex.common ? vKind.data.feesIndex.common.tenderTotalFee : 0) },
@@ -464,13 +465,15 @@ INTERFACE_EXPORT = (() => {
                 else
                     return (node.data.feesIndex && node.data.feesIndex.common ? node.data.feesIndex.common.tenderTotalFee : 0);
             }
+            debugger;
+            let nodes = [vTree.roots[0], ...vTree.roots[0].children, ...vTree.roots.slice(1)];
 
-            let nodes = [...vTree.roots, ...vTree.roots[0].children];
-
+            let hzmxNo = 0;
             for (let i = 0; i < nodes.length; i++){
                 let node = nodes[i];
+                hzmxNo++;
                 let attrs = [
-                    { name: '序号', value: node.row() },
+                    { name: '序号', value: hzmxNo },
                     { name: '章次', value: getZCLB(node.data.name, 1) },
                     { name: '名称', value: node.data.name },
                     { name: '金额', value: getJE(node) },

web/building_saas/standard_interface/import/anhui_chizhou.js

@@ -98,6 +98,7 @@ INTERFACE_IMPORT = (() => {
       // 第100-700章的数据
       if (oneSevenBills) {
         oneSevenBills.children = extractItemsRecur(oneSevenSrc, [['工程量清单明细']], (src) => ({
+          sectionCode: getValue(src, ['_清单章节号']),
           code: getValue(src, ['_子目号']),
           name: getValue(src, ['_子目名称']),
           unit: getValue(src, ['_单位']),