Browse Source

添加昨天丢失代码内容:

1、修改备注,附件,变更记录位置 2、搜索框移动菜单栏(隐藏)
master_hella_20240701
yufei0306 11 months ago
parent
commit
70f0e0de61
  1. 4
      src/components/Annex/src/Annex.vue
  2. 4
      src/components/ChangeRecord/src/ChangeRecord.vue
  3. 29
      src/components/Detail/src/Detail.vue
  4. 4
      src/components/Remarks/src/Remarks.vue
  5. 9
      src/components/Table/src/Table.vue
  6. 14
      src/layout/components/useRenderLayout.tsx

4
src/components/Annex/src/Annex.vue

@ -2,7 +2,7 @@
<template> <template>
<div class="annex"> <div class="annex">
<div class="title flex items-center"> <div class="title flex items-center">
<div class="title-txt">附件</div> <!-- <div class="title-txt">附件</div> -->
<UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData" <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件" :upData="upData"
@update:modelValue="handleAnnexSuccess" /> @update:modelValue="handleAnnexSuccess" />
</div> </div>
@ -72,7 +72,7 @@ const downFile = (item)=>{
<style scoped lang="scss"> <style scoped lang="scss">
.title { .title {
border-bottom: 1px solid #dedede; border-bottom: 1px solid #dedede;
justify-content: space-between; justify-content: flex-end;
.title-txt { .title-txt {
width: 80px; width: 80px;

4
src/components/ChangeRecord/src/ChangeRecord.vue

@ -1,9 +1,9 @@
<!-- 变更记录组件 --> <!-- 变更记录组件 -->
<template> <template>
<div class="annex"> <div class="annex">
<div class="title flex items-center"> <!-- <div class="title flex items-center">
<div class="title-txt">变更记录</div> <div class="title-txt">变更记录</div>
</div> </div> -->
<div class="list"> <div class="list">
<el-steps direction="vertical" class="mt-16px" :space="90"> <el-steps direction="vertical" class="mt-16px" :space="90">
<el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index"> <el-step v-for="(item, index) in changeRecordData.changeRecordList" :key="index">

29
src/components/Detail/src/Detail.vue

@ -28,8 +28,7 @@
<Tabs :tabsList="tabsList" :current="current" @change="change" /> <Tabs :tabsList="tabsList" :current="current" @change="change" />
<div class="flex"> <div class="flex">
<!-- 详情 --> <!-- 详情 -->
<ContentWrap class="w-[73%]"> <ContentWrap class="w-[100%]" v-show="current<tabsList.length-3"> <!-- 列表头部 -->
<!-- 列表头部 -->
<TableHead <TableHead
v-if="!isBasic" v-if="!isBasic"
:HeadButttondata="HeadButttondata" :HeadButttondata="HeadButttondata"
@ -73,8 +72,7 @@
v-model:currentPage="tableObjectRef.currentPage" v-model:currentPage="tableObjectRef.currentPage"
> >
<template #photos="{ row }"> <template #photos="{ row }">
<div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div> <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div> </template>
</template>
<template #action="{ row }"> <template #action="{ row }">
<ButtonBase <ButtonBase
:Butttondata="buttondata" :Butttondata="buttondata"
@ -98,23 +96,23 @@
</template> </template>
</DetailTable> </DetailTable>
</ContentWrap> </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" :annexData="annexData"
@handleAnnexSuccess="handleAnnexSuccess" @handleAnnexSuccess="handleAnnexSuccess"
@deleteAnnexSuccess="deleteAnnexSuccess" @deleteAnnexSuccess="deleteAnnexSuccess"
:upData="remarksData.data" :upData="remarksData.data"
/> />
<!-- 备注组件 --> <!-- 备注组件 -->
<Remarks <Remarks v-show="current===tabsList.length-2"
:remarksData="remarksData" :remarksData="remarksData"
class="mt-20px" class="mt-20px"
@remarksSubmitScuess="remarksSubmitScuess" @remarksSubmitScuess="remarksSubmitScuess"
/> />
<!-- 变更记录组件 --> <!-- 变更记录组件 -->
<ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" /> <ChangeRecord v-show="current===tabsList.length-1" :changeRecordData="changeRecordData" class="mt-20px" /> </ContentWrap>
</ContentWrap>
</div> </div>
</el-drawer> </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({ const annexData = reactive({

4
src/components/Remarks/src/Remarks.vue

@ -1,9 +1,9 @@
<!-- 备注组件 --> <!-- 备注组件 -->
<template> <template>
<div class="annex"> <div class="annex">
<div class="title flex items-center"> <!-- <div class="title flex items-center">
<div class="title-txt">备注</div> <div class="title-txt">备注</div>
</div> </div> -->
<div class="list"> <div class="list">
<div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index"> <div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
<div class="user-icon mt-4px"> <div class="user-icon mt-4px">

9
src/components/Table/src/Table.vue

@ -1,5 +1,5 @@
<script lang="tsx"> <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 { defineComponent, PropType, ref, computed, unref, watch, onMounted } from 'vue'
import { propTypes } from '@/utils/propTypes' import { propTypes } from '@/utils/propTypes'
import { setIndex } from './helper' import { setIndex } from './helper'
@ -295,7 +295,7 @@ export default defineComponent({
return () => ( return () => (
<div v-loading={unref(getProps).loading}> <div v-loading={unref(getProps).loading}>
<ElTable <ElTable class="affix-container"
// @ts-ignore // @ts-ignore
ref={elTableRef} ref={elTableRef}
data={unref(getProps).data} data={unref(getProps).data}
@ -310,15 +310,20 @@ export default defineComponent({
append: () => getSlot(slots, 'append') append: () => getSlot(slots, 'append')
}} }}
</ElTable> </ElTable>
{unref(getProps).pagination ? ( {unref(getProps).pagination ? (
// update by Pagination // update by Pagination
<ElAffix position="bottom" target=".affix-container" offset="50">
<ElPagination <ElPagination
v-model:pageSize={pageSizeRef.value} v-model:pageSize={pageSizeRef.value}
v-model:currentPage={currentPageRef.value} v-model:currentPage={currentPageRef.value}
class="float-right mb-15px mt-15px" class="float-right mb-15px mt-15px"
{...unref(pagination)} {...unref(pagination)}
></ElPagination> ></ElPagination>
</ElAffix>
) : undefined} ) : undefined}
</div> </div>
) )
} }

14
src/layout/components/useRenderLayout.tsx

@ -8,6 +8,7 @@ import AppView from './AppView.vue'
import ToolHeader from './ToolHeader.vue' import ToolHeader from './ToolHeader.vue'
import { ElScrollbar } from 'element-plus' import { ElScrollbar } from 'element-plus'
import { useDesign } from '@/hooks/web/useDesign' import { useDesign } from '@/hooks/web/useDesign'
import RouterSearch from '@/components/RouterSearch/index.vue'
const { getPrefixCls } = useDesign() const { getPrefixCls } = useDesign()
@ -34,6 +35,8 @@ const mobile = computed(() => appStore.getMobile)
// 固定菜单 // 固定菜单
const fixedMenu = computed(() => appStore.getFixedMenu) const fixedMenu = computed(() => appStore.getFixedMenu)
// 搜索图片
const search = computed(() => appStore.search)
export const useRenderLayout = () => { export const useRenderLayout = () => {
const renderClassic = () => { const renderClassic = () => {
@ -58,6 +61,17 @@ export const useRenderLayout = () => {
style="transition: all var(--transition-time-02);" style="transition: all var(--transition-time-02);"
></Logo> ></Logo>
) : undefined} ) : 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> <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
</div> </div>
<div <div

Loading…
Cancel
Save