修改图片和数据确认

src/api/model/orders.js

@@ -11,6 +11,13 @@ export default {
 					return await http.post(this.url, params);
 				},
 			},
+			emailDelete:{
+				url: `${config.API_URL}/mail.sync.delete`,
+				name: "邮件同步记录删除",
+				post: async function (params) {
+					return await http.post(this.url, params);
+				},
+			},
 			info:{
 				url: `${config.API_URL}/mail.sync.body.info`,
 				name: "邮件正文",
@@ -184,6 +191,15 @@ export default {
 				}
 			},
 		},
+		plan:{
+			list:{
+				url: `${config.API_URL}/maintenance.plan.list`,
+				name: "维保计划列表",
+				get: async function (params) {
+					return await http.post(this.url, params);
+				},
+			}
+		},
 		sock: {
 			list:{
 				url: `${config.API_URL}/inventory.list`,

src/assets/icons/JbDelete.vue

@@ -0,0 +1,13 @@
+<template>
+	<svg t="1724942175957" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9740" width="200" height="200"><path d="M629.264 634.784H344.48h284.784l-64.216-64.208s-17.8-21.984 2.792-40.48c0 0 20.24-22.68 47.464 8.376l55.84 55.832 65.616-65.608s24.432-18.144 41.88 6.976c0 0 13.264 15.352-2.792 36.288l-64.216 62.816h210.8v-554.16L344.48 634.784h284.784H344.48l-242.912 231.712 777.592 1.392s36.992-7.328 43.28-43.272v-189.84h-210.8l65.616 65.608s16.752 21.288-2.792 40.48c0 0-17.104 17.096-37.696 0l-65.616-64.208-67.008 65.608s-21.64 16.752-39.088-4.184c0 0-15.008-13.96-2.792-33.504l67-69.792z" fill="#E01F19" p-id="9741"></path></svg>
+</template>
+
+<script>
+export default {
+	name: "JbDelete"
+}
+</script>
+
+<style scoped>
+
+</style>

src/assets/icons/index.js

@@ -54,6 +54,7 @@ export { default as FileDwg } from './file/Dwg.vue'
 export { default as FileTar } from './file/Tar.vue'
 
 // 列表按钮
+export { default as JbDelete } from './JbDelete.vue'
 export { default as Delete } from './Delete.vue'
 export { default as Edit } from './Edit.vue'
 export { default as Review } from './Review.vue'

src/layout/index.vue

@@ -56,7 +56,7 @@
 			<div class="adminui-header-left">
 				<div :class="menuIsCollapse?'logo-bar isCollapse':'logo-bar'">
 					<span v-if="menuIsCollapse">
-						<img class="logo" src="https://dm-wh.oss-cn-shanghai.aliyuncs.com/wh/mobilePhoto/4d6e70dbcb2f27d00da51c5232dea6fb1c87ba63.jpg" alt="">
+						<img class="logo" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/logo.png" alt="">
 					</span>
 					<img v-else class="logo" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/login_logo.png">
 <!--					<span v-else>{{ $CONFIG.APP_NAME }}</span>-->

src/views/order/dataConfirm/index.vue

@@ -24,6 +24,7 @@
 								<div class="total">
 									<el-badge class="badgeItem" :value="item.total_count" :max="99" color="#eeeeee"></el-badge>
 								</div>
+								<div class="deleteBtn" v-auth="'mailDataDelete'" @click.stop="deleteEmail(item)"><el-icon style="font-size: 32px"><sc-icon-JbDelete/></el-icon></div>
 							</div>
 						</div>
 					</el-scrollbar>
@@ -43,9 +44,10 @@
 					<div class="rightBtnMain">
 						<div class="date">{{emailParams.sent_at}}</div>
 						<div class="btnItem">
+							<el-button type="danger" v-auth="'repairDelete'" :disabled="selection.length>0?false:true" plain icon="el-icon-delete" :size="size" @click="deleteEmailDetail"></el-button>
 							<el-button type="primary" v-auth="'mailBodyInfo'" plain :size="size" @click="seeEmail">查看原邮件</el-button>
 							<el-dropdown placement="bottom-start">
-								<el-button type="primary" v-auth="['repairConfirm']" :size="size">确认维保 <el-icon class="el-icon--right"><el-icon-ArrowDown/></el-icon></el-button>
+								<el-button type="primary" v-auth="'repairConfirm'" :size="size">确认维保 <el-icon class="el-icon--right"><el-icon-ArrowDown/></el-icon></el-button>
 								<template #dropdown>
 									<el-dropdown-menu>
 										<el-dropdown-item @click="allDefend('all')">全部入保</el-dropdown-item>
@@ -306,6 +308,17 @@ export default {
 			div.innerHTML = html;
 			return div.textContent || div.innerText || '';
 		},
+		// 删除邮件
+		async deleteEmail(item) {
+			let params = {
+				ids:[item.id]
+			}
+			const res = await this.$API.orders.order.mail.emailDelete.post(params);
+			if(res.code == 200){
+				this.emailId = "";
+				await this.getData();
+			}
+		},
 		// 滚动分页
 		onScroll(event){
 			this.$nextTick(()=>{
@@ -346,8 +359,10 @@ export default {
 				this.total = res.data.total;
 				this.emailData = res.data;
 				this.userColumn = res.data.columnConfig;
-				res.data.mail_info[0].text = this.stripHtmlTags(res.data.mail_info[0].summary)
+				if(res.data.mail_info && res.data.mail_info.length>0){
-				this.emailParams = res.data.mail_info[0];
+					res.data.mail_info[0].text = this.stripHtmlTags(res.data.mail_info[0].summary)
+					this.emailParams = res.data.mail_info[0];
+				}
 
 				if(res.data.tableConfig && res.data.tableConfig.size){
 					this.config = res.data.tableConfig;
@@ -409,6 +424,17 @@ export default {
 				}
 			}
 		},
+		// 删除邮件明细
+		async deleteEmailDetail() {
+			let params = {
+				mail_data_id:this.emailId,
+				ids:this.selection.map(em=> em.id)
+			};
+			const res = await this.$API.orders.order.mail.delete.post(params);
+			if(res.code == 200){
+				await this.getData();
+			}
+		},
 		seeEmail(){
 			eventBus.$emit('tagClose','/order/view-mail',{id:this.emailId});
 		},
@@ -594,7 +620,7 @@ export default {
 	padding: 5px 0;
 	.itemBox{
 		position: relative;
-		padding: 12px 0 12px 10px;
+		padding: 12px 0 12px 15px;
 		cursor: pointer;
 		.text{text-overflow: ellipsis;white-space: nowrap;overflow: hidden;width: calc(100% - 10px);}
 		.name{margin-bottom: 10px;font-size: 14px;font-weight: 600;color: var(--el-color-dark);}
@@ -614,12 +640,31 @@ export default {
 				color: #555555;
 			}
 		}
+		.deleteBtn{
+			position: absolute;
+			bottom: -4px;
+			right: 0;
+			align-items: flex-end;
+			justify-content: center;
+			display: none;
+		}
+	}
+	.itemBox:hover{
+		padding-right: 10px;
+		cursor: pointer;
+	}
+	.itemBox:hover .total{
+		right: 20px;
+	}
+	.itemBox:hover .deleteBtn{
+		display: flex;
+		cursor: pointer;
 	}
 	.itemBox:after{
 		content: "";
 		position: absolute;
 		top: 16px;
-		left: 0;
+		left: 2px;
 		z-index: 20;
 		width: 4px;
 		height: calc(100% - 32px);

src/views/order/orderPlan/index.vue

@@ -86,7 +86,7 @@ export default {
 				show: false,
 			},
 			list: {
-				apiObj: {},
+				apiObj: this.$API.orders.order.plan.list,
 				column: [],
 			},
 			selection: [],