Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/oa/modules/IncidentTicketModal.vue

@@ -473,7 +473,11 @@
           if(res.success){
             var noticeList =[]
             res.result.map(item=>{
-              noticeList.push(item.userName)
+              if(item.confirm != null && item.confirm != '' && item.confirm != '否'){
+                noticeList.push(item.userName+'('+item.confirm+')')
+              }else{
+                noticeList.push(item.userName+'')
+              }
             })
             this.formState.Noticer = noticeList.toString()
             console.log(this.formState.Noticer)

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -602,7 +602,12 @@
           if(res.success){
             var noticeList =[]
             res.result.map(item=>{
-              noticeList.push(item.userName)
+              if(item.confirm != null && item.confirm != '' && item.confirm != '否'){
+                noticeList.push(item.userName+'('+item.confirm+')')
+              }else{
+                noticeList.push(item.userName+'')
+              }
+              
             })
             this.formState.Noticer = noticeList.toString()
             this.$forceUpdate()