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

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

@@ -9,18 +9,21 @@
     </div>
     <ul>
       <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>
-          <el-button type="primary"
-                     size="small"
-                     class="common-button-primary"
-                     icon="el-icon-check"
-                     @click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
+        <div style="min-height: 30px;display: flex;justify-content: space-between">
+         <div>
+            <span @click="dealWith(item)"
+                  style="line-height: 30px; font-size: 13px;"
+            >{{ getPrcNameFilter(item) }}</span>
+         </div>
+          <div>
+            <el-button type="primary"
+                       size="small"
+                       @click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
                      (item.prcType == 9 && item.taskInfo == '解读') || (item.prcType == 6 && item.taskInfo === '合规评估') || (item.prcType == 6 && item.taskInfo == '批准') ||
                      (item.prcType == 2 && item.taskInfo === '调研结果反馈') || (item.prcType == 8 && item.taskInfo === '合规排查(上传合规举证材料)') ||
                      (item.prcType == 10 && item.taskInfo === '清单完善1') || (item.prcType == 26 && item.taskInfo === '立项确认') ||
-                     (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受任务</el-button>
+                     (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受</el-button>
+          </div>
 <!--          <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>-->