Merge branch 'develop' of http://94.191.100.41/inet-two/web into develop

applications/dee-task-center/src/business-components/tabCom/task-detail.vue

@@ -75,6 +75,7 @@
               layKey: 'task-ExtPlanReply'
             }"
             :form="ExtPlanReplyLinkform"
+            @on-submit="toSubmitExtPlanReply"
           />
         </div>
         <div v-if="basicData && basicData.basicInfo && !basicData.basicInfo.forwardFlag && (!isCheckTaskState || (isCheckTaskState && basicData.basicInfo.state==='BE_RESOLVED' && !basicData.basicInfo.parentTaskId))">
@@ -685,7 +686,6 @@ export default {
             // 任务详情插入流程信息变量
             basicInfo.processInstVO = this.processInstVO
             this.$set(this.basicData, 'basicInfo', basicInfo)
-            console.log('this.basicData', this.basicData.basicInfo)
             this.$set(this.basicData, 'businessObject', businessObject)
             if (businessObject) {
               this.$set(this.basicData, 'dxClassname', businessObject.dxClassname)
@@ -806,8 +806,8 @@ export default {
     },
     // 完成任务
     // 反馈计划完成任务之前要先判断是否绑定反馈信息
-    finishPlanReplyTask(flag, params, callback, errCallBack) {
-      this.initExtPlanReplyForm()
+    async  finishPlanReplyTask(flag, params, callback, errCallBack) {
+      await this.initExtPlanReplyForm()
       if (this.isExtPlanReplyLinkBindSuccess) {
         this.finishTaskhandle(flag, params, callback, errCallBack)
       } else {
@@ -894,7 +894,7 @@ export default {
       })
     },
     // 初始化进度计划反馈信息表格  判断是否绑定了反馈信息
-    initExtPlanReplyForm() {
+    async  initExtPlanReplyForm() {
       const params = {
         'pageFrom': 1,
         'pageSize': 10,
@@ -922,7 +922,7 @@ export default {
           'sortOrder': 'desc'
         }]
       }
-      post('/ExtPlanReplyLink/search', params).then(res => {
+      await post('/ExtPlanReplyLink/search', params).then(res => {
         if (res.items.content.length > 0 && res.items.content[0].target) {
           this.isExtPlanReplyLinkBindSuccess = true
           this.ExtPlanReplyLinkform = res.items.content[0].target || {}
@@ -934,7 +934,7 @@ export default {
       const params = {
         target: this.ExtPlanReplyLinkform,
         sourceId: this.basicData.businessObject.id,
-        opertar: 'AND'
+        opertar: 'ADD'
       }
       post('/ExtPlanReplyLink/recursion', params).then(res => {
         this.$utils.showMessageSuccess('保存成功')