bug fixed、其他项目部分清单需要特殊的右键、工料机汇总：编辑“备注”。

modules/all_models/bills.js

@@ -63,7 +63,10 @@ let billsSchema = new Schema({
     installationKey:String,//用来记录安装增加费的关联字段
     deleteInfo: deleteSchema,
     isEstimate:{type: Number,default:0},       // 1 true 0 false 是否暂估
-    remark:String
+    remark:String,
+    engineeringContent:String,//工程内容
+    serviceContent:String,//服务内容
+    claimVisa:String//签证及索赔依据
 });
 
 mongoose.model("bills", billsSchema);

modules/all_models/project_glj.js

@@ -100,7 +100,8 @@ let modelSchema = {
         type: Number,
         default: 0
     },
-    ratio_data: Schema.Types.Mixed
+    ratio_data: Schema.Types.Mixed,
+    remark:String
 };
 mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false}));
 

modules/glj/controllers/glj_controller.js

@@ -83,7 +83,7 @@ class GLJController extends BaseController {
         try {
             // 可编辑的字段
             let editableField = ['is_evaluate', 'unit_price.market_price', 'is_adjust_price', 'mix_ratio.consumption',
-                'supply', 'supply_quantity','delivery_address','delivery','materialType','materialCoe','is_main_material'];
+                'supply', 'supply_quantity','delivery_address','delivery','materialType','materialCoe','is_main_material','remark'];
             if (editableField.indexOf(field) < 0) {
                 throw '对应字段不能编辑';
             }

web/building_saas/main/js/models/bills.js

@@ -506,6 +506,15 @@ var Bills = {
                 return false;
             }
         };
