diff --git a/public/favicon.ico b/public/favicon.ico
index bb4651c..d186dd7 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/img/logo1.png b/public/img/logo1.png
index d483520..d186dd7 100644
Binary files a/public/img/logo1.png and b/public/img/logo1.png differ
diff --git a/src/api/model/orders.js b/src/api/model/orders.js
index a872148..e287864 100644
--- a/src/api/model/orders.js
+++ b/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`,
diff --git a/src/assets/icons/JbDelete.vue b/src/assets/icons/JbDelete.vue
new file mode 100644
index 0000000..7af94d2
--- /dev/null
+++ b/src/assets/icons/JbDelete.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index 3c548e4..9af9ddb 100644
--- a/src/assets/icons/index.js
+++ b/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'
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 273e4bc..003d353 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -56,7 +56,7 @@
@@ -43,9 +44,10 @@
{{emailParams.sent_at}}
+
查看原邮件
- 确认维保
+ 确认维保
全部入保
@@ -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)
- this.emailParams = res.data.mail_info[0];
+ if(res.data.mail_info && res.data.mail_info.length>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);
diff --git a/src/views/order/orderPlan/index.vue b/src/views/order/orderPlan/index.vue
index 6eb9e19..959a5c7 100644
--- a/src/views/order/orderPlan/index.vue
+++ b/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: [],