|  | @@ -36,7 +36,11 @@ $(document).ready(function () {
 | 
	
		
			
				|  |  |      rightElesObj.left = $('#midContent');
 | 
	
		
			
				|  |  |      rightElesObj.right = $('#rightContent');
 | 
	
		
			
				|  |  |      SlideResize.horizontalSlide(rightElesObj, {min: 200, max: `$('#dataRow').width() - $('#leftContent').width() - 200`}, function () {
 | 
	
		
			
				|  |  | -       refreshALlWorkBook();
 | 
	
		
			
				|  |  | +        let resizeRate = 500 / $('#midContent').width(),
 | 
	
		
			
				|  |  | +            sheetRate = 100 - resizeRate;
 | 
	
		
			
				|  |  | +        $('#leftResize').css('width', `${resizeRate}%`);
 | 
	
		
			
				|  |  | +        $('#GLJListSheet').css('width', `${sheetRate}%`);
 | 
	
		
			
				|  |  | +        refreshALlWorkBook();
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |  });
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -310,6 +314,10 @@ let repositoryGljObj = {
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    //获取工料机类型大类
 | 
	
		
			
				|  |  | +    getParentType: function (type) {
 | 
	
		
			
				|  |  | +        return parseInt(type.toString()[0]);
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      getGljLib: function (libId, callback) {
 | 
	
		
			
				|  |  |          let me = repositoryGljObj;
 | 
	
		
			
				|  |  |          $.ajax({
 | 
	
	
		
			
				|  | @@ -706,7 +714,7 @@ let repositoryGljObj = {
 | 
	
		
			
				|  |  |              let dataCode = me.setting.header[args.col].dataCode;
 | 
	
		
			
				|  |  |              me.currentGlj = me.currentCache[args.row];
 | 
	
		
			
				|  |  |              if(dataCode === 'code'
 | 
	
		
			
				|  |  | -                || (me.feeDataCode.includes(dataCode) && me.currentGlj.gljType !== 201)){//费率数据列只有普通材料能用
 | 
	
		
			
				|  |  | +                || (me.feeDataCode.includes(dataCode) && me.getParentType(me.currentGlj.gljType) !== 2)){//费率数据列只有材料能用
 | 
	
		
			
				|  |  |                  args.cancel = true;
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              else {
 | 
	
	
		
			
				|  | @@ -760,8 +768,8 @@ let repositoryGljObj = {
 | 
	
		
			
				|  |  |                              if(me.currentGlj){
 | 
	
		
			
				|  |  |                                  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;
 | 
	
	
		
			
				|  | @@ -1104,7 +1112,7 @@ let repositoryGljObj = {
 | 
	
		
			
				|  |  |                  if(pasteObj.gljType === me.distTypeTree.comboDatas[i].text){
 | 
	
		
			
				|  |  |                      pasteObj.gljType = me.distTypeTree.comboDatas[i].value;
 | 
	
		
			
				|  |  |                      isExsit = 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;
 | 
	
		
			
				|  |  |                          }
 | 
	
	
		
			
				|  | @@ -1135,8 +1143,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;
 | 
	
	
		
			
				|  | @@ -1224,7 +1232,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;
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          }
 |