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

src/views/activiti/form/demoForm2.vue

@@ -4,7 +4,7 @@
       
       <a-button v-if="printMould" :href="printMouldUrl"  target="_blank" 
       ghost type="primary">模板打印</a-button>
-      <a-button v-print="'#printContent'" ghost type="primary">打印</a-button>
+      <a-button v-if="printShow" v-print="'#printContent'" ghost type="primary">打印</a-button>
     </div>
     <a-card :body-style="{ padding: '15px 32px' }" :bordered="false" id="printContent"  :class="{'abcdefg':true}" >
 
@@ -123,6 +123,7 @@ export default {
     data () {
         return {
             printMould:false,
+            printShow:true,
             printMouldUrl:'',
             printTitle:false,
             printTitleImg:false,
@@ -554,6 +555,9 @@ export default {
                               }else{
                                 this.printTitleImg = true;
                               }
+                          }else if(this.processData.businessTable == 'incident_ticket'){ //质量事故单
+                            this.printTitleImg = true;                    
+                            this.printShow = false;                            
                           }else if(this.processData.businessTable == 'separation_application' || //离职
                                   this.processData.businessTable == 'personnel_recruitment_apply' || //人员需求
                                   this.processData.businessTable == 'regular_employee_apply' || //转正申请

src/views/oa/modules/IncidentTicketModal.vue

@@ -540,7 +540,7 @@
               }
             })
             this.formState.Noticer =(noticeList!==''&&noticeList)?noticeList.toString():''
-            this.formState.createTime = (res.result[0].createTime!==''&&res.result[0].createTime)? moment(res.result[0].createTime).format('YYYY-MM-DD hh:mm:ss'):''
+            this.formState.createTime = (res.result[0].createTime!==''&&res.result[0].createTime)? moment(res.result[0].createTime).format('yyyy-MM-dd HH:mm:ss'):''
             console.log(this.formState.Noticer)
             this.$forceUpdate()
           }else{

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -779,7 +779,7 @@
               
             })
             this.formState.Noticer = noticeList.toString()
-            this.formState.createTime = (res.result[0].createTime!==''&&res.result[0].createTime)? moment(res.result[0].createTime).format('YYYY-MM-DD hh:mm:ss'):''
+            this.formState.createTime = (res.result[0].createTime!==''&&res.result[0].createTime)? moment(res.result[0].createTime).format('yyyy-MM-dd HH:mm:ss'):''
             this.$forceUpdate()
           }else{
             this.formState.Noticer = ''