zhangweicheng 6 лет назад
Родитель
Сommit
28b5f9b62d

+ 1 - 0
config/gulpConfig.js

@@ -143,6 +143,7 @@ module.exports = {
         'web/building_saas/main/js/views/confirm_modal.js',
         'web/building_saas/main/js/views/zlfb_view.js',
         'web/building_saas/main/js/views/installation_fee_view.js',
+        'web/building_saas/main/js/views/material_adjust_view.js',
         'web/building_saas/main/js/views/project_glj_view.js',
         'web/building_saas/main/js/views/importBills.js',
         'public/web/rpt_tpl_def.js',

+ 8 - 2
modules/all_models/project_glj.js

@@ -104,13 +104,19 @@ let modelSchema = {
     mix_ratio_id: Number,
     // 显示关联父级工料机code(组合物用)
     connect_code: String,
-    materialType: Number,   //三材类别
-    materialCoe: Number,    //三材系数
+    materialType: Number,//三材类别
+    materialCoe: Number,//三材系数
     // 是否主要材料 (0为否 1为是)
     is_main_material: {
         type: Number,
         default: 0
     },
+    is_info_adjust:{type: Number, default: 0},//是否造价信息差额调整
+    is_coe_adjust:{type: Number, default: 0},//是否价格指数调整
+    riskCoe:String,//风险系数
+    standardPrice:String,//standardPrice
+    FO:String,//基本价格指数
+    FI:String,//现行价格指数
     ratio_data: Schema.Types.Mixed,
     remark:String,
     originPlace:String,//产地

+ 1 - 1
modules/glj/controllers/glj_controller.js

@@ -85,7 +85,7 @@ class GLJController extends BaseController {
         };
         try {
             // 可编辑的字段
-            let editableField = ['is_evaluate', 'unit_price.market_price', 'is_adjust_price', 'mix_ratio.consumption','is_eval_material','no_tax_eqp',
+            let editableField = ['is_evaluate', 'unit_price.market_price', 'is_adjust_price', 'mix_ratio.consumption','is_eval_material','no_tax_eqp','is_coe_adjust','is_info_adjust','FI','FO','standardPrice','riskCoe',
                 'supply', 'supply_quantity','delivery_address','delivery','materialType','materialCoe','is_main_material','originPlace','vender','qualityGrace','brand','remark'];
             if (editableField.indexOf(field) < 0) {
                 throw '对应字段不能编辑';

+ 0 - 6
public/web/tree_sheet/tree_sheet_helper.js

@@ -557,11 +557,6 @@ var TREE_SHEET_HELPER = {
                 $editor.children('div').height(cellRect.height+2);
                 return $editor;
             };
-
-            TreeNodeCellType.prototype.deactivateEditor = function (editorContext, context) {
-                    console.log("hehe")
-            };
-
             TreeNodeCellType.prototype.updateEditor = function (editorContext, cellStyle, cellRect, context) {
                 let me = this;
                 $(editorContext).append(`<div><ul class="es-list" style="display: block;"></ul></div>`);//<li class="" data-value="" style=""> <br></li> //background-color:${cellStyle.backColor}
@@ -595,7 +590,6 @@ var TREE_SHEET_HELPER = {
                     });
                     if( $('#esInput').val()) setCursor( $("#esInput")[0], $('#esInput').val().length)
                 });
-                console.log("update")
             };
 
             TreeNodeCellType.prototype.processKeyDown = function (e, context){ //当用isReservedKey 不拦截编辑模式时的input框ctrl + c时,在非编辑模式的ctrl + c事件也需要自已处理,所以在这里再调用一下复制命令

+ 73 - 1
web/building_saas/glj/html/project_glj.html

@@ -8,6 +8,10 @@
         <label class="mx-2">使用单价文件:<span id="current-name"></span>(<label class="a_color" id="pop-used-list" data-original-title="" title="">与<span id="used-project-count">0</span>个单位工程同步</label>)
             <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-unitFile"><i class="fa fa-exchange"></i> 选择其他</a>
             <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#unitFile-save-as"><i class="fa fa-files-o"></i> 另存单独用</a></label>
+        <select class="form-control form-control-sm" style="width: auto; font-size: .875rem ;color: #007bff" id="adjustType">
+            <option value="priceInfo">造价信息差额调整法</option>
+            <option value="priceCoe" selected>价格指数调整法</option>
+        </select>
     </div>
 </div>
 
@@ -27,9 +31,14 @@
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="SCHZ">三材汇总</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZYCL">主要材料</a></li>
+                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="AMAE">添加承包人提供主要材料和工程设备</a></li>
             </ul>
         </div>
-        <div class="main-content col p-0" id="project-glj-main" style="overflow: hidden;">
+        <div class="main-content col p-0" id="material_adjust" style="overflow: hidden; display: none">
+            <div class="" id="material_adjust_sheet" style="overflow: hidden;width: 100%">
+            </div>
+        </div>
+        <div class="main-content col p-0" id="project-glj-main" style="overflow: hidden; ">
             <div class="top-content" id="projectGljTop" style="overflow: hidden">
                 <div class="main-data-top" style="width: 100%; overflow: hidden" id="project_glj_sheet">
                 </div>
@@ -163,3 +172,66 @@
         </div>
     </div>
 </div>
+<!--弹出 从人材机汇总中选择-->
+<div class="modal fade" id="selectFromGLJ" data-backdrop="static">
+    <div class="modal-dialog modal-lg" 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="padding: 0px">
+                <div class="btn-toolbar" style="margin: 10px">
+                    <div class="btn-group btn-group-sm mr-2">
+                        <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选</button>
+                        <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选主材</button>
+                        <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选设备</button>
+                    </div>
+                    <!--前面3个按钮 有选中状态,出现 取消 按钮-->
+                    <button type="button" class="btn btn-outline-danger btn-sm mr-2 glj_sel_check_btn">取消</button>
+                    <div class="input-group input-group-sm mr-2" style="width:200px">
+                        <input type="text" class="form-control form-control-sm"  placeholder="查找" id="glj_sel_input" value="">
+                        <div class="input-group-append">
+                            <button class="btn btn-outline-primary btn-sm" id="glj_sel_btn_find" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
+                        </div>
+                    </div>
+                    <div class="input-group input-group-sm">
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_all" value="0">
+                            <label class="form-check-label" for="glj_sel_all">所有</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_labour" value="1">
+                            <label class="form-check-label" for="glj_sel_labour">人</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_material" checked value="2">
+                            <label class="form-check-label" for="glj_sel_material">材</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_machine" value="3">
+                            <label class="form-check-label" for="glj_sel_machine">机</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_main" checked value="4">
+                            <label class="form-check-label" for="glj_sel_main">主材</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_eqp" checked value="5">
+                            <label class="form-check-label" for="glj_sel_eqp">设备</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-auto-height" style="margin-top:10px; border: 1px solid #ccc">
+                    <div  id="glj_from_sheet" style="overflow: hidden;height: 100%"></div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary" id="glj_sel_confirm" data-dismiss="modal">确定</button>
+            </div>
+        </div>
+    </div>
+</div>

+ 1 - 0
web/building_saas/js/global.js

@@ -34,6 +34,7 @@ function autoFlashHeight(){
     $('#comments').find('textarea').height($('#comments').height() - 25);
     typeof(adaptiveTzjnrWidth)== 'function' ?adaptiveTzjnrWidth():'';
     $('#project-glj-main').width($(window).width()-($('.main-nav').width()+ 2)-($('.filterType').width()+12)-5); //2、12是padding宽度,width 是不算padding宽度的
+    $('#material_adjust').width($(window).width()-($('.main-nav').width()+ 2)-($('.filterType').width()+12)-5);//材料调差
     //typeof zmhs_obj === 'object' ? zmhs_obj.loadSideResize() : '';
 };
 

+ 1 - 0
web/building_saas/main/html/main.html

@@ -2121,6 +2121,7 @@
     <script type="text/javascript" src='/web/building_saas/main/js/views/confirm_modal.js'></script>
     <script type="text/javascript" src='/web/building_saas/main/js/views/zlfb_view.js'></script>
     <script type="text/javascript" src='/web/building_saas/main/js/views/installation_fee_view.js'></script>
+    <script type="text/javascript" src='/web/building_saas/main/js/views/material_adjust_view.js'></script>
     <script type="text/javascript" src='/web/building_saas/main/js/views/project_glj_view.js'></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/importBills.js"></script>
     <!--报表-->

+ 2 - 1
web/building_saas/main/js/models/main_consts.js

@@ -384,7 +384,8 @@ const filterType = {
     JGCL:'8',
     ZGCL:'9',
     SCHZ:'10',
-    ZYCL:'11'
+    ZYCL:'11',
+    AMAE:'12'
 };
 const filterTypeArray = ['1','2','3','4','5'];
 

+ 387 - 0
web/building_saas/main/js/views/material_adjust_view.js

@@ -0,0 +1,387 @@
+/**
+ * Created by zhang on 2019/5/15.
+ */
+let materialAdjustObj = {
+    spread:null,
+    priceInfoSheet:null,
+    priceCoeSheet:null,
+    priceInfoDatas:[],
+    priceCoeDatas:[],
+    priceInfoSetting:{
+        header: [
+            {headerName: "编号", headerWidth: 80, dataCode: "code", dataType: "String"},
+            {headerName: "材料名称", headerWidth: 160, dataCode: "name", dataType: "String",cellType:'tipsCell'},
+            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String",cellType:'tipsCell'},
+            {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
+            {headerName: "数量", headerWidth: 90, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
+            {headerName: "风险系数", headerWidth: 90, dataCode: "riskCoe", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "基准单价", headerWidth: 70, dataCode: "standardPrice", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "投标单价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "合价", headerWidth: 70, dataCode: "totalPrice", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "产地", headerWidth: 80, dataCode: "originPlace", hAlign: "left", dataType: "String"},
+            {headerName: "厂家", headerWidth: 80, dataCode: "vender", hAlign: "left", dataType: "String"},
+            {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
+            {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
+        ],
+        view:{ lockColumns: ["code","name","specs","unit","quantity","totalPrice","originPlace","vender","supply","remark"]}
+    },
+    priceCoeSetting:{
+        header: [
+            {headerName: "编号", headerWidth: 80, dataCode: "code", dataType: "String"},
+            {headerName: "材料名称", headerWidth: 160, dataCode: "name", dataType: "String",cellType:'tipsCell'},
+            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String",cellType:'tipsCell'},
+            {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
+            {headerName: "变值权重B", headerWidth: 90, dataCode: "varWeight", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "基本价格指数FO", headerWidth: 70, dataCode: "FO", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "现行价格指数FI", headerWidth: 70, dataCode: "FI", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "数量", headerWidth: 90, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
+            {headerName: "单价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "合价", headerWidth: 70, dataCode: "totalPrice", hAlign: "right", dataType: "Number",validator:"number"},
+            {headerName: "产地", headerWidth: 80, dataCode: "originPlace", hAlign: "left", dataType: "String"},
+            {headerName: "厂家", headerWidth: 80, dataCode: "vender", hAlign: "left", dataType: "String"},
+            {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
+            {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
+        ],
+        view:{ lockColumns: ["code","name","specs","unit","quantity","totalPrice","originPlace","vender","supply","remark"]}
+    },
+    refreshSheetDatas:function () {
+        $("#adjustType").val() == "priceInfo" ? materialAdjustObj.showPriceInfoDatas():materialAdjustObj.showPriceCoeDatas();
+        //let sheetIndex = $("#adjustType").val()
+    },
+    initSpread:function () {
+        if(!this.spread){
+            this.spread = SheetDataHelper.createNewSpread($("#material_adjust_sheet")[0],2);
+            sheetCommonObj.spreadDefaultStyle(this.spread);
+        }
+        this.initPriceInfoSheet();
+        this.initPriceCoeSheet();
+        //disableRightMenu("project_glj_sheet",this.projectGljSpread,this.rightClickCallback);
+        //打开别人分享的项目,只读
+        if(projectReadOnly){
+            disableSpread(this.spread);
+        }else {
+            this.initRightClick();
+        }
+    },
+    initPriceInfoSheet:function () {
+        this.priceInfoSheet = this.spread.getSheet(0);
+        sheetCommonObj.initSheet(this.priceInfoSheet,this.priceInfoSetting,30);
+        this.priceInfoSheet.bind(GC.Spread.Sheets.Events.ValueChanged, this.onSheetValueChange);
+        this.priceInfoSheet.name('priceInfoSheet');
+        this.priceInfoSheet.setRowHeight(0, 45, 1);
+    },
+    initPriceCoeSheet:function () {
+        this.priceCoeSheet = this.spread.getSheet(1);
+        sheetCommonObj.initSheet(this.priceCoeSheet,this.priceCoeSetting,30);
+        this.priceCoeSheet.bind(GC.Spread.Sheets.Events.ValueChanged, this.onSheetValueChange);
+        this.priceCoeSheet.name('priceCoeSheet');
+        this.priceCoeSheet.setRowHeight(0, 45, 1);
+    },
+    onSheetValueChange:function (a,args) {
+        let me = materialAdjustObj,row = args.row, col = args.col;
+        let projectGLJ = projectObj.project.projectGLJ;
+        let setting = $("#adjustType").val() == "priceInfo"?me.priceInfoSetting:me.priceCoeSetting;
+        let datas = $("#adjustType").val() == "priceInfo"?me.priceInfoDatas:me.priceCoeDatas;
+        let dataCode = setting.header[col].dataCode;
+        let recode = datas[row];
+        let value = args.newValue;
+        if(value === undefined ){
+            me.refreshSheetDatas();
+            return;
+        }
+        if (value&&!projectGljObject.checkData(col,setting,value)) {
+            alert('输入的数据类型不对,请重新输入!');
+            me.refreshSheetDatas();
+            return ;
+        }
+        if(recode[dataCode] == value) return;
+
+        if(dataCode=='marketPrice'){//修改市场价和修改定额价时需要重新记算很多受影响的树节点,现在改成与定字额工料机那里调相同的方法。
+            let editField ="market_price";
+            projectGLJ.updatePrice(recode,editField,value,'pg',me.refreshSheetDatas);
+            return;
+        }
+        value = scMathUtil.roundForObj(value,getDecimal("process"));
+        let updateData = {id: recode.id, field: dataCode, value: value+""};
+        projectGLJ.pGljUpdate(updateData,me.refreshSheetDatas);
+
+    },
+    deleteAdjust:function (row) {
+        let me = this;
+        let projectGLJ = projectObj.project.projectGLJ;
+        let field =  $("#adjustType").val() == "priceInfo"?"is_info_adjust":"is_coe_adjust";
+        let datas = $("#adjustType").val() == "priceInfo"?me.priceInfoDatas:me.priceCoeDatas;
+        let recode = datas[row];
+        let updateData = {id: recode.id, field: field, value: 0};
+        projectGLJ.pGljUpdate(updateData,me.refreshSheetDatas);
+    },
+    showPriceInfoDatas:function () {
+        this.spread.setActiveSheetIndex(0);
+        this.priceInfoDatas = this.getPirceInfoDatas();
+        sheetCommonObj.showData(this.priceInfoSheet, this.priceInfoSetting,this.priceInfoDatas);
+        this.priceInfoSheet.setRowCount(this.priceInfoDatas.length);
+    },
+    showPriceCoeDatas:function () {
+        this.spread.setActiveSheetIndex(1);
+        this.priceCoeDatas = this.getPriceCoeDatas();
+        sheetCommonObj.showData(this.priceCoeSheet, this.priceCoeSetting,this.priceCoeDatas);
+        this.priceCoeSheet.setRowCount(this.priceCoeDatas.length);
+    },
+    getPirceInfoDatas:function(){
+        let datas = [];
+        let gljList = this.filterAdjustGlj();
+        gljList = sortProjectGLJ(gljList);
+        for(let glj of gljList){
+            datas.push(getInfoObject(glj));
+        }
+        return datas;
+        function getInfoObject(glj) {
+            let data = materialAdjustObj.getCommonObject(glj);
+            data.riskCoe = glj.riskCoe;
+            data.standardPrice = glj.standardPrice;
+            data.totalPrice = materialAdjustObj.getTotalPrice(data);
+            return data;
+        }
+    },
+    filterAdjustGlj:function () {
+        let gljList = projectObj.project.projectGLJ.datas.gljList;
+        let field =  $("#adjustType").val() == "priceInfo"?"is_info_adjust":"is_coe_adjust";
+        return _.filter(gljList,function (item) {
+            return item.quantity !== 0 && item.quantity !== '0' && item[field] ===1
+        });
+    },
+    getPriceCoeDatas:function () {
+        let datas = [];
+        let node =  projectObj.project.Bills.getEngineeringCostNode(projectObj.mainController);
+        let totalFee = node && node.data.feesIndex && node.data.feesIndex.common?node.data.feesIndex.common.totalFee:0;
+        let gljList = this.filterAdjustGlj();
+         gljList = sortProjectGLJ(gljList);
+        for(let glj of gljList){
+            datas.push(getCoeObject(glj,totalFee));
+        }
+        return datas;
+        function getCoeObject(glj,totalFee) {
+            let data = materialAdjustObj.getCommonObject(glj);
+            data.FO = glj.FO;
+            data.FI = glj.FI;
+            data.totalPrice = materialAdjustObj.getTotalPrice(data);
+            if(totalFee !==0) data.varWeight = scMathUtil.roundForObj(data.totalPrice/totalFee,2);
+            return data;
+        }
+    },
+    getTotalPrice:function (data) {
+        return scMathUtil.roundForObj(data.quantity * data.marketPrice,getDecimal("bills.totalPrice"))
+    },
+    initRightClick : function() {
+        let me = this;
+        $.contextMenu({
+            selector: '#material_adjust_sheet',
+            build: function ($trigger, e) {
+                me.rightClickTarget = SheetDataHelper.safeRightClickSelection($trigger, e, me.spread);
+                return me.rightClickTarget.hitTestType === GC.Spread.Sheets.SheetArea.viewport ||
+                    me.rightClickTarget.hitTestType === GC.Spread.Sheets.SheetArea.rowHeader;
+            },
+            items: {
+                "addFromGLJ":{
+                    name: '从人材机汇总中选择',
+                    icon: 'fa-sign-in',
+                    disabled: function () {
+                        return false;
+                    },
+                    callback: function (key, opt) {
+                        $("#selectFromGLJ").modal('show');
+                    }
+                },
+                "deleteAdjust": {
+                    name: "删除",
+                    icon: 'fa-trash-o',
+                    disabled: function () {
+                        return me.rightClickTarget.row === undefined;
+                    },
+                    callback: function (key, opt) {
+                        let row = me.rightClickTarget.row;
+                        me.deleteAdjust(row);
+                    }
+                }
+            }
+        });
+    },
+    getCommonObject:function (glj) {
+        let data ={
+            select:0,
+            id:glj.id,
+            code:glj.code,
+            name:glj.name,
+            specs:glj.specs,
+            unit:glj.unit,
+            type:glj.type,
+            quantity:glj.quantity,
+            supply:glj.supply,
+            originPlace:glj.originPlace,
+            vender:glj.vender,
+            brand:glj.brand,
+            remark:glj.remark
+        };
+        gljOprObj.setGLJPrice(data,glj);
+        return data;
+    }
+};
+
+let gljFromObj={
+    spread:null,
+    sheet:null,
+    datas:[],
+    setting:{
+        header: [
+            {headerName: "选择", headerWidth: 45, dataCode: "select", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "编码", headerWidth: 80, dataCode: "code", dataType: "String"},
+            {headerName: "类型", headerWidth: 30, dataCode: "short_name", hAlign: "center", dataType: "String"},
+            {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String",cellType:'tipsCell'},
+            {headerName: "规格型号", headerWidth: 100, dataCode: "specs", hAlign: "left", dataType: "String",cellType:'tipsCell'},
+            {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
+            {headerName: "总消耗量", headerWidth: 90, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
+            {headerName: "市场价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
+            {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
+            {headerName: "暂估", headerWidth: 45, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "产地", headerWidth: 80, dataCode: "originPlace", hAlign: "left", dataType: "String"},
+            {headerName: "厂家", headerWidth: 80, dataCode: "vender", hAlign: "left", dataType: "String"},
+            {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
+        ],
+        view: {
+            lockColumns: ["is_evaluate"]
+        }
+    },
+    initSpread:function () {
+        if(!this.spread){
+            this.spread = SheetDataHelper.createNewSpread($("#glj_from_sheet")[0]);
+            sheetCommonObj.spreadDefaultStyle(this.spread);
+        }
+        this.sheet = this.spread.getSheet(0);
+        sheetCommonObj.initSheet(this.sheet,this.setting);
+        this.sheet.bind(GC.Spread.Sheets.Events.EditStarting,this.onEditStarting);
+        this.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, this.onClipboardPasting);
+        this.sheet.bind(GC.Spread.Sheets.Events.ValueChanged, this.onValueChanged);
+        this.sheet.setRowHeight(0, 45, 1);
+        disableRightMenu("glj_from_sheet",this.spread);
+    },
+    onEditStarting:function (e,args) {
+         args.cancel = true;
+    },
+    onClipboardPasting:function (e,args) {
+        args.cancel = true;
+    },
+    onValueChanged:function (e,args) {
+        let me = gljFromObj;
+        let value = args.newValue;
+        value = value == true?1:0;
+        me.datas[args.row].select = value;
+    },
+    showDatas:function () {
+        this.datas = [];
+        let gljList = projectObj.project.projectGLJ.datas.gljList;
+        gljList = this.filterGLJ(gljList);
+        gljList = sortProjectGLJ(gljList);
+        for(let glj of gljList){
+            this.datas.push(this.getSheetDatas(glj));
+        }
+        this.refreshDatas();
+    },
+    filterGLJ:function (gljList) {
+        let field =  $("#adjustType").val() == "priceInfo"?"is_info_adjust":"is_coe_adjust";
+        let typeMap = {};
+        for(let ch of $(".glj_sel_input:checked")){
+            typeMap[$(ch).val()] = true;
+        }
+        let inputV = $("#glj_sel_input").val();
+        return _.filter(gljList,function (item) {
+            if(item.quantity === 0 || item.quantity === '0' || item[field] ===1) return false;
+            if(!typeMap[0]){//如果没有勾选所有,下面再细分
+                let firstS = (item.type+"").substring(0,1);
+                if(!typeMap[firstS]) return false
+            }
+            if(inputV!=""){//输入的关键字过滤
+                if(item.code.indexOf(inputV)==-1 && item.name.indexOf(inputV)==-1) return false
+            }
+            return true;
+        });
+    },
+    refreshDatas:function () {
+        sheetCommonObj.showData(this.sheet, this.setting,this.datas);
+        this.sheet.setRowCount(this.datas.length);
+    },
+    getSheetDatas(glj){
+        let projectGLJ = projectObj.project.projectGLJ;
+        let materialIdList = projectGLJ.datas.constData.materialIdList;
+        let data = materialAdjustObj.getCommonObject(glj);
+        data.select = 0;
+        data.short_name = projectGLJ.getShortNameByID(glj.type);
+        // 只有材料才显示是否暂估
+        if (materialIdList.indexOf(glj.type) >= 0) data.is_evaluate = glj.is_evaluate;
+        return data;
+    },
+    checkByType:function (type) {
+        for(let d of this.datas){
+            d.select = 0;
+            switch (type){
+                case "全选":
+                    d.select = 1;
+                    break;
+                case "全选主材":
+                    if(d.type == 4) d.select = 1;
+                    break;
+                case "全选设备":
+                    if(d.type == 5) d.select = 1;
+                    break;
+                case "取消":
+                    d.select = 0;
+                    break;
+            }
+        }
+        this.refreshDatas();
+    },
+    confirmSelect:function () {
+        let updateMap = {};
+        let adjustType =  $("#adjustType").val()
+        for(let d of this.datas){
+            if(d.select == 1){
+                let tem;
+                if(adjustType== "priceInfo"){
+                    tem = {is_info_adjust:1,riskCoe:"",standardPrice:d.marketPrice+""};
+                }else {
+                    tem = {is_coe_adjust:1,FI:"",FO:""};
+                }
+                updateMap[d.id] = tem;
+            }
+        }
+        if( _.isEmpty(updateMap)) return;
+        projectObj.project.projectGLJ.batchUpdateGLJProperty(updateMap,function () {
+            materialAdjustObj.refreshSheetDatas();
+        });
+    }
+};
+
+
+$(function () {
+    $("#adjustType").change(function () {
+        materialAdjustObj.refreshSheetDatas();
+    });
+    $('#selectFromGLJ').on('shown.bs.modal',function(e){
+        gljFromObj.initSpread();
+        gljFromObj.showDatas();
+    });
+    $(".glj_sel_input").change(function () {
+        gljFromObj.showDatas();
+    });
+
+    $("#glj_sel_btn_find").click(function () {
+        gljFromObj.showDatas();
+    });
+
+    $(".glj_sel_check_btn").click(function () {
+        gljFromObj.checkByType($(this).text())
+    })
+    
+    $("#glj_sel_confirm").click(function () {
+        gljFromObj.confirmSelect();
+    })
+});

+ 42 - 15
web/building_saas/main/js/views/project_glj_view.js

@@ -50,6 +50,10 @@ projectGljObject={
         {ID:'MAIN_MATERIAL',text:'主材'},
         {ID:'EQUIPMENT',text:'设备'}
     ],
+    initSpreads:function(){
+        if(this.projectGljSpread==null) this.initProjectGljSpread();
+        if(materialAdjustObj.spread == null) materialAdjustObj.initSpread();
+    },
     initProjectGljSpread:function () {
         if(!this.projectGljSpread){
             this.projectGljSpread = SheetDataHelper.createNewSpread($("#project_glj_sheet")[0],2);
@@ -513,6 +517,23 @@ projectGljObject={
         this.materialTreeSheet.setSelection(sel.row==-1?0:sel.row,sel.col,sel.rowCount,sel.colCount);
         this.materialTreeController.setTreeSelected(this.materialTree.items[sel.row==-1?0:sel.row]);
     },
+    initSheetViews:function(){
+        let me = projectGljObject;
+        if(me.displayType == filterType.AMAE){
+            $('#material_adjust').show();
+            $('#adjustType').show();
+            $('#project-glj-main').hide();
+        } else {
+            $('#material_adjust').hide();
+            $('#adjustType').hide();
+            $('#project-glj-main').show();
+        }
+    },
+    refreshViewsData:function(){
+        let me = projectGljObject;
+        if(me.displayType == filterType.AMAE) return materialAdjustObj.refreshSheetDatas();
+        me.refreshDataSheet();
+    },
     refreshDataSheet:function () {
         let me = projectGljObject;
         let quantityCol = _.findIndex(me.projectGljSetting.header,function (header) {
@@ -904,11 +925,7 @@ projectGljObject={
                 value=  scMathUtil.roundForObj(value,getDecimal('glj.quantity'));
             }
             if(dataCode === 'is_evaluate'||dataCode === 'is_adjust_price'||dataCode === 'is_main_material'||dataCode === 'no_tax_eqp'||dataCode == 'is_eval_material'){
-                if(value == true){
-                    value = 1;
-                }else if(value == false){
-                    value = 0;
-                }
+                value = value == true?1:0;
             }
             if(dataCode === 'materialType' && (value == null || value=="")){//删除三材类别时,清空三材系数
                 value = null;
@@ -1028,7 +1045,7 @@ projectGljObject={
     },
     changeFileCallback:function(){
         projectGljObject.unitPriceFileInit();
-        projectGljObject.refreshDataSheet();
+        projectGljObject.refreshViewsData();
         gljOprObj.refreshView();
         projectObj.project.calcProgram.calcAllNodesAndSave(calcAllType.catAll,function () {
             if(socketObject.roomInfo){
@@ -1099,12 +1116,19 @@ function getProjectResizeEles() {
 
 
 function loadProjectGljSize() {
-    let me = projectGljObject;
-    let pojGljResizeEles = getProjectResizeEles();
-    SlideResize.loadVerticalHeight(pojGljResizeEles.eleObj.module, pojGljResizeEles.eleObj, pojGljResizeEles.limit, function () {
-        me.projectGljSpread?me.projectGljSpread.refresh():'';
-        me.mixRatioSpread?me.mixRatioSpread.refresh():'';
-    });
+
+    if($('#project-glj-main').is(':visible')){
+        let me = projectGljObject;
+        let pojGljResizeEles = getProjectResizeEles();
+        SlideResize.loadVerticalHeight(pojGljResizeEles.eleObj.module, pojGljResizeEles.eleObj, pojGljResizeEles.limit, function () {
+            me.projectGljSpread?me.projectGljSpread.refresh():'';
+            me.mixRatioSpread?me.mixRatioSpread.refresh():'';
+        });
+    }else if($('#material_adjust').is(':visible')){
+        $('#material_adjust_sheet').height($(window).height()-$('.header').height()-$('#projectGljToolsBar').height()+3);
+        if(materialAdjustObj.spread)materialAdjustObj.spread.refresh();
+    }
+
 }
 //从其他建设项目中复制中,建设项目的文件层次结构名称和顺序
 function getFileHierarchyInfo(treeData){
@@ -1142,12 +1166,13 @@ $(function () {
         let me = projectGljObject;
         $(e.relatedTarget.hash).removeClass('active');
         if(me.projectGljSpread==null){
-            me.initProjectGljSpread();
+            me.initSpreads();
         }
         me.unitPriceFileInit();
         me.initMixRatio();
+        me.initSheetViews();
         //projectObj.project.projectGLJ.calcQuantity(); 在工程量有更新的地方调用
-        me.refreshDataSheet();
+        me.refreshViewsData();
         loadProjectGljSize();
     });
     /*  $('#ration_link').on('shown.bs.tab', function (e) {
@@ -1358,7 +1383,9 @@ $(function () {
         $(this).addClass('active');
         let me = projectGljObject;
         me.displayType = filterType[this.id];
-        me.refreshDataSheet();
+        me.initSheetViews();
+        me.refreshViewsData();
+        loadProjectGljSize();
     });
 });