Explorar o código

修复工作流的BUG。

YangZhiJie %!s(int64=2) %!d(string=hai) anos
pai
achega
a736f4d14e

+ 1 - 1
src/workflow/ApproveComment.vue

@@ -934,7 +934,7 @@ export default {
 
       WorkflowResource.uniqueTaskInfoByTaskIdUserId(this.taskInfoId).then(
         successData => {
-          if (successData == null) {
+          if (successData == null || successData.id == null) {
             this.isActiveTask = false;
           } else {
             this.isActiveTask = true;

+ 1 - 1
src/workflow/ApproveForm.vue

@@ -128,7 +128,7 @@ export default {
       type: String,
       default: null,
     },
-    workFlow: {
+    workflow: {
       type: Object,
       default : function(){
         return null;

+ 4 - 1
src/workflow/HistoryApproveComment.vue

@@ -14,6 +14,9 @@
         <span class="label label-warning m-label">
           {{ index + 1 }} / {{ abandonCount == undefined ? "0" : abandonCount }}
         </span>
+        <span class="m-label">
+          {{ historyProcessInstanceDescription.startTime }}-{{ historyProcessInstanceDescription.endTime }}
+        </span>
       </div>
       <div
         class="panel-body"
@@ -42,7 +45,7 @@
                   {{ $t("lang.approveComment.submitUser") }}
                 </small>
               </h4>
-              <h5 class="m-h5">{{ historyProcessInstanceDescription.startTime }}-{{ historyProcessInstanceDescription.endTime }}</h5>
+              <h5 class="m-h5">{{ historyProcessInstanceDescription.startTime }}</h5>
               <p class="comment-text">{{ $t("lang.approveComment.submitApprove") }}</p>
             </div>
           </li>

+ 1 - 1
src/workflow/PreviousNodeSelectUser.vue

@@ -4,7 +4,7 @@
     <div>
       <div>
         <div>
-          <div>{{ $t('lang.previousNodeSelectUser.selectUser') }}</div>
+          <div v-if="userSelectDefineList != null && userSelectDefineList.length > 0">{{ $t('lang.previousNodeSelectUser.selectUser') }}</div>
           <div
             v-for="userSelectDefine in userSelectDefineList"
             :key="userSelectDefine.nodeId"