From 70f0e0de616d4b54df4493e066848b5706c1da04 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 28 Mar 2024 19:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=A8=E5=A4=A9=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E4=BB=A3=E7=A0=81=E5=86=85=E5=AE=B9=EF=BC=9A=201?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E5=A4=87=E6=B3=A8=EF=BC=8C=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=202=E3=80=81=E6=90=9C=E7=B4=A2=E6=A1=86=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=8F=9C=E5=8D=95=E6=A0=8F=EF=BC=88=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue            |  6 ++--
 .../ChangeRecord/src/ChangeRecord.vue         |  4 +--
 src/components/Detail/src/Detail.vue          | 29 ++++++++++++-------
 src/components/Remarks/src/Remarks.vue        |  4 +--
 src/components/Table/src/Table.vue            | 21 +++++++++-----
 src/layout/components/useRenderLayout.tsx     | 14 +++++++++
 6 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 4cae5c2e1..7d7ce3ee7 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="annex">
     <div class="title flex items-center">
-      <div class="title-txt">附件</div>
+      <!-- <div class="title-txt">附件</div> -->
       <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
         @update:modelValue="handleAnnexSuccess" />
     </div>
@@ -72,8 +72,8 @@ const downFile = (item)=>{
 <style scoped lang="scss">
 .title {
   border-bottom: 1px solid #dedede;
-  justify-content: space-between;
-
+  justify-content: flex-end;
+  
   .title-txt {
     width: 80px;
     text-align: center;
diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
index a7de4f902..a86209696 100644
--- a/src/components/ChangeRecord/src/ChangeRecord.vue
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -1,9 +1,9 @@
 <!-- 变更记录组件 -->
 <template>
   <div class="annex">
-    <div class="title flex items-center">
+    <!-- <div class="title flex items-center">
       <div class="title-txt">变更记录</div>
-    </div>
+    </div> -->
     <div class="list">
       <el-steps direction="vertical" class="mt-16px" :space="90">
         <el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index">
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 83abb782f..6a2445b05 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -28,8 +28,7 @@
       <Tabs :tabsList="tabsList" :current="current" @change="change" />
       <div class="flex">
         <!-- 详情 -->
-        <ContentWrap class="w-[73%]">
-          <!-- 列表头部 -->
+        <ContentWrap class="w-[100%]" v-show="current<tabsList.length-3">          <!-- 列表头部 -->
           <TableHead
             v-if="!isBasic"
             :HeadButttondata="HeadButttondata"
@@ -73,8 +72,7 @@
             v-model:currentPage="tableObjectRef.currentPage"
           >
           <template #photos="{ row }">
-             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
-            </template>
+            <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>            </template>
             <template #action="{ row }">
               <ButtonBase
                 :Butttondata="buttondata"
@@ -98,23 +96,23 @@
             </template>
           </DetailTable>
         </ContentWrap>
-        <ContentWrap class="w-[27%] ml-16px">
+        <!-- 附件/备注/变更记录 -->
+        <ContentWrap class="w-[100%]" v-show="current>=tabsList.length-3">
           <!-- 附件组件 -->
-          <Annex
+          <Annex v-show="current===tabsList.length-3"
             :annexData="annexData"
             @handleAnnexSuccess="handleAnnexSuccess"
             @deleteAnnexSuccess="deleteAnnexSuccess"
             :upData="remarksData.data"
           />
           <!-- 备注组件 -->
-          <Remarks
+          <Remarks v-show="current===tabsList.length-2"
             :remarksData="remarksData"
             class="mt-20px"
             @remarksSubmitScuess="remarksSubmitScuess"
           />
           <!-- 变更记录组件 -->
-          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
-        </ContentWrap>
+          <ChangeRecord v-show="current===tabsList.length-1" :changeRecordData="changeRecordData" class="mt-20px" />        </ContentWrap>
       </div>
     </el-drawer>
     <!-- 表格弹窗 -->
@@ -331,8 +329,17 @@ if (props.isBasic == true) {
     ]
   }
 }
-if (tabsList.value) {
-}
+tabsList.value = [...tabsList?.value,{
+    label:'附件',
+    prop:'Annex'
+  },{
+    label:'备注',
+    prop:'Remarks'
+  },{
+    label:'变更记录',
+    prop:'ChangeRecord'
+}]
+
 
 // 附件默认数据
 const annexData = reactive({
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
index f73c66c8f..065f4e4d0 100644
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@@ -1,9 +1,9 @@
 <!-- 备注组件 -->
 <template>
   <div class="annex">
-    <div class="title flex items-center">
+    <!-- <div class="title flex items-center">
       <div class="title-txt">备注</div>
-    </div>
+    </div> -->
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
         <div class="user-icon mt-4px">
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index 74896e9d8..f5fcf4326 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -1,5 +1,5 @@
 <script lang="tsx">
-import { ElTable, ElTableColumn, ElPagination } from 'element-plus'
+import { ElTable, ElTableColumn, ElPagination,ElAffix } from 'element-plus'
 import { defineComponent, PropType, ref, computed, unref, watch, onMounted } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { setIndex } from './helper'
@@ -295,7 +295,7 @@ export default defineComponent({
 
     return () => (
       <div v-loading={unref(getProps).loading}>
-        <ElTable
+        <ElTable class="affix-container"
           // @ts-ignore
           ref={elTableRef}
           data={unref(getProps).data}
@@ -310,15 +310,20 @@ export default defineComponent({
             append: () => getSlot(slots, 'append')
           }}
         </ElTable>
+        
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
-          <ElPagination
-            v-model:pageSize={pageSizeRef.value}
-            v-model:currentPage={currentPageRef.value}
-            class="float-right mb-15px mt-15px"
-            {...unref(pagination)}
-          ></ElPagination>
+          <ElAffix position="bottom" target=".affix-container" offset="50">
+            <ElPagination
+              v-model:pageSize={pageSizeRef.value}
+              v-model:currentPage={currentPageRef.value}
+              class="float-right mb-15px mt-15px"
+              {...unref(pagination)}
+            ></ElPagination>
+          </ElAffix>
+         
         ) : undefined}
+
       </div>
     )
   }
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 46a1e60eb..2c5ae80d5 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -8,6 +8,7 @@ import AppView from './AppView.vue'
 import ToolHeader from './ToolHeader.vue'
 import { ElScrollbar } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'
+import RouterSearch from '@/components/RouterSearch/index.vue'
 
 const { getPrefixCls } = useDesign()
 
@@ -34,6 +35,8 @@ const mobile = computed(() => appStore.getMobile)
 
 // 固定菜单
 const fixedMenu = computed(() => appStore.getFixedMenu)
+// 搜索图片
+const search = computed(() => appStore.search)
 
 export const useRenderLayout = () => {
   const renderClassic = () => {
@@ -58,6 +61,17 @@ export const useRenderLayout = () => {
               style="transition: all var(--transition-time-02);"
             ></Logo>
           ) : undefined}
+          {/* {search.value && !appStore.getCollapse? (<div class={[
+          prefixCls,
+          'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between'
+        ]}> <RouterSearch class={[
+          'bg-[var(--left-menu-bg-color)] relative',
+          {
+            '!pl-0': mobile.value && collapse.value,
+            'w-[var(--left-menu-min-width)]': appStore.getCollapse,
+            'w-[var(--left-menu-max-width)]': !appStore.getCollapse
+          }
+        ]} isModal={false} /> </div>) : undefined} */}
           <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
         </div>
         <div