Переглянути джерело

工料机库中,类型“外购砼构件”、“绿化苗木”都属于材料大类,应允许输入毛重、采保、场外运输、每增一次的系数

zhongzewei 6 роки тому
батько
коміт
ca4be973b7
1 змінених файлів з 10 додано та 6 видалено
  1. 10 6
      web/building_saas/complementary_glj_lib/js/glj.js

+ 10 - 6
web/building_saas/complementary_glj_lib/js/glj.js

@@ -158,6 +158,10 @@ let repositoryGljObj = {
             }
         });
     },
+    //获取工料机类型大类
+    getParentType: function (type) {
+        return parseInt(type.toString()[0]);
+    },
     getGljTree: function(gljLibId, callback) {
         let me = this;
         CommonAjax.post('complementartGlj/api/getGljTree', {gljLibId: gljLibId}, function (rstData) {
@@ -509,7 +513,7 @@ let repositoryGljObj = {
         if(args.row < me.currentCache.length){
             me.currentGlj = me.currentCache[args.row];
             //费率数据列只有普通材料能用,可添加组成物的人材机,基价只读
-            if (dataCode === 'code'|| (me.feeDataCode.includes(dataCode) && me.currentGlj.gljType !== 201) ||
+            if (dataCode === 'code'|| (me.feeDataCode.includes(dataCode) && me.getParentType(me.currentGlj.gljType) !== 2) ||
                 (dataCode === 'basePrice' && allowComponent.includes(me.currentGlj.gljType)) ||
                 dataCode === 'isComplementary'){
                 args.cancel = true;
@@ -542,7 +546,7 @@ let repositoryGljObj = {
                                 me.currentGlj.component = [];
                             }
                             //工料机类型不为普通材料时,情况费率数据
-                            if (me.currentEditingGlj.gljType === 201 && rObj.gljType !== 201) {
+                            if (me.getParentType(me.currentEditingGlj.gljType) === 2 && me.getParentType(rObj.gljType) !== 2) {
                                 for (let feeCode of me.feeDataCode) {
                                     if (me.currentEditingGlj[feeCode]) {
                                         rObj[feeCode] = null;
@@ -844,7 +848,7 @@ let repositoryGljObj = {
                     pasteObj.gljType = me.distTypeTree.comboDatas[i].value;
                     isExsit = true;
                     reCalBasePrc = true;
-                    if (pasteObj.gljType !== 201 && tempObj.gljType === 201) {
+                    if (me.getParentType(pasteObj.gljType) !== 2 && me.getParentType(tempObj.gljType) === 2) {
                         for (let feeCode of me.feeDataCode) {
                             tempObj[feeCode] = null;
                         }
@@ -873,8 +877,8 @@ let repositoryGljObj = {
         }
         for (let feeCode of me.feeDataCode) {
             if (typeof pasteObj[feeCode] !== 'undefined' && !isNaN(pasteObj[feeCode])) {
-                if ((typeof pasteObj.gljType !== 'undefined' && pasteObj.gljType === 201) ||
-                    (tempObj.gljType && tempObj.gljType === 201)) {
+                if ((typeof pasteObj.gljType !== 'undefined' && me.getParentType(pasteObj.gljType) === 2) ||
+                    (tempObj.gljType && me.getParentType(tempObj.gljType) === 2)) {
                     tempObj[feeCode] = pasteObj[feeCode];
                 } else {
                     isValid = false;
@@ -947,7 +951,7 @@ let repositoryGljObj = {
 
         }
         for (let feeCode of me.feeDataCode) {
-            if (typeof pasteObj[feeCode] !== 'undefined' && (isNaN(pasteObj[feeCode]) || pasteObj.gljType !== 201)) {
+            if (typeof pasteObj[feeCode] !== 'undefined' && (isNaN(pasteObj[feeCode]) || me.getParentType(pasteObj.gljType) !== 2)) {
                 return false;
             }
         }