소스 검색

coe debug

zhongzewei 7 년 전
부모
커밋
6335758628
2개의 변경된 파일10개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 3
      web/maintain/ration_repository/dinge.html
  2. 8 1
      web/maintain/ration_repository/js/coe.js

+ 2 - 3
web/maintain/ration_repository/dinge.html

@@ -532,9 +532,8 @@
 
                 rationCoeOprObj.buildSheet(rdSpread.getSheet(2));
               //  sheetCommonObj.shieldAllCells(rdSpread.getSheet(2), rationCoeOprObj.setting);
-                rationInstObj.getInstallation(parseInt(getQueryString("repository")), function () {
-                    rationInstObj.buildSheet(rdSpread.getSheet(3));
-                });
+                rationInstObj.buildSheet(rdSpread.getSheet(3));
+                rationInstObj.getInstallation(parseInt(getQueryString("repository")));
 
                 $("#linkGLJ").click(function(){
                     rationGLJOprObj.bindRationGljDelOpr();

+ 8 - 1
web/maintain/ration_repository/js/coe.js

@@ -383,7 +383,7 @@ let gljAdjOprObj = {
         ],
         comboItems: {
             //调整类型下拉菜单
-            coeType: ['定额子目', '人工', '材料', '机械', '主材', '设备', '单个工料机'],
+            coeType: ['定额', '人工', '材料', '机械', '主材', '设备', '单个工料机'],
             //操作符下拉菜单
             operator: ['+', '-', '*', '/', '=']
         }
@@ -458,6 +458,12 @@ let gljAdjOprObj = {
                             alert("不存在编号为"+ args.editingText +"的工料机");
                         }
                     }
+                    else if(dataCode === 'coeType'){
+                        isUpdate = true;
+                        updateObj[dataCode] = args.editingText;
+                        updateObj.gljCode = '';
+                        updateObj.gljName = '';
+                    }
                     else if(dataCode !== 'gljCode') {
                         isUpdate = true;
                         updateObj[dataCode] = args.editingText;
@@ -472,6 +478,7 @@ let gljAdjOprObj = {
                 }
                 if(isUpdate){
                     coeOprObj.save([], [coeOprObj.currentCoe], [], false, function () {
+                        console.log(me.currentGljAdjList);
                         me.show(me.currentGljAdjList);
                     });
                 }