|
@@ -654,9 +654,11 @@ var quantity_detail = {
|
|
|
quantity_detail.prototype.autoTransformQuantity = function(value,node){//根据单位转换定额工程量
|
|
quantity_detail.prototype.autoTransformQuantity = function(value,node){//根据单位转换定额工程量
|
|
|
let data = node.data;
|
|
let data = node.data;
|
|
|
let option = optionsOprObj.getOption(optionsOprObj.optionsTypes.GENERALOPTS,'rationQuanACToRationUnit');
|
|
let option = optionsOprObj.getOption(optionsOprObj.optionsTypes.GENERALOPTS,'rationQuanACToRationUnit');
|
|
|
- if(node.data.quantityEXP=='GCLMXHJ'||node.data.quantityEXP.indexOf('QDL')!=-1||(option==true&&node.sourceType === project.Ration.getSourceType()&&data.unit)) {
|
|
|
|
|
|
|
+ let quantityEXP = gljUtil.isDef(node.updateData.quantityEXP)? node.updateData.quantityEXP:node.data.quantityEXP
|
|
|
|
|
+ if((quantityEXP&&(quantityEXP=='GCLMXHJ'||quantityEXP.indexOf('QDL')!=-1))||(option==true&&node.sourceType === project.Ration.getSourceType()&&data.unit)) {
|
|
|
//还需加入判读是否转换,如果是来自工程量明细或者包含了表达式中包含了清单量的话,默认都进行转换
|
|
//还需加入判读是否转换,如果是来自工程量明细或者包含了表达式中包含了清单量的话,默认都进行转换
|
|
|
- let times = parseInt(data.unit);
|
|
|
|
|
|
|
+ let unit = gljUtil.isDef(node.updateData.unit)?node.updateData.unit:data.unit;
|
|
|
|
|
+ let times = parseInt(unit);
|
|
|
if (isNaN(times)) {
|
|
if (isNaN(times)) {
|
|
|
times = 1
|
|
times = 1
|
|
|
}
|
|
}
|