|
|
@@ -1753,7 +1753,7 @@ class Approval extends Component {
|
|
|
let approval = new ApprovalBean(
|
|
|
isMain ? ApprovalBean.MAIN : ApprovalBean.DETAIL)
|
|
|
|
|
|
- let caption, valueKey, combostore, type, dbFind, isdefault, appwidth,groupName
|
|
|
+ let caption, valueKey, combostore, type, dbFind, isdefault, appwidth
|
|
|
if (isMain) {
|
|
|
caption = config.FD_CAPTION
|
|
|
valueKey = config.FD_FIELD
|
|
|
@@ -1762,7 +1762,6 @@ class Approval extends Component {
|
|
|
dbFind = config.FD_DBFIND
|
|
|
isdefault = config.MFD_ISDEFAULT
|
|
|
appwidth = config.FD_APPWIDTH
|
|
|
- groupName = config.FD_GROUP
|
|
|
} else {
|
|
|
caption = config.DG_CAPTION
|
|
|
valueKey = config.DG_FIELD
|
|
|
@@ -1776,9 +1775,7 @@ class Approval extends Component {
|
|
|
approval.dfType = type
|
|
|
approval.caption = caption
|
|
|
approval.valuesKey = valueKey
|
|
|
- let canInput = (!isObjEmpty(mApprovalRecord.buttonName)
|
|
|
- && strContain(';' + mApprovalRecord.buttonName + ';',
|
|
|
- ';' + groupName + ';'));
|
|
|
+
|
|
|
let showAble = ((!isObjNull(data)) && data.hasOwnProperty(valueKey))
|
|
|
let values = getStrValue(data, valueKey)
|
|
|
let newValues = getStrValue(changeData, valueKey)
|
|
|
@@ -1933,15 +1930,13 @@ class Approval extends Component {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(canInput){
|
|
|
- approval.mustInput = false
|
|
|
- approval.neerInput = true
|
|
|
- }
|
|
|
+
|
|
|
approval.data2Values()
|
|
|
if (approval.dfType!='FF' &&(
|
|
|
(!approval.neerInput && isObjEmpty(approval.values))
|
|
|
|| !showAble
|
|
|
- ||((approval.values == 'null'|| approval.values == '(null)')&&!canInput)
|
|
|
+ || approval.values == 'null'
|
|
|
+ || approval.values == '(null)'
|
|
|
)) {
|
|
|
continue
|
|
|
}
|
|
|
@@ -2585,7 +2580,7 @@ class Approval extends Component {
|
|
|
let approval = approvals[i]
|
|
|
if (!isObjNull(approval)) {
|
|
|
if (approval.neerInput) {
|
|
|
- if (isObjEmpty(approval.values) && approval.mustInput) {
|
|
|
+ if (isObjEmpty(approval.values)) {
|
|
|
let msg = '必填字段 ' + approval.caption + '为必填项'
|
|
|
if (showTocat) {
|
|
|
message.error(msg)
|
|
|
@@ -2597,7 +2592,7 @@ class Approval extends Component {
|
|
|
} else {
|
|
|
let isputed = false
|
|
|
let datas = approval.datas
|
|
|
- if (!isObjNull(datas)&&approval.mustInput) {
|
|
|
+ if (!isObjNull(datas)) {
|
|
|
for (let j = 0; j < datas.length; j++) {
|
|
|
let data = datas[j]
|
|
|
isputed = false
|
