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

applications/dee-doc/src/privateComponents/components/downloadObjFiles/index.vue

@@ -33,7 +33,7 @@ export default {
   },
   computed: {
     ifShow() {
-      if (this.form.state !== 'under_reviewing' || this.form.state !== 'Complete') {
+      if (this.form.state === 'under_reviewing' || this.form.state === 'Complete') {
         return true
       } else {
         return false

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

@@ -88,14 +88,17 @@
         <div v-if="basicData && basicData.basicInfo && !basicData.basicInfo.forwardFlag && (!isCheckTaskState || (isCheckTaskState && basicData.basicInfo.state==='BE_RESOLVED' && !basicData.basicInfo.parentTaskId))">
           <div class="sub-title" style="padding-bottom:12px">任务处理</div>
           <div
-            v-if="basicData&& basicData.businessObject &&basicData.businessObject.subTypeName&& basicData.businessObject.subTypeName==='ExtActionItem'&&basicData.businessObject.state==='InProgress'&&basicData.basicInfo.aliasName!=='编制'"
+            v-if="basicData&& basicData.businessObject &&basicData.businessObject.subTypeName&& basicData.businessObject.subTypeName==='ExtActionItem'&&basicData.businessObject.state==='InProgress'&&basicData.basicInfo.aliasName==='行动项责任人'"
           >
             <dee-as-com
+              ref="ExtActionItemAddObjFileLinks"
               :lay-config="{
                 typeName: 'ExtActionItem',
                 layKey: 'process-ExtActionItem-addObjFileLinks'
               }"
               :basic-data="{id:basicData.businessObject.id}"
+              :form="extActionItemAddObjFileLinksForm"
+              @on-submit="toSubmitExtActionItemObjFile"
             />
           </div>
           <div
@@ -254,6 +257,8 @@ export default {
     return {
       isExtPlanReplyLinkBindSuccess: false, // 反馈计划是否绑定成功
       ExtPlanReplyLinkform: {},
+      extActionItemAddObjFileLinksForm: {}, // 行动项上传季报附件,
+      isExtActionItemObjBindSuccess: false,
       // 是否已经保持盘点结果
       isSaveBeforeSubmit: true,
       tabProps: {
@@ -819,6 +824,7 @@ export default {
             })
           }
         })
+
       // // 获取流程历史记录
       // getInstanceHistory(instanceId).then(res => {
       //   this.$set(this.basicData, 'historyInfo', res.items.content || [])
@@ -883,8 +889,17 @@ export default {
         })
       })
     },
-    finishTask(flag, params, callback, errCallBack) {
-      if (this.basicData.businessObject.subTypeName && this.basicData.businessObject.subTypeName === 'ExtPlanFeedback') {
+    async  finishTask(flag, params, callback, errCallBack) {
+      if (
+        this.basicData.businessObject.subTypeName &&
+      this.basicData.businessObject.subTypeName === 'ExtActionItem' &&
+      this.basicData.businessObject.state === 'InProgress' &&
+      this.basicData.basicInfo.aliasName !== '编制') {
+        await this.toSubmitExtActionItemObjFile()
+        if (this.isExtActionItemObjBindSuccess) {
+          this.finishTaskhandle(flag, params, callback, errCallBack)
+        }
+      } else if (this.basicData.businessObject.subTypeName && this.basicData.businessObject.subTypeName === 'ExtPlanFeedback') {
         this.finishPlanReplyTask(flag, params, callback, errCallBack)
       } else {
         this.finishTaskhandle(flag, params, callback, errCallBack)
@@ -970,6 +985,18 @@ export default {
       post('/ExtPlanReplyLink/recursion', params).then(res => {
         this.$utils.showMessageSuccess('保存成功')
       })
+    },
+    // // 添加季报附件
+    async toSubmitExtActionItemObjFile() {
+      const params = this.extActionItemAddObjFileLinksForm
+      if (params.objFileLinks && params.objFileLinks.length > 0) {
+        await post('/ExtActionItem/recursion', params).then(res => {
+          this.isExtActionItemObjBindSuccess = true
+        })
+      } else {
+        this.isExtActionItemObjBindSuccess = false
+        this.$message.error('请上传季报素材')
+      }
     }
   },
   filter: {}