Merge pull request 'fix : 按钮放在右上角浮动' (#860) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/860

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()

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;

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"