|
|
@@ -1822,9 +1822,7 @@ class Approval extends Component {
|
|
|
let canInput = (!isObjEmpty(mApprovalRecord.buttonName)
|
|
|
&& strContain(';' + mApprovalRecord.buttonName + ';',
|
|
|
';' + groupName + ';'));
|
|
|
- console.log(mApprovalRecord.buttonName);
|
|
|
approval.canInput = canInput;
|
|
|
- console.log('canInput:'+canInput);
|
|
|
let showAble = ((!isObjNull(data)) && data.hasOwnProperty(valueKey))
|
|
|
let values = getStrValue(data, valueKey)
|
|
|
let newValues = getStrValue(changeData, valueKey)
|
|
|
@@ -1834,7 +1832,10 @@ class Approval extends Component {
|
|
|
} else {
|
|
|
newValues = values
|
|
|
}
|
|
|
-
|
|
|
+ if(canInput){
|
|
|
+ console.log(mApprovalRecord.buttonName);
|
|
|
+ console.log('canInput:'+canInput);
|
|
|
+ }
|
|
|
if (!isMain) {
|
|
|
let findTionName = config.DG_FINDFUNCTIONNAME
|
|
|
let renderer = config.DG_RENDERER
|
|
|
@@ -1981,8 +1982,7 @@ class Approval extends Component {
|
|
|
|
|
|
approval.data2Values()
|
|
|
if (approval.dfType!='FF' &&((!approval.neerInput && isObjEmpty(approval.values)) || !showAble
|
|
|
- || approval.values == 'null' || approval.values == '(null)'
|
|
|
- || !approval.canInput
|
|
|
+ || ((approval.values == 'null' || approval.values == '(null)')&&!approval.canInput)
|
|
|
)) {
|
|
|
continue
|
|
|
}
|