Merge remote-tracking branch 'origin/branch_qywx_v2' into branch_qywx_v2

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

@@ -1891,7 +1891,9 @@ class Approval extends Component {
         }
       }
 
-      if (isObjEmpty(valueKey) || isObjEmpty(caption)
+      if (
+          isObjEmpty(valueKey) ||
+          isObjEmpty(caption)
         || (merged.length > 0 && strContain(merged, ',' + valueKey + ','))) {
         continue
       }

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

@@ -1795,7 +1795,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
@@ -1804,6 +1804,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
@@ -1818,7 +1819,9 @@ class Approval extends Component {
       approval.caption = caption
       approval.valuesKey = valueKey
       approval.rowIndex = rowIndex
-
+      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)
@@ -1828,7 +1831,6 @@ class Approval extends Component {
       } else {
         newValues = values
       }
-
       if (!isMain) {
         let findTionName = config.DG_FINDFUNCTIONNAME
         let renderer = config.DG_RENDERER
@@ -1935,7 +1937,8 @@ class Approval extends Component {
       }
 
       if (isObjEmpty(valueKey) || isObjEmpty(caption)
-        || (merged.length > 0 && strContain(merged, ',' + valueKey + ','))) {
+        || (merged.length > 0 && strContain(merged, ',' + valueKey + ','))
+      ){
         continue
       }
 
@@ -1970,11 +1973,17 @@ class Approval extends Component {
               new ApprovalBean.Data('0', ApprovalBean.VALUES_NO))
           }
         }
+      }else {
+        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)')) {
+      if (approval.dfType!='FF' &&((!approval.neerInput && isObjEmpty(approval.values)&&!canInput) || !showAble
+        || ((approval.values == 'null' || approval.values == '(null)')&&!canInput)
+      )) {
         continue
       }
       if (mergeAble && !approval.isDBFind() && !approval.neerInput) {
@@ -2663,7 +2672,7 @@ class Approval extends Component {
       let approval = approvals[i]
       if (!isObjNull(approval)) {
         if (approval.neerInput) {
-          if (isObjEmpty(approval.values) && mApprovalRecord.buttonName !='updatedetail') {
+          if (isObjEmpty(approval.values) && mApprovalRecord.buttonName !='updatedetail'&&approval.mustInput) {
             let msg = '必填字段  ' + approval.caption + '为必填项'
             if (showTocat) {
               message.error(msg)
@@ -2675,7 +2684,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