|
|
@@ -96,8 +96,10 @@ function generateRationName(ration,gljList) {
|
|
|
let caption = ration.caption ? ration.caption:ration.name;
|
|
|
if(ration.rationAssList && ration.rationAssList.length > 0){
|
|
|
let ass = ration.rationAssList[0];
|
|
|
- if(ass.actualValue != null && ass.actualValue != undefined ){
|
|
|
+ if( ass.isAdjust == 1 && ass.actualValue != null && ass.actualValue != undefined ){
|
|
|
caption = caption.replace('%s',ass.actualValue);
|
|
|
+ }else {
|
|
|
+ caption = caption.replace('%s',ass.stdValue);//没勾选的时候要恢复成标准值
|
|
|
}
|
|
|
}
|
|
|
let reNameList = [];
|