+        bills.prototype.isEngineerEst = function (node) {//判断是否是“专业工程暂估价”节点
+            return node && isFlag(node.data)&&node.data.flagsIndex.fixed.flag==fixedFlag.ENGINEERING_ESITIMATE;
+        };
+        bills.prototype.isTotalService = function (node) {//判断是否是“总承包服务费”节点
+            return node && isFlag(node.data)&&node.data.flagsIndex.fixed.flag==fixedFlag.TURN_KEY_CONTRACT;
+        };
+        bills.prototype.isClaimVisa = function (node) {//判断是否是“签证及索赔计价”节点
+            return node && isFlag(node.data)&&node.data.flagsIndex.fixed.flag==fixedFlag.CLAIM_VISA;
+        };
         bills.prototype.isMeasure = function (node) {//判读是否属于措施项目部分
             let rootNode = this.getRootNode(node);
             if(isFlag(rootNode.data)&&rootNode.data.flagsIndex.fixed.flag==fixedFlag.MEASURE){

web/building_saas/main/js/models/quantity_detail.js

@@ -139,24 +139,29 @@ var quantity_detail = {
                 doc.refreshQuantity=true;
                 if(!selected.data.hasOwnProperty('isFromDetail')||selected.data.isFromDetail==0){
                     if(!args.replace){//为了批量粘贴时不重复提示，普通编辑时不受影响
-                        var c = confirm("确定要使用工程量明细替换原工程量吗？");
-                        if(c){
+                        hintBox.infoBox('操作确认', '确定要使用工程量明细替换原工程量吗？', 2, function () {
                             args.replace = true;
-                        }else {
+                            me.doSaveAction(doc,args,batchCallback);
+                        }, function () {
                             doc.refreshQuantity=false;
-                        }
+                            me.doSaveAction(doc,args,batchCallback);
+                        },['确定','取消']);
+                        return;
                     }
                 }
-
             }
-            var url="";
+            me.doSaveAction(doc,args,batchCallback);
+        };
+
+        quantity_detail.prototype.doSaveAction = function(doc,args,batchCallback){
+            let url="",me = this;
             $.bootstrapLoading.start();
             if(args.hasOwnProperty("insertRecode")){//右键插入或者是通过直接编辑保存
                 url = "/quantity_detail/insertRecode";
             }else{
                 url = "/quantity_detail/save";
             }
-            var callback = function (data) {
+            CommonAjax.post(url,doc,function (data) {
                 $.bootstrapLoading.end();
                 if(doc.refreshQuantity==false){//清空数据
                     me.cleanQuantityDetail();
@@ -165,16 +170,18 @@ var quantity_detail = {
                     if(batchCallback){
                         batchCallback(args)
                     }else if(data.node){
-                      me.refreshRationOrBillNodes(data.node);
+                        me.refreshRationOrBillNodes(data.node);
                     }
                     //gljOprObj.detailSheet.setActiveCell(0,0);
                     //gljOprObj.detailSheet.clearSelection();
                 }
-            }
-            CommonAjax.post(url,doc,callback,function () {
+            },function () {
                 $.bootstrapLoading.end();
             });
         };
+
+
+
         quantity_detail.prototype.refreshRationOrBillNodes=function(node){//工程量明细更新后触发定额或清单工程量改变，进行相应的更新
             var nodes = gljOprObj.refreshTreeNode(node);
             if(nodes.length>0){//触发计算
@@ -275,7 +282,7 @@ var quantity_detail = {
             return str.replace(regExp, RepText);
         };
         quantity_detail.prototype.updateQuantityDetail=function (args,dataCode,recode,selected,batchCallback) {
-            var doc ={};
+            var doc ={},me = this;
             var query={
                 ID:recode.ID,
                 projectID:recode.projectID
@@ -291,19 +298,21 @@ var quantity_detail = {
                 query.refreshQuantity=true;
                 if(!selected.data.hasOwnProperty('isFromDetail')||selected.data.isFromDetail==0){
                     if(!args.replace){//为了批量粘贴时不重复提示，普通编辑时不受影响
-                        var c = confirm("确定要使用工程量明细替换原工程量吗？");
-                        if(c){
+                        hintBox.infoBox('操作确认', '确定要使用工程量明细替换原工程量吗？', 2, function () {
                             args.replace = true;
-                        }else {
-                            this.cleanQuantityDetail(selected,true);
-                            return;
-                        }
+                            query.index = args.row;
+                            me.updateQuantityRegex(query,doc,args,batchCallback)
+                        }, function () {
+                            me.cleanQuantityDetail(selected,true);
+                        },['确定','取消']);
+                        return;
                     }
                 }
                 query.index = args.row;
-                this.updateQuantityRegex(query,doc,args,batchCallback)
+                me.updateQuantityRegex(query,doc,args,batchCallback);
+
             }else {
-                this.normalUpdate(query,doc,args,batchCallback);
+                me.normalUpdate(query,doc,args,batchCallback);
             }
         };
         quantity_detail.prototype.updateQuantityRegex=function(query,doc,args,batchCallback){
@@ -444,7 +453,7 @@ var quantity_detail = {
                 }
             }
             return invalidate;
-        }
+        };
 
         quantity_detail.prototype.replaceSqr = function(text) {
             var squarRegex = /\([^\^]+\)\^\d+/g;
@@ -511,7 +520,7 @@ var quantity_detail = {
         };
         quantity_detail.prototype.cleanQuantityDetail = function (node,needSave) {
            node =node?node:projectObj.project.mainTree.selected;
-           var query={projectID:node.data.projectID};
+           let query={projectID:node.data.projectID};
             if(node.sourceType === project.Bills.getSourceType()){
                 query.billID = node.data.ID;
                 this.deleteByBills([{type:'delete',data:node.data}]);
@@ -574,7 +583,7 @@ var quantity_detail = {
             if(node.sourceType === project.Ration.getSourceType()&&data.unit){
                 let times = parseInt(data.unit);
                 if (isNaN(times)) {
-                    times = 1
+                    times = 1;
                 }
                 value = value * times;
             }
@@ -587,22 +596,30 @@ var quantity_detail = {
                 projectObj.mainController.refreshTreeNode([node]);
             }else {
                 value=value?value:0;
-                setTimeout(function () {//spreadjs事件和提示窗口会有冲突，所以要用延时的方法
-                    if(project.quantity_detail.quantityEditChecking(value,node,fieldName)){
+                if(node.data.hasOwnProperty('isFromDetail')&&node.data.isFromDetail==1){
+                    hintBox.infoBox('操作确认', '已有工程量明细，是否清空明细表，采用手工输入的表达式？', 2, function () {
                         node.data.isFromDetail=0;
-                        project.quantity_detail.cleanQuantityDetail(node,true);
-                        if(node.sourceType === project.Bills.getSourceType()){
-                            me.updateBillQuantity(value,node,null,editingText);
-                        }else {
-                            me.updateRationQuantity(value,node,null,editingText);
-                        }
-                        gljOprObj.refreshView();
-                    }else {
+                        me.updateMainTreeNodeQuantity(value,node,editingText);
+                    }, function () {
                         projectObj.mainController.refreshTreeNode([node]);
-                    }
-                },100);
+                    },['确定','取消']);
+                    return;
+                }
+                me.updateMainTreeNodeQuantity(value,node,editingText);
             }
         };
+        quantity_detail.prototype.updateMainTreeNodeQuantity = function(value,node,editingText){
+            let me = this;
+            project.quantity_detail.cleanQuantityDetail(node,true);
+            if(node.sourceType === project.Bills.getSourceType()){
+                me.updateBillQuantity(value,node,null,editingText);
+            }else {
+                me.updateRationQuantity(value,node,null,editingText);
+            }
+            gljOprObj.refreshView();
+        };
+
+
         quantity_detail.prototype.updateBillQuantity=function (value,node,quantityEXP,editingText) {
             node.data.quantityEXP = quantityEXP?quantityEXP:editingText;
             value = scMathUtil.roundForObj(value,getDecimal("quantity",node));
@@ -706,7 +723,7 @@ var quantity_detail = {
             }else {
                 decimal = decimalObj.ration.quantity
             }
-            return;
+            return decimal;
         };
         return new quantity_detail(project);
     }

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

@@ -653,39 +653,50 @@ var Ration = {
             this.project.endUpdate();
         };
         ration.prototype.updateContain=function (value,node) {
+            let me = this;
             if(isNaN(value)){
                 alert("当前输入的数据类型不正确，请重新输入");
                 projectObj.mainController.refreshTreeNode([node]);
                 return;
             }
-            let billNode = node.parent;
-            let contain = scMathUtil.roundForObj(value,getDecimal("process"));
+
             if(node.data.quantityEXP=="GCLMXHJ"){//如果定额工程量是来自工程量明细
-                var c = confirm('已有工程量明细，是否清空明细表，采用手工输入的表达式？');
-                if(c){
+                hintBox.infoBox('操作确认', '已有工程量明细，是否清空明细表，采用手工输入的表达式？', 2, function () {
                     node.data.isFromDetail=0;
                     project.quantity_detail.cleanQuantityDetail(node,true);
-                }else {
+                    me.doContainUpdate(value,node);
+                }, function () {
                     projectObj.mainController.refreshTreeNode([node]);
-                    return;
-                }
+                },['确定','取消']);
+            }else {
+                me.doContainUpdate(value,node);
             }
+
+        };
+        ration.prototype.doContainUpdate = function (value,node) {
+
+            let billNode = node.parent;
+            let contain = scMathUtil.roundForObj(value,getDecimal("process"));
             let billQuantity = billNode.data.quantity||billNode.data.quantity!=""?billNode.data.quantity:0;
             billQuantity = parseFloat(billQuantity);
             node.data.contain = contain;
             node.data.quantityEXP="QDL*"+contain;
             node.data.quantity=scMathUtil.roundForObj(billQuantity*contain,getDecimal("quantity",node));
-            let times = parseInt(node.data.unit)
+            let times = parseInt(node.data.unit);
             if (!isNaN(times)) {
                 node.data.quantityEXP+='*'+times;
             }
-          //  node.data.quantity = projectObj.project.quantity_detail.autoTransformQuantity(node.data.quantity,node);//按单位做转换
+            //  node.data.quantity = projectObj.project.quantity_detail.autoTransformQuantity(node.data.quantity,node);//按单位做转换
             node.changed = true;
             project.calcProgram.calcAndSave(node, function () {
                 project.projectGLJ.calcQuantity();
             });
             projectObj.mainController.refreshTreeNode(node.children);//刷新子工料机树节点总消耗量
+
+
+
         };
+
         ration.prototype.addRationChecking=function(selected){
             if (selected) {// Vincent, 2018-01-02
                 if(selected.sourceType === project.Ration.getSourceType()){ // 焦点行是定额/量价/工料机，有效显示。

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

@@ -355,14 +355,12 @@ var gljOprObj = {
             args.editingText = args.editingText.replace(/（/g, "(");//替换中文左右括号;
             args.editingText = args.editingText.replace(/）/g, ")");
         }
-        setTimeout(function () {//这里须用延时执行的办法，不然的弹窗确认窗口会和spreadjs 的事件有冲突，造成定额工料机数据不会根据树结点更新的问题
-            if (args.row == detailList.length) {
-                projectObj.project.quantity_detail.saveQuantityDetail(args, me.detailSetting.header[args.col].dataCode, selected,callback);
-            }
-            if (args.row < detailList.length) {
-                projectObj.project.quantity_detail.updateQuantityDetail(args, me.detailSetting.header[args.col].dataCode, detailList[args.row], selected,callback);
-            }
-        }, 200);
+        if (args.row == detailList.length) {
+            projectObj.project.quantity_detail.saveQuantityDetail(args, me.detailSetting.header[args.col].dataCode, selected,callback);
+        }
+        if (args.row < detailList.length) {
+            projectObj.project.quantity_detail.updateQuantityDetail(args, me.detailSetting.header[args.col].dataCode, detailList[args.row], selected,callback);
+        }
 
     },
     onEditGLJSheet: function (args) {
@@ -1207,7 +1205,9 @@ var gljOprObj = {
         return rationNodes;
     },
     refreshView: function () {
-        this.showRationGLJData();
+        let node = projectObj.project.mainTree.selected;
+        this.showDataIfRationSelect(node,"111111");
+        //this.showRationGLJData();
     },
     //
     refreshTreeNode: function (obj) {

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

@@ -26,7 +26,8 @@ projectGljObject={
             {headerName: "三材系数", headerWidth: 100, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'material'
             {headerName: "交货方式", headerWidth: 90, dataCode: "delivery", hAlign: "left", dataType: "String"},
             {headerName: "送达地点", headerWidth: 100, dataCode: "delivery_address", hAlign: "left", dataType: "String"},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox"}
+            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox"},
+            {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
         ],
         view: {
             lockColumns: [0,1,2,3,4,5,7]
@@ -528,7 +529,8 @@ projectGljObject={
             is_add:glj.unit_price.is_add,
             bgColour:'white',
             techQuantity:glj.techQuantity,
-            subdivisionQuantity:glj.subdivisionQuantity
+            subdivisionQuantity:glj.subdivisionQuantity,
+            remark:glj.remark
         };
         gljOprObj.setGLJPrice(data,glj);
         data.is_main_material = glj.is_main_material == 1?1:0;

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

@@ -942,6 +942,37 @@ var projectObj = {
                     callback: function () {
                         BlockController.pasteBlock(project.mainTree.selected);
                     }
+                },
+                "editEngineer": {
+                    name: '编辑工程内容',
+                    icon: 'fa-edit',
+                    visible: function(key, opt){
+                         return project.Bills.isEngineerEst(project.mainTree.selected);//当焦点行是“专业工程暂估价”时，右键可见并有效。
+                    },
+                    callback: function () {
+                        projectObj.editContent(project.mainTree.selected,'engineeringContent');
+                        //BlockController.pasteBlock(project.mainTree.selected);
+                    }
+                },
+                "editService": {
+                    name: '编辑服务内容',
+                    icon: 'fa-edit',
+                    visible: function(key, opt){
+                        return project.Bills.isTotalService(project.mainTree.selected);//当焦点行是“总承包服务费”时，右键可见并有效。
+                    },
+                    callback: function () {
+                        projectObj.editContent(project.mainTree.selected,'serviceContent');
+                    }
+                },
+                "editAccording": {
+                    name: '编辑签证及索赔依据',
+                    icon: 'fa-edit',
+                    visible: function(key, opt){
+                        return project.Bills.isClaimVisa(project.mainTree.selected);//当焦点行是“签证及索赔计价”时，右键可见并有效。
+                    },
+                    callback: function () {
+                        projectObj.editContent(project.mainTree.selected,'claimVisa');
+                    }
                 }
             }
         });
@@ -1332,6 +1363,25 @@ var projectObj = {
             $("a[name='lockBills']").prop("title","锁定清单");
             $("a[name='lockBills']").html('<i class="fa fa-lock" aria-hidden="true"></i> 锁定清单');
         }
+    },
+    editContent:function (node,fieldID) {//右键编辑工程内容、服务内容、签证及索赔依据
+        let infoText = "请输入";
+        switch (fieldID){
+            case "engineeringContent":
+                infoText +='工程内容:';
+                break;
+            case "serviceContent":
+                infoText +='服务内容:';
+                break;
+            case "claimVisa":
+                infoText +='签证及索赔依据:';
+                break;
+        }
+
+        hintBox.valueBox(infoText, node.data[fieldID], function () {
+            let newValue = hintBox.value;
+            projectObj.updateNodeField(node,newValue,fieldID);
+        });
     }
 
 };
@@ -1726,7 +1776,7 @@ function testShow() {
     }
 }
 
-$('#delete_row').on('shown.bs.modal', function (e) {
+$('#delete_row').on('show.bs.modal', function (e) {//这里用show,在shown之前调用，页面不会出现按钮闪现的情况
     var controller = projectObj.mainController, project = projectObj.project;
     var selected = controller.tree.selected, parent = selected.parent;
     var showinfo = "<label>确认要删除当前选中行吗？</label>";