update

config/gulpConfig.js

@@ -79,6 +79,7 @@ module.exports = {
         'web/building_saas/main/js/models/ration_glj.js',
         'web/building_saas/main/js/models/ration_coe.js',
         'web/building_saas/main/js/models/ration_ass.js',
+        'web/building_saas/main/js/models/ration_installation',
         // 'web/building_saas/main/js/models/volume_price.js',
         'web/building_saas/main/js/models/labour_coe.js',
         'web/building_saas/main/js/models/installation_fee.js',

modules/main/facade/ration_facade.js

@@ -11,10 +11,12 @@ let ration_coe = mongoose.model('ration_coe');
 let ration_model = require('../models/ration');
 let bill_model = require('../models/bills');
 let decimal_facade = require('./decimal_facade');
+import installationFeeModel from "../models/installation_fee";
+import rationInstallationModel from "../models/ration_installation";
 const uuidV1 = require('uuid/v1');
 let std_glj_lib_gljList_model = mongoose.model('std_glj_lib_gljList');
 let coeMolde = mongoose.model('std_ration_lib_coe_list');
-
+let _= require('lodash');
 
 module.exports = {
     replaceRations: replaceRations,
@@ -113,8 +115,54 @@ async function addRationSubList(stdRation,newRation) {
     let ration_gljs = await addRationGLJ(stdRation,newRation);
     let ration_coes = await addRationCoe(stdRation,newRation);
     //todo  添加增加安装费
+    let ration_installs =  await addRationInstallFee(stdRation,newRation);
+    return {ration:newRation,ration_gljs:ration_gljs,ration_coes:ration_coes,ration_installs:ration_installs};
+}
+
+async function addRationInstallFee(std,newRation) {
+    let install_fee_list = [];
+    if(std.hasOwnProperty('rationInstList') && std.rationInstList.length > 0){
+        let installFee = await installationFeeModel.findOne({'projectID': newRation.projectID});
+        for(let ri of std.rationInstList){
+            let feeItem = _.find(installFee.installFeeItem,{'ID':ri.feeItemId});
+            let section = _.find(installFee.installSection,{'ID':ri.sectionId});
+            if(feeItem&&section){
+                let tem_r_i = {
+                    libID:installFee.libID,
+                    projectID:newRation.projectID,
+                    rationID:newRation.ID,
+                    feeItemId:feeItem.ID,
+                    sectionId:section.ID,
+                    itemName:feeItem.feeItem,
+                    feeType:feeItem.feeType,
+                    sectionName:section.name,
+                    unifiedSetting:1
+                };
+                if(section.feeRuleId&&section.feeRuleId!=''){
+                    let feeRule = _.find(installFee.feeRule,{'ID':section.feeRuleId});
+                    if(feeRule){
+                        tem_r_i.ruleId = feeRule.ID;
+                        tem_r_i.code = feeRule.code;
+                        tem_r_i.rule = feeRule.rule;
+                        tem_r_i.base = feeRule.base;
+                        tem_r_i.feeRate = feeRule.feeRate;
+                        tem_r_i.labour = feeRule.labour;
+                        tem_r_i.material = feeRule.material;
+                        tem_r_i.machine = feeRule.machine;
+                        tem_r_i.position = feeRule.position;
+                        tem_r_i.billID = feeRule.billID;
+                    }
+                }
+                tem_r_i.ID = uuidV1();
+                install_fee_list.push(tem_r_i);
+            }
+        }
+        if(install_fee_list.length>0){
+            await rationInstallationModel.insertMany(install_fee_list);
+        }
+    }
 
-    return {ration:newRation,ration_gljs:ration_gljs,ration_coes:ration_coes};
+    return install_fee_list;
 }
 
 async function addRationCoe(std,newRation) {

modules/main/facade/ration_installation_facade.js

@@ -0,0 +1,21 @@
+/**
+ * Created by zhang on 2018/2/24.
+ */
+
+import rationInstallationModel from "../models/ration_installation";
+let consts = require('../models/project_consts');
+let projectConsts = consts.projectConst;
+
+module.exports={
+    getData:getData
+};
+
+function getData(projectID, callback) {
+    rationInstallationModel.find({'projectID': projectID}, (err, datas) => {
+        if (err) {
+            callback(1, '', null);
+        } else {
+            callback(0, consts.projectConst.RATION_INSTALLATION, datas);
+        }
+    })
+}

modules/main/models/project.js

@@ -7,6 +7,7 @@ var GLJData = require('./glj');
 var ration_glj_data = require('../../ration_glj/facade/ration_glj_facade');
 var ration_coe_data = require('../../ration_glj/facade/ration_coe_facade');
 var ration_ass_data = require('../../ration_glj/facade/ration_ass_facade');
+let ration_installation = require('../facade/ration_installation_facade');
 var quantity_detail_data = require('../facade/quantity_detail_facade');
 var fee_rate_data = require('../../fee_rates/facade/fee_rates_facade');
 let projCounter = require('./proj_counter_model');
@@ -33,6 +34,7 @@ moduleMap[projectConsts.RATION] = rationData;
 moduleMap[projectConsts.RATION_GLJ] = ration_glj_data;
 moduleMap[projectConsts.RATION_COE] = ration_coe_data;
 moduleMap[projectConsts.RATION_ASS] = ration_ass_data;
+moduleMap[projectConsts.RATION_INSTALLATION] = ration_installation;
 moduleMap[projectConsts.QUANTITY_DETAIL] = quantity_detail_data;
 moduleMap[projCounter.collectionName] = projCounter;
 moduleMap[projSetting.collectionName] = projSetting;

modules/main/models/project_consts.js

@@ -8,6 +8,7 @@ let projectConst = {
     RATION_GLJ:'ration_glj',
     RATION_COE:'ration_coe',
     RATION_ASS:'ration_ass',
+    RATION_INSTALLATION:'ration_installation',
     QUANTITY_DETAIL:'quantity_detail',
     PROJECTGLJ: 'projectGLJ',
     GLJLIST: 'GLJList',

modules/main/models/ration_installation.js

@@ -14,6 +14,7 @@ var ration_installation = new Schema({
     feeItemId:String,
     ruleId:String,
     itemName:String,
+    sectionName:String,
     code: String,
     rule: String,
     base: String,
@@ -21,8 +22,12 @@ var ration_installation = new Schema({
     labour: Number,
     material: Number,
     machine: Number,
+    feeType: String, //费用类型
     position: String,//记取位置
-    billID:String//记取位置对应的清单ID
+    billID:String,//记取位置对应的清单ID
+    unifiedSetting:{type: Number,default:1},//0:false 1:true  按统一设置
 },{versionKey:false});
 
-mongoose.model('ration_installation', ration_installation);
+let rationInstallationModel = mongoose.model('ration_installation', ration_installation,"ration_installation");
+
+export{ rationInstallationModel as default}

web/building_saas/main/html/main.html

@@ -1019,9 +1019,6 @@
         <script src="/lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js" type="text/javascript"></script>
         <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
         <script>GC.Spread.Views.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</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>
@@ -1077,6 +1074,7 @@
         <script type="text/javascript" src="/web/building_saas/main/js/models/ration_glj.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/models/ration_coe.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/models/ration_ass.js"></script>
+        <script type="text/javascript" src="/web/building_saas/main/js/models/ration_installation.js"></script>
         <!--<script type="text/javascript" src="/web/building_saas/main/js/models/volume_price.js"></script>-->
         <script type="text/javascript" src="/web/building_saas/main/js/models/labour_coe.js"></script>
         <script type="text/javascript" src="/web/building_saas/main/js/models/calc_program.js"></script>
@@ -1186,9 +1184,28 @@
 //                count();
 //            }
 
+
             $(document).ready(function(){
                 //createTree();
 
+
+
+              /*  document.onkeydown=keydown;
+                function keydown(e){
+                   alert('aa');
+                   e.preventDefault();
+                   e.stopPropagation()
+
+                }*/
+
+              /*  $(document).keypress(function(e) {
+                    var code = (e.keyCode ? e.keyCode : e.which);
+                    if (code == 40) {
+                        alert("down pressed");
+                    } else if (code == 38) {
+                        alert("up pressed");
+                    }
+                });*/
                 /*            $("#tab_calc_program").click(function(){
                  location.href = '/web/building_saas/main/html/calc_program.html';
                  });*/

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

@@ -10,6 +10,7 @@ const ModuleNames = {
     ration_glj:'ration_glj',
     ration_coe:'ration_coe',
     ration_ass:'ration_ass',
+    ration_installation:'ration_installation',
     quantity_detail:'quantity_detail',
     labour_coe: 'labour_coe',
     calc_program: 'calc_program',

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

@@ -79,6 +79,7 @@ var PROJECT = {
             this.ration_glj = ration_glj.createNew(this);
             this.ration_coe = ration_coe.createNew(this);
             this.ration_ass = ration_ass.createNew(this);
+            this.ration_installation = ration_installation.createNew(this);
             this.quantity_detail = quantity_detail.createNew(this);
             this.installation_fee = installation_fee.createNew(this);
             this.FeeRate = FeeRate.createNew(this);

web/building_saas/main/js/models/ration.js

@@ -448,7 +448,7 @@ var Ration = {
                 $.bootstrapLoading.start();
                 CommonAjax.post("/ration/addNewRation",{itemQuery:itemQuery,newData:newData,calQuantity:calQuantity,brUpdate:brUpdate},function (data) {
                     //更新缓存
-
+                    console.log(data);
                     me.datas.push(data.ration);
                     project.ration_glj.addDatasToList(data.ration_gljs);
                     project.ration_coe.addDatasToList(data.ration_coes);

web/building_saas/main/js/models/ration_installation.js

@@ -0,0 +1,28 @@
+/**
+ * Created by zhang on 2018/2/24.
+ */
+let ration_installation = {
+    createNew: function (project) {
+        // 用户定义private方法
+        var tools = {};
+
+        // 所有通过this访问的属性，都不应在此单元外部进行写入操作
+        var ration_installation = function (proj) {
+            // this.project = proj;
+            this.datas = [];
+
+            var sourceType = ModuleNames.ration_installation;
+            this.getSourceType = function () {
+                return sourceType;
+            }
+            proj.registerModule(ModuleNames.ration_installation, this);
+        };
+
+        // prototype用于定义public方法
+        ration_installation.prototype.loadData = function (datas) {
+            this.datas = datas;
+        };
+
+        return new ration_installation(project);
+    }
+};

web/building_saas/main/js/views/glj_view.js

@@ -413,8 +413,11 @@ var gljOprObj = {
         if(selected.sourceType == ModuleNames.ration_glj){//选中的是工料机时不可编辑
             return ;
         }
-        var checkboxValue = args.sheet.getCell(args.row, args.col).value();
-        var newval = 0;
+        let checkboxValue = args.sheet.getCell(args.row, args.col).value();
+        if(args.sheetName == 'rationInstallSheet' && checkboxValue){
+            return;
+        }
+        let newval = 0;
         if (checkboxValue) {
             newval = 0;
             args.sheet.getCell(args.row, args.col).value(newval);
@@ -716,6 +719,7 @@ var gljOprObj = {
                     this.showRationGLJData(node);
                     this.showRationCoeData(node);
                     this.showRationAssData(node);
+                    installationFeeObj.showRationInstallationData(node);
                 }
                 isShow = true;
             }
@@ -1039,10 +1043,12 @@ var gljOprObj = {
         sheetCommonObj.showData(this.sheet, this.setting, []);
         sheetCommonObj.showData(this.coeSheet, this.coeSetting, []);
         sheetCommonObj.showData(this.assSheet, this.assSetting, []);
+        sheetCommonObj.showData(installationFeeObj.rationInstallSheet, installationFeeObj.rationInstallSetting, []);
         //  sheetCommonObj.showData(this.detailSheet,this.detailSetting,[]);
         this.sheetData = [];
         this.coeSheetData = [];
         this.assSheetData = [];
+        installationFeeObj.rationInstallData = [];
         //this.detailData=[];
     },
     /*   lockRationGLJCell:function(){

web/building_saas/main/js/views/installation_fee_view.js

@@ -5,20 +5,22 @@ let installationFeeObj={
     rationInstallSheet:null,
     rationInstallData:null,
     rationInstallSetting:{
-   /*     header: [
-            {headerName: "分册章节", headerWidth: 150, dataCode: "name", dataType: "String"},
-            {headerName: "费用规则", headerWidth: 220, dataCode: "rule", hAlign: "left", dataType: "String",getText:'forRule'},
+        header: [
+            {headerName: "按统一设置", headerWidth: 80, dataCode: "unifiedSetting", dataType: "String",cellType: "checkBox"},
+            {headerName: "费用项", headerWidth: 160, dataCode: "itemName", dataType: "String"},
+            {headerName: "费用规则", headerWidth: 300, dataCode: "rule", hAlign: "left", dataType: "String"/*,getText:'forRule'*/},
             {headerName: "编码", headerWidth: 70, dataCode: "code", hAlign: "left", dataType: "String"},
-            {headerName: "基数", headerWidth: 80, dataCode: "base", hAlign: "left", dataType: "String",cellType:'comboBox',options:installSectionBase},
+            {headerName: "基数", headerWidth: 150, dataCode: "base", hAlign: "left", dataType: "String",cellType:'comboBox',options:installSectionBase},
             {headerName: "费率（%）", headerWidth: 80, dataCode: "feeRate", hAlign: "right", dataType: "String"},
             {headerName: "其中人工（%）", headerWidth: 100, dataCode: "labour", hAlign: "right", dataType: "String"},
             {headerName: "其中材料（%）", headerWidth: 100, dataCode: "material", hAlign: "right", dataType: "String"},
             {headerName: "其中机械（%）", headerWidth: 100, dataCode: "machine", hAlign: "right", dataType: "String"},
+            {headerName: "费用类型", headerWidth: 100, dataCode: "feeType", hAlign: "center", dataType: "String",cellType:'comboBox',options:installFeeType},
             {headerName: "记取位置", headerWidth: 100, dataCode: "position", hAlign: "left", dataType: "String",cellType:'selectButton'}
         ],
         view: {
             lockColumns: [0, 2]
-        }*/
+        }
     },
     feeItemSpread:null,
     feeItemSheet:null,
@@ -209,8 +211,6 @@ let installationFeeObj={
        this.feeDetailSheet.setRowCount(0);
     },
     onFeeItemSelectionChange:function (e, info) {
-        console.log('fee item selection change');
-        console.log(info);
         let me = installationFeeObj;
         let newSelections = info.newSelections;
         let row = newSelections[0].row;
@@ -229,7 +229,6 @@ let installationFeeObj={
                 me.showFeeDetailData();
             }
         }
-       // me.feeItemSheet.repaint();
     },
     onFeeDetailSelectionChange:function (e,info) {
         console.log('detail selection change');
@@ -323,6 +322,16 @@ let installationFeeObj={
         this.moreFeeRuleSheet.setRowCount(this.moreFeeRuleData.length);
         this.moreFeeRuleSheet.clearSelection();
     },
+    showRationInstallationData:function (node) {
+        var installationList = [];
+        var ration_installation = projectObj.project.ration_installation;
+        var ration = node.data;
+        if (ration_installation.datas && ration_installation.datas.length > 0) {
+            installationList = _.filter(ration_installation.datas, {'projectID': ration.projectID, 'rationID': ration.ID})
+        }
+        this.rationInstallData = installationList;
+        sheetCommonObj.showData(this.rationInstallSheet, this.rationInstallSetting,this.rationInstallData);
+    },
     refreshFeeDetailRow:function (row) {
         let detail = this.feeDetailData[row];
         let section = projectObj.project.installation_fee.getInstallSectionByID(detail.libID,detail.ID);
@@ -369,7 +378,7 @@ let installationFeeObj={
             feeItemShowArray.push(tem_Lib);
             if(d.installFeeItem && d.installFeeItem.length > 0){
                 for(let t_if of d.installFeeItem){
-                    t_if.installFeeID = d.ID,
+                    t_if.installFeeID = d.ID;
                     t_if.libID = d.libID;
                     t_if.isMixRatio = true;
                     t_if.displayPosition = this.getDisplayText(t_if);
@@ -385,7 +394,6 @@ let installationFeeObj={
             if(node){
                 return node.data.code +" "+node.data.name;
             }
-
         }
         return  item.position;
     },
@@ -406,6 +414,8 @@ let installationFeeObj={
         let feeRules =  projectObj.project.installation_fee.getFeeRuleByFeeItem(feeItem);
         return feeRules;
     },
+
+
     getDetailRowDataBySection(is,libID){
         let me = this;
         let tem_detail = {
@@ -453,6 +463,11 @@ let installationFeeObj={
         this.moreFeeRuleSheet.selectionUnit(1);//0 cell,1 row,2 col;
         this.moreFeeRuleSheet.name('moreFeeRuleSheet');
     },
+    initRationInstallSheet:function (sheet) {
+        this.rationInstallSheet = sheet;
+        this.initSheet( this.rationInstallSheet,this.rationInstallSetting);
+        this.rationInstallSheet.name("rationInstallSheet");
+    },
     onFeeRuleDoubleClick:function (e,info) {
         if(info.row!=undefined||info!=null){
             installationFeeObj.updateFeeRuleToSection(info.row);

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

@@ -318,7 +318,8 @@ var projectObj = {
         if (node.sourceType === project.Bills.getSourceType()) {
             this.updateBillsCode(node, value);   // 新清单不适合实时计算，下面套什么还不能确定，无数量计算也无意义
         } else if (node.sourceType === project.Ration.getSourceType()) {
-            this.updateRationCode(node, value);  // 新套定额适合实时计算
+            project.Ration.updateRationCodes([{'node':node,value:value}]);
+          //  this.updateRationCode(node, value);  // 新套定额适合实时计算
             // 这里因异步问题暂时缺少工料机价格。该过程移到：ration_glj.js的refreshAfterSave方法中。
             /*project.calcProgram.calcAndSave(node);
             if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {

web/building_saas/main/js/views/sub_view.js

@@ -31,6 +31,9 @@ SheetDataHelper.protectdSheet(subSpread.getSheet(1));
 gljOprObj.initDetailSheet(subSpread.getSheet(3));
 SheetDataHelper.protectdSheet(subSpread.getSheet(3));
 
+//安装增加费
+installationFeeObj.initRationInstallSheet(subSpread.getSheet(5));
+SheetDataHelper.protectdSheet(subSpread.getSheet(5));
 
 $("#linkGLJ").click(function(){
     $("#subItems").children().hide();//控制显示subSpread,隐藏特征及内容spread
@@ -68,6 +71,21 @@ $("#linkFZTJ").click(function(){
     //subSpread.getActiveSheet().setValue(0, 0, "附注条件");
 });
 
+
+
+$("#linkAZZJF").click(function(){
+    $("#subItems").children().hide();
+    $("#subSpread").show();
+    pageCCOprObj.active = false;
+    refreshSubSpread();
+    subSpread.setActiveSheetIndex(5);
+    $.contextMenu( 'destroy', "#subSpread" );
+    //gljContextMenu.loadQuantityDetailMenu();
+    gljOprObj.activeTab='#linkAZZJF';
+    // for test
+    //subSpread.getActiveSheet().setValue(0, 0, "安装增加费");
+});
+
 $("#linkGCLMX").click(function(){
     $("#subItems").children().hide();
     $("#subSpread").show();