【反馈:2026070108】【深爱】【U审批】【审批可维护字段参考PC端，分组与按钮同名的字段变为可编辑字段】

uas-office-web/uas-mobile/src/pages/private/approval/pages/Approval.jsx

@@ -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
+      let caption, valueKey, combostore, type, dbFind, isdefault, appwidth,groupName
       if (isMain) {
         caption = config.FD_CAPTION
         valueKey = config.FD_FIELD
@@ -1762,6 +1762,7 @@ 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
@@ -1775,7 +1776,9 @@ 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)
@@ -1930,13 +1933,15 @@ 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)'
+          ||((approval.values == 'null'|| approval.values == '(null)')&&!canInput)
       )) {
         continue
       }
@@ -2580,7 +2585,7 @@ class Approval extends Component {
       let approval = approvals[i]
       if (!isObjNull(approval)) {
         if (approval.neerInput) {
-          if (isObjEmpty(approval.values)) {
+          if (isObjEmpty(approval.values) && approval.mustInput) {
             let msg = '必填字段  ' + approval.caption + '为必填项'
             if (showTocat) {
               message.error(msg)
@@ -2592,7 +2597,7 @@ class Approval extends Component {
             } else {
               let isputed = false
               let datas = approval.datas
-              if (!isObjNull(datas)) {
+              if (!isObjNull(datas)&&approval.mustInput) {
                 for (let j = 0; j < datas.length; j++) {
                   let data = datas[j]
                   isputed = false

uas-office-web/wxuasapproval/src/pages/approval/Approval.jsx

@@ -1831,13 +1831,6 @@ class Approval extends Component {
       } else {
         newValues = values
       }
-      if(canInput&&(valueKey=='pa_finalresultremark')){
-        console.log(mApprovalRecord.buttonName);
-        console.log('canInput:'+canInput);
-      }
-      if(valueKey=='pa_finalresultremark'){
-        console.log(mApprovalRecord);
-      }
       if (!isMain) {
         let findTionName = config.DG_FINDFUNCTIONNAME
         let renderer = config.DG_RENDERER
@@ -1963,11 +1956,9 @@ class Approval extends Component {
 
       let mergeAble = (appwidth == 1 || approval.dfType == 'MT')
       approval.mustInput = true
-      if ((!isObjEmpty(mApprovalRecord.needInputKeys)
+      if (!isObjEmpty(mApprovalRecord.needInputKeys)
         && strContain(',' + mApprovalRecord.needInputKeys + ',',
-          ',' + valueKey + ','))
-          ||canInput
-      ) {
+          ',' + valueKey + ',')) {
         approval.neerInput = true
         if (approval.datas.length <= 0) {
           if (approval.dfType == 'YN' || approval.dfType == 'C') {
@@ -2692,7 +2683,7 @@ class Approval extends Component {
             } else {
               let isputed = false
               let datas = approval.datas
-              if (!isObjNull(datas)) {
+              if (!isObjNull(datas)&&approval.mustInput) {
                 for (let j = 0; j < datas.length; j++) {
                   let data = datas[j]
                   isputed = false
@@ -2703,10 +2694,6 @@ class Approval extends Component {
                     break
                   }
                 }
-              }else {
-                if(!approval.mustInput){
-                  isputed = true
-                }
               }
               if (!isputed) {
                 formstore.set(approval.valuesKey, approval.values)