Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

See merge request GFP/RBC/rbc-frontend!129

develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js

@@ -84,71 +84,72 @@ export default {
     })
   },
   approvalLogical: function (bill, param) {
-    let taskId = bill.getGlobalParam('reviewParam').taskId;
-    bill.setControlsSate(param["_control_name_"], "enable", false)
-    let selectedApprovers = []
-    window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
-      if (res.data.code == 204) {
-        this.executeApproval(bill, param)
-        return
-      }
-      else if (res.data.code != 200) {
+    const getApprovalList = () => {
+      let taskId = bill.getGlobalParam('reviewParam').taskId;
+      bill.setControlsSate(param["_control_name_"], "enable", false)
+      let selectedApprovers = []
+      window.GMS.$http.get(`/bpm/bill/selectApprover/ApproverList/${taskId}`).then((res) => {
+        if (res.data.code == 204) {
+          this.executeApproval(bill, param)
+          return
+        }
+        else if (res.data.code != 200) {
+          bill.setControlsSate(param["_control_name_"], "enable", true)
+          GMS.$hideContainer.$Message.error(res.data.msg || '提交失败，请联系系统管理员');
+          return
+        }
         bill.setControlsSate(param["_control_name_"], "enable", true)
-        GMS.$hideContainer.$Message.error(res.data.msg || '提交失败，请联系系统管理员');
-        return
-      }
-      bill.setControlsSate(param["_control_name_"], "enable", true)
-      const nodeData = res.data.ApproverVo
-      const optionList = [...nodeData.approvers]
-      if (optionList.length == 0) {
-        GMS.$hideContainer.$Message.error('未找到下一节点的审批人')
-        return
-      }
-      GMS.$hideContainer.$Modal.confirm({
-        width: 700,
-        render: (h) => {
-          return h(
-            SelectApprovers,
-            {
-              props: {
-                optionList,
-              },
-              on: {
-                'on-change': (val) => {
-                  selectedApprovers = val
+        const nodeData = res.data.ApproverVo
+        const optionList = [...nodeData.approvers]
+        if (optionList.length == 0) {
+          GMS.$hideContainer.$Message.error('未找到下一节点的审批人')
+          return
+        }
+        GMS.$hideContainer.$Modal.confirm({
+          width: 700,
+          render: (h) => {
+            return h(
+              SelectApprovers,
+              {
+                props: {
+                  optionList,
+                },
+                on: {
+                  'on-change': (val) => {
+                    selectedApprovers = val
+                  }
                 }
               }
-            }
-          )
-        },
-        onOk: () => {
-          window.GMS.$http.post(
-            '/bpm/bill/selectApprover/addApprovers',
-            {
-              ...nodeData,
-              approvers: selectedApprovers,
-            }
-          ).then(() => {
-            this.executeApproval(bill, param)
-          }).catch(() => {
-            GMS.$hideContainer.$Message.error('选择审批人发生错误')
-          })
-        },
-        onCancel: () => {
-        }
-      });
-    }).catch(() => {
-      GMS.$hideContainer.$Message.error('未找到下一节点的审批人');
-    })
-  },
-  executeApproval: function(bill, param) {
+            )
+          },
+          onOk: () => {
+            window.GMS.$http.post(
+              '/bpm/bill/selectApprover/addApprovers',
+              {
+                ...nodeData,
+                approvers: selectedApprovers,
+              }
+            ).then(() => {
+              this.executeApproval(bill, param)
+            }).catch(() => {
+              GMS.$hideContainer.$Message.error('选择审批人发生错误')
+            })
+          },
+          onCancel: () => {
+          }
+        });
+      }).catch(() => {
+        GMS.$hideContainer.$Message.error('未找到下一节点的审批人');
+      })
+    }
+
     if (param.param.actions) {
       let saveParam = {
         actions: param.param.actions
       }
       bill.executeServerAction(saveParam, function (code, data) {
         if (code === 200) {
-          this.approval(bill, param);
+          getApprovalList()
         } else {
           bill.setControlsSate(param["_control_name_"], "enable", true)
           if (data.message.includes('还款金额不能大于未还金额')) {
@@ -160,10 +161,10 @@ export default {
         }
       }.bind(this));
     } else {
-      this.approval(bill, param);
+      getApprovalList()
     }
   },
-  approval: function (bill, param) {
+  executeApproval: function(bill, param) {
     let taskId = bill.getGlobalParam('reviewParam').taskId;
     let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions : "";
     GMS.$http.post('/rbc/workflow/approve/completed/' + taskId + '?result=1&comments=' + comments).then(

develop/@gms/gms-plugin-billexpand/src/formula/CheckSublistSize.js

@@ -8,32 +8,12 @@ export default {
             if (context.getTableType) {
                 let _tn = context.getTableType(table);
                 let _data = context.getSubData(_tn.title);
-                if (_data instanceof Array) {
-                    let field = arguments[0][0].FieldCode
-                    let matchProp = arguments[0][1].StaticValue
-                    let matchValue = arguments[0][2].StaticValue
-                    if (matchValue) {
-                        for (const iterator of _data) {
-                            let _val = iterator.getValue(field)
-                            if (_val instanceof Object) {
-                                if (_val[matchProp] == matchValue) {
-                                    size++;
-                                }
-                            } else {
-                                if (_val == matchValue) {
-                                    size++;
-                                }
-                            }
-                        }
-                    } else {
-                        size = _data.length
-                    }
-                }
+                return _data.length>0
             }
         }
         return size
     },
     getResultType: function () {
-        return FMR.ConstDataTypes.General;
+        return 1;
     }
 }
\ No newline at end of file