From f372ae6b730dbad1896042a6576f196246ca3e8f Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Fri, 22 Jul 2022 17:24:17 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBench/components/dept-todo-view.vue    | 10 ++++------
 front/src/views/home/DetailsPageconetent.vue   | 18 ++++++++++--------
 .../views/home/components/searchResultList.vue |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue
index f40c5dcf..a8645c48 100644
--- a/back/src/views/modules/workBench/components/dept-todo-view.vue
+++ b/back/src/views/modules/workBench/components/dept-todo-view.vue
@@ -15,21 +15,19 @@
             <div v-for="(item, i) in dataInfo.list" :key="i">
                 <!-- 待办 -->
                 <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
-                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')"
+                    :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
                     placement="top">
                     <div class="list-item ellipsis">
                         <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
-                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}}
+                        {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
                     </div>
                 </el-tooltip>
                 <!-- 已办 -->
                 <el-tooltip effect="dark" v-else
-                    :content="`${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : ''}`"
+                    :content="(item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
                     placement="top">
                     <div class="list-item ellipsis">
-                        {{ `${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) :
-                                ''}`
-                        }}
+                        {{ (item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
                     </div>
                 </el-tooltip>
             </div>
diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 367c147d..799cd94e 100644
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@@ -1034,7 +1034,8 @@
                   loading.value = false
                 } else {
                   resourceTotal.value = res.data.data.total || ''
-                  getShoppingCartList(res.data.data.records)
+                  resourceList.data = res.data.data.records || []
+                  // getShoppingCartList(res.data.data.records)
                 }
               })
             }
@@ -1111,7 +1112,8 @@
                 loading.value = false
               } else {
                 resourceTotal.value = res.data.data.total || ''
-                getShoppingCartList(res.data.data.records)
+                resourceList.data = res.data.data.records || []
+                // getShoppingCartList(res.data.data.records)
               }
             })
           }
@@ -1129,12 +1131,12 @@
         }).then((res) => {
           console.log('申购车列表================>', res.data.data.records)
           shoppingCartList.value = res.data.data.records
-          list.map((item) => {
-            item.isInShoppingCart = false
-            item.isInShoppingCart = shoppingCartList.value.some((item2) => {
-              return item.id === item2.resourceId
-            })
-          })
+          // list.map((item) => {
+          //   item.isInShoppingCart = false
+          //   item.isInShoppingCart = shoppingCartList.value.some((item2) => {
+          //     return item.id === item2.resourceId
+          //   })
+          // })
           console.log('经过过滤后的列表信息', list)
           resourceList.data = list
         })
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 749ffc71..c1250b04 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -589,7 +589,6 @@
       // 加入申购车
       const addShoppingCart = (item, index) => {
         console.log('item===============>', item)
-        mybus.emit('changeSelcted', index)
         if (flag.value && item.id) {
           flag.value = false
           sgcInsert({
@@ -600,6 +599,7 @@
             console.log(res)
             message.success('添加申购车成功！')
             mybus.emit('getSgcNum')
+            mybus.emit('changeSelcted', index)
             flag.value = true
           })
         }
@@ -789,7 +789,7 @@
     },
     beforeUnmount() {
       mybus.off('chongzhi')
-      mybus.emit('changeSelcted')
+      // mybus.emit('changeSelcted')
     },
   }
 </script>