Merge remote-tracking branch 'origin/develop' into develop

src/pages/home2/components/todoList/index.vue

@@ -11,10 +11,10 @@
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
         <div style="height: 30px">
           <span @click="dealWith(item)" v-if="item.prcName.length<24"
-                style="line-height: 30px; font-size: 13px;">{{ item.prcName }}</span>
+                style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item.prcName) }}</span>
           <el-tooltip class="item" effect="dark" :content="item.prcName" placement="left" v-else>
             <span @click="dealWith(item)"
-                  style="line-height: 30px; font-size: 13px;">{{ item.prcName.substring(0, 24) + '...' }}</span>
+                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item.prcName).substring(0, 24) + '...' }}</span>
           </el-tooltip>
         </div>
       </li>

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -124,6 +124,14 @@ export default {
     };
   },
   methods: {
+      getPrcNameFilter(row){
+        if(row && row.prcType === 'buss3'){
+            return row.prcName + '-' + row.taskInfo
+        }else {
+            return row.prcName
+        }
+
+      },
     /**
      * @description: 根据流程类型获取流程名称
      * @date: 2020-11-25 15:47:12

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -93,9 +93,9 @@
             show-overflow-tooltip
             align="center"
             min-width="250"
-          >
+          ><!--scope.row.prcName-->
             <template slot-scope="scope">
-              <a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName }}</a>
+              <a @click="dealWith(scope.row)" class="table-jump">{{ getPrcNameFilter(scope.row) }}</a>
             </template>
           </el-table-column>
           <el-table-column