ups迁移：(需要迁移)-1.0.34增加任务类型。

src/locales/en-US.json

@@ -238,7 +238,8 @@
           "returnConfirm": "Are you sure to return?",
           "viewApprovalProcess": "View Approval Process",
           "opinion": "Opinion",
-          "picture": "Picture"
+          "picture": "Picture",
+          "complete": "Complete"
       }, 
       "attachmentPanel": {
           "attachment": "Attachment", 

src/locales/zh-CN.json

@@ -242,7 +242,8 @@
       "copyUser": "抄送人",
       "viewApprovalProcess": "查看审批流程",
       "opinion": "意见",
-      "picture": "图片"
+      "picture": "图片",
+      "complete": "完成"
     },
     "attachmentPanel": {
       "attachment": "附件",

src/workflow/ApproveComment.vue

@@ -58,7 +58,7 @@
           <div class="form-group" style="margin-top: 10px">
             <a-flex justify="space-between" align="flex-start" gap="middle">
               <a-button type="primary" size="large" class="approve-button" @click="modal3 = true">
-                {{ $t("lang.approveComment.approve") }}<br />
+                {{ (currentTaskInfo.category == 'MandatoryTask') ? $t("lang.approveComment.complete") : $t("lang.approveComment.approve") }}<br />
               </a-button>
               <a-button size="large" class="approve-button" @click="transfer">
                 {{ $t("lang.approveComment.transfer") }}
@@ -80,14 +80,15 @@
           <ApproveForm
             ref="approveForm" :process-instance-id="processInstanceId" :workflow="workFlow"
             :task-id="taskInfoId" @value-changed="approveFormValueChanged"
+            v-if="currentTaskInfo.category != 'MandatoryTask'"
           />
 
-          <div class="form-group">
+          <div class="form-group" v-if="currentTaskInfo.category != 'MandatoryTask'">
             <label class="control-label">{{ $t("lang.approveComment.opinion") }}</label>
             <textarea v-model="comment" class="form-control" rows="3" />
           </div>
 
-          <ApproveTaskAttachmentEdit :task-id="taskInfoId" />
+          <ApproveTaskAttachmentEdit :task-id="taskInfoId" v-if="currentTaskInfo.category != 'MandatoryTask'" />
         </div>
 
 
@@ -687,16 +688,20 @@ export default {
 
       if (command === 'APPROVE') {
         try {
-          chooseTask.keyValueObjects = this.$refs.approveForm.getData();
+          if(this.$refs.approveForm != null){
+            chooseTask.keyValueObjects = this.$refs.approveForm.getData();
+          }
         } catch (exception) {
           console.log(exception);
           return;
         }
 
         try {
-          const param = this.$refs.previousNodeSelectUser.getData();
-          chooseTask.copyUserIds = param.copyUsers;
-          chooseTask.userSelectDtos = param.userSelectDtos;
+          if(this.$refs.previousNodeSelectUser != null){
+            const param = this.$refs.previousNodeSelectUser.getData();
+            chooseTask.copyUserIds = param.copyUsers;
+            chooseTask.userSelectDtos = param.userSelectDtos;
+          }
         } catch (exception) {
 
           notification.error({

src/workflow/ApprovedWorkflowOld.vue

@@ -163,7 +163,7 @@
                   <span style="white-space: pre-line">{{ item.content }}</span>
                 </td> -->
                 <td>
-                  <span v-if="item.category != 'CurdWindow'">
+                  <span v-if="item.category != 'CurdWindow' && item.category != 'MandatoryTask'">
                     {{ item.name }}
                   </span>
                   <span v-else>
@@ -171,7 +171,7 @@
                   </span>
                 </td>
                 <td>
-                  <span v-if="item.category != 'CurdWindow'" style="white-space: pre-line">{{ item.description }}</span>
+                  <span v-if="item.category != 'CurdWindow' && item.category != 'MandatoryTask'" style="white-space: pre-line">{{ item.description }}</span>
                   <span v-else style="white-space: pre-line">{{ item.content }}</span>
                 </td>
                 <td>

src/workflow/NeedApproveWorkflowOld.vue

@@ -106,7 +106,7 @@
                   {{ item.no }}
                 </td>
                 <td>
-                  <span v-if="item.category != 'CurdWindow'">
+                  <span v-if="item.category != 'CurdWindow' && item.category != 'MandatoryTask'">
                     {{ item.name }}
                   </span>
                   <span v-else>
@@ -114,7 +114,7 @@
                   </span>
                 </td>
                 <td>
-                  <span v-if="item.category != 'CurdWindow'" style="white-space: pre-line">{{ item.description }}</span>
+                  <span v-if="item.category != 'CurdWindow' && item.category != 'MandatoryTask'" style="white-space: pre-line">{{ item.description }}</span>
                   <span v-else style="white-space: pre-line">{{ item.content }}</span>
                 </td>
                 <td>

src/workflow/TaskOpenUtil.js

@@ -22,7 +22,7 @@ export default {
       // 2. 判断formKey是否存在
       // 2.1 如果存在那么就直接打开
       // 2.2 如果不存在那么，判断formKeyApp是否存在，如果不存在，那么表示本任务存在异常，如果存在，表示该任务需要在APP上执行，那么进行正确的提示。
-      if(taskInfo.category === 'CurdWindow'){
+      if(taskInfo.category === 'CurdWindow' || taskInfo.category != 'MandatoryTask'){
         if(taskInfo.formKey === null || taskInfo.formKey === ''){
           WorkflowResource.canEditByWorkflow(null, windowNo, taskInfo.id).then(successData => {
             let url = null;
@@ -140,7 +140,7 @@ export default {
     // 2.2 如果不存在那么，判断formKeyApp是否存在，如果不存在，那么表示本任务存在异常，如果存在，表示该任务需要在APP上执行，那么进行正确的提示。
     
     return new Promise((resolve, reject) => {
-      if(historyTaskInfo.category === 'CurdWindow'){
+      if(historyTaskInfo.category === 'CurdWindow'  || historyTaskInfo.category != 'MandatoryTask'){
         if(historyTaskInfo.formKey === null || historyTaskInfo.formKey === ''){
           let newUrl = '/#/desktop/window/window-read/'
                     + type + '/'
@@ -237,7 +237,7 @@ export default {
     // 2.2 如果不存在那么，判断formKeyApp是否存在，如果不存在，那么表示本任务存在异常，如果存在，表示该任务需要在APP上执行，那么进行正确的提示。
     
     return new Promise((resolve, reject) => {
-      if(copyTask.category === 'CurdWindow'){
+      if(copyTask.category === 'CurdWindow' || copyTask.category != 'MandatoryTask'){
         if(copyTask.formKey === null || copyTask.formKey === ''){
           let newUrl = '/#/desktop/window/window-read/'
                     + type + '/'