fix(@gms/gms-plugin-billexpand): 会签审批意见，提交人审批信息调整

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

develop/@gms/gms-plugin-billexpand/src/control/workflow-track.vue

@@ -57,7 +57,10 @@
                 </div>
               </div>
               <div v-if="isCurrentStep(step, k) || step.state == 2">{{formatStepTime(step)}}</div>
-              <div v-if="step.comments">审批意见：{{step.comments}}</div>
+              <div class="comment" v-if="step.comments">
+                <div class="label">审批意见：</div>
+                <div class="text">{{step.comments}}</div>
+              </div>
               <div v-if="step.title" :class="isRejectStep(step) ? 'text-error' : 'text-main'">环节名称: {{step.title}}</div>
             </div>
           </div>
@@ -172,6 +175,7 @@ export default {
           if (step.subTasks && step.subTasks.length) {
             let participants = []
             let actualOwnerList = []
+            let commentList = []
             let resultFlag = 0
             let rejectFlag = false
             for (let task of step.subTasks) {
@@ -190,6 +194,9 @@ export default {
                   actualOwnerList.push(task.actualOwner)
                 }
               }
+              if (task.comments) {
+                commentList.push(task.comments)
+              }
               const curResult = task.result || 0
               resultFlag |= 1 << curResult
             }
@@ -202,6 +209,7 @@ export default {
               : 1
 
             rejectFlag && (step.state = 2)
+            step.comments = commentList.join(';\n')
             step.participants = participants
             step.actualOwner = actualOwnerList.join('、')
           }
@@ -376,6 +384,12 @@ export default {
           font-size: 14px;
           line-height: 20px;
         }
+        .comment {
+          display: flex;
+          .text {
+            white-space: pre-line;
+          }
+        }
       }
     }
   }