Merge branch 'develop-zhouyi' into 'develop'

feat(@gms/gms-plugin-billexpand): 同意默认意见，驳回意见必填

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

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

@@ -155,6 +155,14 @@ export default {
       ? bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
       : '';
     
+    if (!comments) {
+      comments = '同意'
+      bill.setGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT, {
+        taskId,
+        suggestions: comments
+      })
+    }
+
     const fn = () => {
       saveBill(bill, param).then(() => {
         GMS.$http.post('/rbc/workflow/approve/completed/' + taskId + '?result=1&comments=' + comments).then(

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

@@ -51,10 +51,22 @@ export default {
     }
   },
   approval: function(bill, param){
-      if (!bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT) || !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId) {
+      if (
+        !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
+        || !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId
+      ) {
         GMS.$hideContainer.$Message.error('请配置审批轨迹')
         return
       }
+      if (
+        !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
+        || !bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
+      ) {
+        GMS.$hideContainer.$Message.error('请输入审批意见')
+        bill.setControlsSate(param["_control_name_"], "enable", true)
+        return
+      }
+
       let taskId = bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).taskId;
       let comments =
         bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions

develop/@gms/gms-plugin-billexpand/src/actions/util/index.js

@@ -52,7 +52,7 @@ export const showSignModal = (bill, param, nodeName) => {
     const approvalComment =
       bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT)
       && bill.getGlobalParam(BILL_GLOBAL_PARAM.APPROVAL_COMMENT).suggestions
-      || ''
+      || '同意'
     const subDataObj = bill.getSubData(SIGNATURE_TABLE_NAME)
     const tableLength = subDataObj.length || 0
     const subDataIndex = tableLength  - 1