Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/master'

luoyali 1 anno fa
parent
commit
f4484b6904

+ 1 - 1
src/views/approve/myApplication/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap flex-column-page-wrap">
 		<div class="flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
 			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>

+ 1 - 1
src/views/approve/myReceived/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap flex-column-page-wrap">
 		<div class="flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
 			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>

+ 1 - 1
src/views/approve/pendingApproval/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap flex-column-page-wrap">
 		<div class="flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
 			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>

+ 1 - 1
src/views/approve/pendingClaim/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap flex-column-page-wrap">
 		<div class="flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
 			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>

+ 44 - 46
src/views/message/list/index.vue

@@ -1,50 +1,48 @@
 <template>
-	<div class="pageWrap">
-		<div class="flex-column-page-wrap">
-			<!-- 公用搜索组件 -->
-			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
-
-			<!--  LeTable 组件使用  -->
-			<LeTable
-				ref="tableRef"
-				v-model:searchParams="tableOpts.searchParams"
-				v-bind="tableOpts"
-				v-model:curRow="tableOpts.curRow"
-				v-model:checked-options="checkedColumns"
-				:columns="activeColumns"
-			>
-				<template #toolLeft>
-					<el-button type="primary">全部标记已读</el-button>
-					<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
-						<el-icon class="btn-icon">
+	<div class="flex-column-page-wrap pageWrap">
+		<!-- 公用搜索组件 -->
+		<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>
+
+		<!--  LeTable 组件使用  -->
+		<LeTable
+			ref="tableRef"
+			v-model:searchParams="tableOpts.searchParams"
+			v-bind="tableOpts"
+			v-model:curRow="tableOpts.curRow"
+			v-model:checked-options="checkedColumns"
+			:columns="activeColumns"
+		>
+			<template #toolLeft>
+				<el-button type="primary">全部标记已读</el-button>
+				<el-button type="danger" :disabled="curSelectionRows.length === 0" @click="batch_del">
+					<el-icon class="btn-icon">
+						<Delete />
+					</el-icon>
+				</el-button>
+			</template>
+
+			<template #categorySlot="scope">
+				<el-tag v-if="scope.row.category === 0" size="small" effect="plain">通知公告</el-tag>
+				<el-tag v-if="scope.row.category === 1" size="small" type="info" effect="plain">系统消息</el-tag>
+				<el-tag v-if="scope.row.category === 2" size="small" type="warning" effect="plain">待办通知</el-tag>
+			</template>
+
+			<template #actionSlot="scope">
+				<el-tooltip content="查看" placement="bottom" effect="light">
+					<el-icon class="ibt0" @click="openDetail(scope.row)">
+						<View />
+					</el-icon>
+				</el-tooltip>
+				<el-divider direction="vertical"></el-divider>
+				<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row)">
+					<template #reference>
+						<el-icon class="ibt0">
 							<Delete />
 						</el-icon>
-					</el-button>
-				</template>
-
-				<template #categorySlot="scope">
-					<el-tag v-if="scope.row.category === 0" size="small" effect="plain">通知公告</el-tag>
-					<el-tag v-if="scope.row.category === 1" size="small" type="info" effect="plain">系统消息</el-tag>
-					<el-tag v-if="scope.row.category === 2" size="small" type="warning" effect="plain">待办通知</el-tag>
-				</template>
-
-				<template #actionSlot="scope">
-					<el-tooltip content="查看" placement="bottom" effect="light">
-						<el-icon class="ibt0" @click="openDetail(scope.row)">
-							<View />
-						</el-icon>
-					</el-tooltip>
-					<el-divider direction="vertical"></el-divider>
-					<el-popconfirm title="确定删除吗?" @confirm="table_del(scope.row)">
-						<template #reference>
-							<el-icon class="ibt0">
-								<Delete />
-							</el-icon>
-						</template>
-					</el-popconfirm>
-				</template>
-			</LeTable>
-		</div>
+					</template>
+				</el-popconfirm>
+			</template>
+		</LeTable>
 
 		<message-detail v-if="visibleDetail" v-model="visibleDetail" :message-id="currentId" @closed="visibleDetail = false"> </message-detail>
 	</div>
@@ -55,8 +53,8 @@ import { nextTick, ref, watch } from 'vue'
 import { useTablePage } from '@/hooks/useTablePage'
 import MessageDetail from './detail.vue'
 import { useRoute } from 'vue-router'
-import {Delete} from "@element-plus/icons-vue";
-import {ElMessage} from "element-plus";
+import { Delete } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
 
 const route = useRoute()
 const visibleDetail = ref(false) // 权限设置弹窗显示隐藏

+ 1 - 1
src/views/message/list/my.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="pageWrap">
+	<div class="pageWrap flex-column-page-wrap">
 		<div class="flex-column-page-wrap">
 			<!-- 公用搜索组件 -->
 			<LeSearchForm ref="searchForm" v-model:searchData="searchData" :forms="forms" :loading="tableOpts.options.loading"> </LeSearchForm>