From dd43c95c5a020c1a828263cc5944ed6fb644b65d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:53:18 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/~mayuhao/HazardInvestigationSystem
---
src/views/specialWorkManage/workTicket/allApplys/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/specialWorkManage/workTicket/allApplys/index.vue b/src/views/specialWorkManage/workTicket/allApplys/index.vue
index 8668440..b5adbad 100644
--- a/src/views/specialWorkManage/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkManage/workTicket/allApplys/index.vue
@@ -315,7 +315,7 @@
} else {
this.$message({
type: 'warning',
- message: res.data.msg
+ message: res.data.msg || '导出失败'
});
}
})
@@ -395,15 +395,15 @@
this.dialogType = row.workType
this.details = JSON.parse(JSON.stringify(row));
this.details.operators = this.details.operators.join('、')
- if(this.details.workDetail.otherSpecialWork == '' || !this.details.workDetail.otherSpecialWork){
- this.details.workDetail.otherSpecialWork = ''
- }
- else {
- const a = this.details.workDetail.otherSpecialWork
- this.details.workDetail.otherSpecialWork = a.split(',').map((item) => {
- return this.workType.find((i) => i.id === Number(item)).name;
- }).join('、');
- }
+ // if(this.details.workDetail.otherSpecialWork == '' || !this.details.workDetail.otherSpecialWork){
+ // this.details.workDetail.otherSpecialWork = ''
+ // }
+ // else {
+ // const a = this.details.workDetail.otherSpecialWork
+ // this.details.workDetail.otherSpecialWork = a.split(',').map((item) => {
+ // return this.workType.find((i) => i.id === Number(item)).name;
+ // }).join('、');
+ // }
if(this.details.workDetail.involvedDepIds == '' || !this.details.workDetail.involvedDepIds){
this.details.workDetail.involvedDepIds = ''
}
--
Gitblit v1.9.2