update 综合电价

config/gulpConfig.js

@@ -169,6 +169,7 @@ module.exports = {
         'web/building_saas/main/js/views/locate_view.js',
         'web/building_saas/complementary_ration_lib/js/main.js',
         'web/building_saas/main/js/views/material_calc_view.js',
+        'web/building_saas/main/js/views/electrovalence_view.js',
         'public/web/storageUtil.js'
     ],
     compleGlj_css: [

modules/glj/controllers/glj_controller.js

@@ -19,6 +19,7 @@ let EngineeringLibModel = require("../../users/models/engineering_lib_model");
 let mongoose = require('mongoose');
 let original_calc_model = mongoose.model('original_calc');
 let freight_calc_model = mongoose.model('freight_calc');
+let com_electrovalence_model = mongoose.model('com_electrovalence');
 let ration = mongoose.model('ration');
 let projectModel = mongoose.model('projects');
 let _ = require('lodash');
@@ -872,6 +873,8 @@ async function getGLJListByProjectID(projectId){
         }
         responseData.data.originalList = await original_calc_model.find({"unit_price_file_id":unitPriceFileId}).lean();
         responseData.data.freightList = await freight_calc_model .find({"unit_price_file_id":unitPriceFileId}).lean();
+        responseData.data.com_electrovalence = await com_electrovalence_model.findOne({"unit_price_file_id":unitPriceFileId}).lean();
+        //if(!responseData.data.com_electrovalence) responseData.data.com_electrovalence = {};
         // 先获取对应标段的项目工料机数据
         let gljListModel = new GLJListModel();
         let [gljList, mixRatioConnectData,mixRatioMap,unitPriceMap] = await gljListModel.getListByProjectId(projectId, unitPriceFileId,responseData.data.freightList,responseData.data.originalList);

web/building_saas/glj/html/project_glj.html

@@ -267,4 +267,30 @@
             </div>
         </div>
     </div>
+</div>
+
+
+<!--弹出 计算综合电价窗口-->
+<div class="modal fade" id="electrovalenceDiv" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">计算综合电价</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body" style="height: 200px;padding: 0px">
+                <div class="ovf-hidden full-h" id="electrovalence_sheet"></div>
+            </div>
+            <div class="modal-footer">
+                <div style="width: 70%">
+                    <button type="button" class="btn btn-danger" id="removeElectrovalencec">删除</button>
+                    <label >综合电价：</label>
+                </div>
+                <button type="button" class="btn btn-primary" id="electrovalencecConfirm">确定</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
 </div>

web/building_saas/main/html/main.html

@@ -2041,6 +2041,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/views/locate_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/main.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/material_calc_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/electrovalence_view.js"></script>
     <script type="text/javascript" src="/public/web/storageUtil.js"></script>
     <script type="text/javascript" src="/web/building_saas/report/js/rpt_jspdf.js"></script>
 

web/building_saas/main/js/views/electrovalence_view.js

@@ -0,0 +1,43 @@
+/**
+ * Created by zhang on 2019/12/12.
+ */
+let electrovalenceObj = {
+    setting:{
+        header:[
+            {headerName: "代号", headerWidth: 70, dataCode: "code", dataType: "String"},
+            {headerName: "名称", headerWidth: 150, dataCode: "name",dataType: "String"},
+            {headerName: "规格", headerWidth: 60, dataCode: "specs", dataType: "Number",validator:"number"},
+            {headerName: "预算价", headerWidth: 75, dataCode: "marketPrice", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "加权系数", headerWidth: 60, dataCode: "coe", hAlign: "right", dataType: "Number",validator:"number"}
+        ],
+        view: {
+            lockColumns: ["code","specs"],
+            rowHeaderWidth:25,
+            colHeaderHeight:36
+        }
+    },
+    spread:null,
+    sheet:null,
+    datas:[],
+    initSpread:function () {
+        if(this.spread) return;
+        this.spread = SheetDataHelper.createNewSpread($("#electrovalence_sheet")[0]);
+        sheetCommonObj.spreadDefaultStyle(this.spread);
+        this.sheet = this.spread.getSheet(0);
+        sheetCommonObj.initSheet(this.sheet, this.setting, 30);
+    /*    this.materialSheet.bind(GC.Spread.Sheets.Events.ValueChanged, this.onMaterialValueChange);
+        this.materialSheet.bind(GC.Spread.Sheets.Events.SelectionChanged,this.onMaterialSelectionChange);
+        this.materialSheet.bind(GC.Spread.Sheets.Events.EditStarting,this.onMaterialEditStarting);*/
+        this.sheet.name('electrovalence_sheet');
+        if(projectReadOnly){
+            disableSpread(this.spread);
+        }
+    }
+};
+
+$(function () {
+
+    $("#electrovalenceDiv").on('shown.bs.modal', function () {
+        electrovalenceObj.initSpread();
+    });
+});

web/building_saas/main/js/views/project_glj_view.js

@@ -1033,6 +1033,16 @@ projectGljObject={
                         let projectGLJ = projectGljObject.getProjectGLJSelected();
                         projectObj.project.projectGLJ.updateCalcMaterial(projectGLJ,'calcMaterial',1);
                     }
+                },
+                "calcElectrovalence": {
+                    name: "计算综合电价",
+                    icon: 'fa-sign-in',
+                    disabled: function () {
+                        return  false;
+                    },
+                    callback: function (key, opt) {
+                        $("#electrovalenceDiv").modal("show")
+                    }
                 }
             }
         });
@@ -1459,7 +1469,6 @@ $(function () {
     $("#mixRatio-nav").on('shown.bs.tab', function () {
         projectGljObject.mixRatioSpread.refresh();
     });
-
 });