From 5c4f25dc1afb86dbcac9668087079b3238980fd8 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 24 Oct 2024 10:28:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=8C=89=E9=92=AE=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=B5=AE=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue                       | 12 +++++++++++-
 src/layout/tagsview/index.vue                        | 11 +++++++++--
 .../project-management/implementation/detail.vue     |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 6eb93ea..3ac5f6e 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -2,7 +2,7 @@
   <div style="padding: 0 30px" id="printBox">
     <div style="display: flex;justify-content: space-between">
       <baseTitle title="项目基本信息"></baseTitle>
-      <div class="oper-page-btn" :style="{marginRight:taskId? '145px':'0'}">
+      <div class="oper-page-btn" :style="{marginRight:taskId? '145px':editShow?mode=='submit'?'145px':'170px':'0'}">
         <el-button v-print="print" color="#ded0b2" icon="Printer" @click="handlePrint(print)"> 打印</el-button>
       </div>
     </div>
@@ -101,6 +101,16 @@ const props = defineProps({
   taskId: {
     type: String,
     default: ''
+  },
+  //当项目详情是编辑模式时按钮位置
+  editShow: {
+    type: String,
+    default: ''
+  },
+  //当项目详情是提交模式还是重新提交时按钮位置
+  mode: {
+    type: String,
+    default: ''
   }
 })
 const route = useRoute()
diff --git a/src/layout/tagsview/index.vue b/src/layout/tagsview/index.vue
index 8b557ff..e77381f 100644
--- a/src/layout/tagsview/index.vue
+++ b/src/layout/tagsview/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="link-box">
-    <el-scrollbar noresize>
-      <div>
+    <el-scrollbar noresize height="31" >
+<!--      style="display: flex"-->
+      <div >
         <router-link
             v-for="item in tagsViewStore.visitedViews"
             :key="item.path" :to="{ path: item.path, query: item.query }" class="tag"
@@ -74,11 +75,17 @@ init()
 
 <style lang="scss" scoped>
 .link-box {
+  //display: flex;
   position: relative;
   padding: 12px 0;
   line-height: 30px;
 
   .tag {
+    //flex-shrink: 0;
+    //display: flex;
+    //align-items: center;
+    //justify-content: center;
+    //height: 30px;
     padding: 6px;
     border: 1px solid darkgray;
     font-size: 13px;
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index d88d6e8..93d5909 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
-         :reportType="route.query.id==='-1'?'direct':''" :taskId="detailData.taskId">
+         :reportType="route.query.id==='-1'?'direct':''" :taskId="detailData.taskId" :editShow="editShow" :mode="mode">
     <template #content v-if="detailShow">
       <collection-detail :formData="detailData.formData"
                          :data="detailData"