From 1479d12d8bde8541df97dd445d09aca8799e6d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Sat, 3 Aug 2024 20:45:10 +0800
Subject: [PATCH] up

---
 src/views/order/dataConfirm/index.vue | 64 +++++++++++++++++++++------
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue
index 59f2e88..b2830a0 100644
--- a/src/views/order/dataConfirm/index.vue
+++ b/src/views/order/dataConfirm/index.vue
@@ -10,7 +10,7 @@
 						<span class="item part">部分确认</span>
 					</span>
 				</el-header>
-				<el-main class="nopadding">
+				<el-main class="nopadding" v-loading="listLoading" element-loading-text="加载中...">
 					<el-scrollbar height="100%">
 						<div class="emailMain">
 							<div class="itemBox" :class="[item.is_confirm===0?'notStarted':'complete', emailId == item.id?'itemTrue':'']" v-for="item in confirmList" :key="item" @click="()=>{this.emailChange(item);}">
@@ -27,16 +27,31 @@
 				</el-main>
 			</el-container>
 		</el-aside>
-		<el-container class="mainHeaderNoBorderPadding" v-loading="loading">
+		<el-container class="mainHeaderNoBorderPadding" v-loading="loading" element-loading-text="加载中...">
 			<el-main class="nopadding emailMiddle">
 				<div class="emailContent">
 					<div class="title">【邮件名称】{{emailParams.subject}}</div>
 					<div class="fromPeople itemText"><span class="text">发件人：</span>{{emailParams.from && emailParams.from.email}} {{emailParams.from && emailParams.from.name?'('+emailParams.from.name+')':''}}</div>
-					<div class="date itemText"><span class="text">时&nbsp;&nbsp;&nbsp;间：</span> {{emailParams.sent_at}}</div>
 					<div class="receivingPeople itemText"><span class="text">收件人：</span>{{emailParams.source_email}}</div>
 					<div class="theme itemText">
 						<span class="text">摘&nbsp;&nbsp;&nbsp;要：</span><span v-html="emailParams.text"></span>
 					</div>
+
+					<div class="rightBtnMain">
+						<div class="date">{{emailParams.sent_at}}</div>
+						<div class="btnItem">
+							<el-button type="primary" plain :size="size">查看原邮件</el-button>
+							<el-dropdown placement="bottom-start">
+								<el-button type="primary" :size="size" style="margin-right: 12px;">确认维保 <el-icon class="el-icon--right"><el-icon-ArrowDown/></el-icon></el-button>
+								<template #dropdown>
+									<el-dropdown-menu>
+										<el-dropdown-item>全部入保</el-dropdown-item>
+										<el-dropdown-item>部分入保</el-dropdown-item>
+									</el-dropdown-menu>
+								</template>
+							</el-dropdown>
+						</div>
+					</div>
 				</div>
 				<div class="emailBody">
 					<div class="searchMain " style="padding-left: 10px;">
@@ -83,6 +98,9 @@
 						</div>
 					</div>
 					<div class="scTable-page">
+						<div class="scTable-pagination">
+							<el-pagination background :small="true" :layout="paginationLayout" :total="total" :page-size="scPageSize" :page-sizes="pageSizes" v-model:currentPage="currentPage" @current-change="paginationChange" @update:page-size="pageSizeChange"></el-pagination>
+						</div>
 						<div class="scTable-do">
 							<el-button @click="reset" icon="el-icon-refresh" circle style="margin-left:15px"></el-button>
 							<el-popover placement="top" title="列设置" :width="500" trigger="click" :hide-after="0" @show="customColumnShow=true" @after-leave="customColumnShow=false">
@@ -110,9 +128,6 @@
 								</el-form>
 							</el-popover>
 						</div>
-						<div class="scTable-pagination">
-							<el-pagination background :small="true" :layout="paginationLayout" :total="total" :page-size="scPageSize" :page-sizes="pageSizes" v-model:currentPage="currentPage" @current-change="paginationChange" @update:page-size="pageSizeChange"></el-pagination>
-						</div>
 					</div>
 				</div>
 			</el-main>
@@ -138,6 +153,7 @@ export default {
 				show: false,
 			},
 			confirmList:[],
+			listLoading:false,
 
 			emailId:'',
 			searchShow:false,
@@ -179,6 +195,7 @@ export default {
 	},
 	methods: {
 		async getData() {
+			this.listLoading = true;
 			const res = await this.$API.orders.order.mail.list.get();
 			if(res.code == 200){
 				if(res.data.rows && res.data.rows.length>0){
@@ -189,6 +206,7 @@ export default {
 					await this.emailChange(res.data.rows[5])
 				}
 			}
+			this.listLoading = false;
 		},
 		stripHtmlTags(html) {
 			const div = document.createElement('div');
@@ -286,6 +304,14 @@ export default {
 			}
 			this.$refs.columnSetting.isSave = false
 		},
+		async configSizeChange() {
+			try {
+				await config.columnSettingConfigSave(this.tableName, this.config, this.apiObj);
+				this.$message.success('保存成功')
+			} catch (error) {
+				this.$message.error('保存失败')
+			}
+		},
 	}
 }
 </script>
@@ -321,7 +347,6 @@ export default {
 .emailMain{
 	padding: 5px 0;
 	.itemBox{
-		//box-shadow: 0 1px 1px rgba(0,0,0,0.08);
 		position: relative;
 		padding: 12px 0 12px 10px;
 		cursor: pointer;
@@ -347,10 +372,12 @@ export default {
 	.itemBox:after{
 		content: "";
 		position: absolute;
-		bottom: 0;
-		left: 10px;
-		width: calc(100% - 25px);
-		height: 2px;
+		top: 16px;
+		left: 0;
+		z-index: 20;
+		width: 4px;
+		height: calc(100% - 32px);
+		border-radius: 4px;
 	}
 	.itemTrue{
 		background: #EFF5FF;
@@ -367,6 +394,7 @@ export default {
 		box-shadow: 0 1px 1px rgba(0,0,0,0.06);
 		padding: 10px 5px 10px 10px;
 		color: var(--el-color-dark);
+		position: relative;
 		.title{
 			font-weight: 600;
 			font-size: 14px;
@@ -391,6 +419,14 @@ export default {
 		.theme{
 			line-height: 20px;
 		}
+		.rightBtnMain{
+			position: absolute;
+			right: 10px;
+			top: 10px;
+			.date{
+				text-align: right;
+			}
+		}
 	}
 	.emailBody{
 		flex: 1;
@@ -398,16 +434,16 @@ export default {
 		display: flex;flex-direction: column;
 	}
 	.annex{
-		flex-basis: 100px;
 		padding: 10px;
 		overflow: hidden;
-		display: flex;justify-content: space-between;
+		display: flex;flex-direction: column;justify-content: space-between;
 		.down{
 			color: var(--el-color-primary);
 			cursor: pointer;
 		}
 		.annexMain{
 			width: 320px;
+			margin-bottom: 10px;
 			.itemBox{
 				margin-top: 8px;
 				border-radius: 4px;
@@ -427,7 +463,7 @@ export default {
 		}
 		.scTable-page{
 			flex: 1;
-			display: flex;flex-direction: column;justify-content: space-between;align-items: flex-end;
+			display: flex;flex-direction: row;justify-content: space-between;align-items: flex-end;
 		}
 	}
 }