Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/all_models/stdRation_coe.js

@@ -12,6 +12,8 @@ const coeSchema = new Schema({
     amount: String,                 // 调整的量
     gljCode: String,
     gljName: String,
+    replaceCode:String,
+    replaceName:String,
     _id: false
 });
 

web/maintain/ration_repository/js/coe.js

@@ -500,10 +500,12 @@ let gljAdjOprObj = {
             {headerName:"名称", headerWidth:100, dataCode:"gljName", dataType: "String", hAlign: "center", vAlign: "center", readOnly: true},
             {headerName:"操作符", headerWidth:60, dataCode:"operator", dataType: "String", hAlign: "center", vAlign: "center", readOnly: false},
             {headerName:"数量", headerWidth:80, dataCode:"amount", dataType: "String", hAlign: "center", vAlign: "center" , readOnly: false},
+            {headerName:"替换为编码", headerWidth:80, dataCode:"replaceCode", dataType: "String", formatter: '@', hAlign: "center", vAlign: "center", readOnly: false},
+            {headerName:"替换为名称", headerWidth:100, dataCode:"replaceName", dataType: "String", hAlign: "center", vAlign: "center", readOnly: true}
         ],
         comboItems: {
             //调整类型下拉菜单
-            coeType: ['定额', '人工', '材料', '机械', '主材', '设备', '单个工料机'],
+            coeType: ['定额', '人工', '材料', '机械', '主材', '设备', '单个工料机','替换人材机'],
             //操作符下拉菜单
             operator: ['+', '-', '*', '/', '=']
         }
@@ -550,8 +552,16 @@ let gljAdjOprObj = {
     },
     onEditStart: function (sender, args) {
         let me = gljAdjOprObj;
-        if(!coeOprObj.currentCoe || args.row >= me.currentGljAdjList.length && args.col === 1
-            || args.row < me.currentGljAdjList.length && args.col === 1 && me.currentGljAdjList[args.row].coeType !== '单个工料机'){
+        let dataCode = me.setting.header[args.col].dataCode;
+        if(!coeOprObj.currentCoe || args.row >= me.currentGljAdjList.length  ){//超出编辑范围
+            if(dataCode=== 'gljCode' || dataCode=== 'replaceCode') args.cancel = true;
+            return;
+        }
+        if(dataCode=== 'gljCode' && me.currentGljAdjList[args.row].coeType !== '单个工料机'&& me.currentGljAdjList[args.row].coeType !== '替换人材机'){ //单个人才机和替换人材机,编码才能编辑
+            args.cancel = true;
+            return;
+        }
+        if(dataCode=== 'replaceCode' && me.currentGljAdjList[args.row].coeType !== '替换人材机'){//替换人材机类型 替换编码才能编辑
             args.cancel = true;
         }
     },
@@ -568,14 +578,22 @@ let gljAdjOprObj = {
                 //update
                 if(args.row < me.currentGljAdjList.length && args.editingText.toString().trim() !== me.currentGljAdjList[args.row][dataCode]){
                     let updateObj = me.currentGljAdjList[args.row];
-                    if(dataCode === 'gljCode' && typeof updateObj.coeType !== 'undefined' && updateObj.coeType === '单个工料机'){
+                    if(dataCode === 'gljCode' && typeof updateObj.coeType !== 'undefined' && (updateObj.coeType === '单个工料机'||updateObj.coeType === '替换人材机')){
                         let gljName = me.getGljName(args.editingText, me.gljList);
                         if(gljName){
                             updateObj.gljCode = args.editingText;
                             updateObj.gljName = gljName;
                             isUpdate = true;
+                        } else {
+                            alert("不存在编号为"+ args.editingText +"的工料机");
                         }
-                        else {
+                    }else if(dataCode === 'replaceCode' && typeof updateObj.coeType !== 'undefined' && updateObj.coeType === '替换人材机'){
+                        let gljName = me.getGljName(args.editingText, me.gljList);
+                        if(gljName){
+                            updateObj.replaceCode = args.editingText;
+                            updateObj.replaceName = gljName;
+                            isUpdate = true;
+                        } else {
                             alert("不存在编号为"+ args.editingText +"的工料机");
                         }
                     }
@@ -584,6 +602,8 @@ let gljAdjOprObj = {
                         updateObj[dataCode] = args.editingText;
                         updateObj.gljCode = '';
                         updateObj.gljName = '';
+                        updateObj.replaceCode = '';
+                        updateObj.replaceName = '';
                     }
                     else if(dataCode !== 'gljCode') {
                         isUpdate = true;