From 2485a3f321db43dd6604eb5670409a9f4481b839 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Wed, 22 Mar 2023 13:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/todoList/index.vue | 45 ++++++++++++++++++-
 .../pages/components/ProcessFooter.vue        | 18 ++++----
 .../pages/creatProcess/qbrk/step1-2.vue       |  1 -
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 205ac4704..f27e63fb6 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -11,7 +11,12 @@
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
         <div style="min-height: 30px">
           <span @click="dealWith(item)"
-                style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }}</span>
+                style="line-height: 30px; font-size: 13px;display: inline-block;width: 80%;">{{ getPrcNameFilter(item) }}</span>
+          <el-button type="primary"
+                     size="small"
+                     class="common-button-primary"
+                     icon="el-icon-check"
+                     @click="handleReceive(item)" v-if="item.prcType ===25 || item.taskInfo === '技术标准起草'? true : false">接受任务</el-button>
 <!--          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
 <!--            <span @click="dealWith(item)"-->
 <!--                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
@@ -61,6 +66,44 @@ export default {
     toPage() {
       this.$router.push(this.path)
     },
+    // 接受按钮
+    handleReceive(item) {
+      this.isSubmit = true
+      // execTask({
+      //   todoId: this.todoId // 当前节点ID
+      // }).then(res => {
+      //   if (res.sign && res.sign === '0') {
+      //     this.$message.success('接收成功')
+      //     this.$router.push('/processCenter')
+      //   }
+      //   this.isSubmit = false
+      // })
+      // if(!this.tableData.standardData[0]){
+      //   this.$message.warning('请先选择企标计划')
+      //   this.isSubmit = false
+      //   return
+      // }
+      this.$http.get("lawss/activiti/selectBusProcessNew", {
+        taskId: item.taskIds,
+      }, {
+        _this: this
+      }, res => {
+        this.$http.get("lawss/activiti/acceptTack", {
+          nowEsId: res,
+          oaFlag: '0',
+          taskId: item.taskIds,
+        }, {
+          _this: this
+        }, res => {
+          // if (res.sign && res.sign === '0') {
+          this.$message.success('接收成功')
+          this.isSubmit = false
+          this.showreceive = false
+          //   this.$router.push('/processCenter')
+          // }
+        })
+      })
+    },
     dealWith (row) { // 办理
       const prcType = row.prcType
       switch(prcType) {
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 1c2d9b5e7..3be40b9bc 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -97,15 +97,15 @@
                 v-if="showOver3"
         >驳回</el-button>
       </el-popover>
-      <el-button
-        type="primary"
-        size="small"
-        class="common-button-primary"
-        icon="el-icon-check"
-        @click="handleReceive"
-        :loading="submitLoading"
-        v-if="showReceive"
-      >接收任务</el-button>
+<!--      <el-button-->
+<!--        type="primary"-->
+<!--        size="small"-->
+<!--        class="common-button-primary"-->
+<!--        icon="el-icon-check"-->
+<!--        @click="handleReceive"-->
+<!--        :loading="submitLoading"-->
+<!--      v-if="showReceive"-->
+<!--      >接收任务</el-button>-->
       <el-button
               type="danger"
               size="small"
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 362774300..9889e5400 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -3461,7 +3461,6 @@
                                     _this: this
                                 }, res => {
                                     if (res.data === true) {
-                                        console.log(1);
                                         this.showreceive = true
                                     } else {
                                         this.showreceive = false