Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

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

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

@@ -13,11 +13,15 @@ export default {
         }
         else if (res.data.code != 200) {
           // this.executeApproval(bill, param)
-          GMS.$hideContainer.$Message.error(res.data.msg || '获取审批人列表失败');
+          GMS.$hideContainer.$Message.error(res.data.msg || '提交失败，请联系系统管理员');
           return
         }
         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) => {
@@ -52,7 +56,7 @@ export default {
           }
         });
       }).catch(() => {
-        GMS.$hideContainer.$Message.error('获取审批人列表失败');
+        GMS.$hideContainer.$Message.error('未找到下一节点的审批人');
       })
     } else {
       alert('缺少参数');

develop/@gms/gms-plugin-billexpand/src/control/approval-user-control/approval-user-control.vue

@@ -181,8 +181,8 @@ export default {
     }
   },
   mounted() {
-    this.reviewParam['taskId'] = GMS.$hideContainer.$route.query.taskId;
-    this.taskId = GMS.$hideContainer.$route.query.taskId;
+    this.reviewParam['taskId'] = GMS.workflowTaskId
+    this.taskId = GMS.workflowTaskId;
     // this.reviewParam['billid'] = this.$route.query.id;
     this.context.bill.setGlobalParam('reviewParam',this.reviewParam);
     this.value = this.context.bill.getGlobalParam('reviewParam').suggestions

develop/@gms/gms-plugin-billexpand/src/query-actions/examineAction.js

@@ -14,13 +14,11 @@ export default {
     }
     let templateName = param.viewName;
     let billId = context.selects[0][param.billId];
+    window.GMS.workflowTaskId = context.selects[0][param.taskId]
     if (
       window.osConfig.appOpenMode &&
       window.osConfig.appOpenMode == "apploader"
     ) {
-      GMS.$hideContainer.$router.push({
-        path: "/approvalBillForm/" + param.viewName + "/" + context.selects[0][param.billId] + "?taskId=" + context.selects[0][param.taskId]
-      });
       GMS.$hideContainer.$portalAPI.emit(
         "open-new-page", //打开一个新的页签
         getUUID(),
@@ -36,15 +34,6 @@ export default {
         }
       );
     } else {
-      let href = window.location.href
-      if (href.indexOf('taskId') > -1) {
-        href = href.substring(0, href.indexOf('taskId'))
-        href += 'taskId=' + context.selects[0][param.taskId]
-      }
-      else {
-        href += '?taskId=' + context.selects[0][param.taskId]
-      }
-      window.location.href = href
       GMS.$hideContainer.addComponent(typesBill, {}, function(c) {
         c.templateName = templateName;
         c.billId = billId;