微调

src/utils/filter.js

@@ -22,7 +22,7 @@ Vue.filter('ellipsis', function (value, vlength = 25) {
   if(!value){
     return "";
   }
-  console.log('vlength: '+ vlength);
+  // console.log('vlength: '+ vlength);
   if (value.length > vlength) {
     return value.slice(0, vlength) + '...'
   }

src/views/activiti/form/demoForm2.vue

@@ -173,6 +173,7 @@ export default {
             },
             postInfo: {},//职位信息
             deptInfo: {},//部门信息
+            workNoInfo: {},//工号信息
             itemModelNameList: [], // 子表字段名
             buttonArr:[],
             printDisable:false//打印按钮
@@ -342,6 +343,7 @@ export default {
                                     user.value = user.username
                                     that.postInfo[user.username] = user.post
                                     that.deptInfo[user.username] = user.deptName
+                                    that.workNoInfo[user.username] = user.workNo
                                 })
                                 // 存到动态数据源中
                                 this.dynamicData.userList = userData.result.records
@@ -723,6 +725,9 @@ export default {
                                if(that.processData.businessTable == 'separation_application'){//离职申请
                                  that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})   
                                }
+                               if(that.processData.businessTable == 'expense_account'){//报销单
+                                 that.$refs.KFB.setData({work_no:that.workNoInfo[that.$store.getters.userInfo.username]})   
+                               }
                                if(that.processData.businessTable == 'bwg_house_duty'){ // 技能博物馆--全馆值班 --默认当前登陆人
                                  that.$refs.KFB.setData({referrer:that.$store.getters.nickname})  
                                  that.dynamicData.personListJn.map(item =>{
@@ -981,6 +986,9 @@ export default {
           if(key == 'employee_name' && this.processData.businessTable == 'separation_application'){//离职申请
             this.$refs.KFB.setData({job_title:this.postInfo[value]})   
           }
+          if(key == 'reimbursement_applicant' && this.processData.businessTable == 'expense_account'){//报销单
+            this.$refs.KFB.setData({work_no:this.workNoInfo[value]})   
+          }
            
           //森语-质量事故单
           if(key=='child&incident_ticket_children'){

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -682,6 +682,7 @@
     },
     created() { 
       var ccode =  this.$route.query.id; 
+      this.factorySignatureUrl = '';
     if (ccode != undefined && ccode != ""){
       this.visible=true
       this.showFooter=false
@@ -712,14 +713,18 @@
       push(){
         this.visibleTs = false
         var pushOk = 'yes'
-        this.incidentTicketChildrenTable.dataSource.every(item=>{
-          if(item.zhanghaoId==''||!item.zhanghaoId){
-              this.$message.warning('请选择账套号！')
-              pushOk = 'no'
-               return false;
-            }
-            return true
-        })
+        console.log("sssssssssssssssss",this.formState.isConfirm);
+        if(this.formState.isConfirm !='1'){
+          this.incidentTicketChildrenTable.dataSource.every(item=>{
+            if(item.zhanghaoId==''||!item.zhanghaoId){
+                this.$message.warning('请选择账套号！')
+                pushOk = 'no'
+                 return false;
+              }
+              return true
+          })
+        }
+        
         if(pushOk=='yes'){
           this.confirmLoading = true
           getAction('/oa/incidentTicket/propelling', {headId:this.formState.id}).then((res) => {
@@ -770,6 +775,8 @@
         })
       },
       getHeaderList(id){
+        
+        this.factorySignatureUrl = '';
         getAction('/oa/incidentTicket/queryById', {id:id}).then((res) => {
           if(res.success){
             var zhuId = '' //主表id
@@ -896,13 +903,13 @@
              
               textArea[i].style.height = '100px';// 先设置成auto，再设置高度，删除文字的时候高度才会改变
               if(textArea[i].value.length > 1000){
-                textArea[i].style.height = textArea[i].scrollHeight+200 + 'px'
+                textArea[i].style.height = textArea[i].scrollHeight+100 + 'px'
               }else if(textArea[i].value.length > 900){
-                textArea[i].style.height = textArea[i].scrollHeight+175 + 'px'
+                textArea[i].style.height = textArea[i].scrollHeight+100 + 'px'
               }else if(textArea[i].value.length > 750){
-                textArea[i].style.height = textArea[i].scrollHeight+150 + 'px'
+                textArea[i].style.height = textArea[i].scrollHeight+100 + 'px'
               }else if(textArea[i].value.length > 600){
-                textArea[i].style.height = textArea[i].scrollHeight+120 + 'px'
+                textArea[i].style.height = textArea[i].scrollHeight+100 + 'px'
               }else if(textArea[i].value.length > 300){
                 textArea[i].style.height = textArea[i].scrollHeight+80 + 'px'
               }else if(textArea[i].value.length > 200){
@@ -911,10 +918,27 @@
                  textArea[i].style.height = textArea[i].scrollHeight+30 + 'px'
               }
              
+             //  textArea[i].style.height = '100px';// 先设置成auto，再设置高度，删除文字的时候高度才会改变
+             //  if(textArea[i].value.length > 1000){
+             //    textArea[i].style.height = textArea[i].scrollHeight+200 + 'px'
+             //  }else if(textArea[i].value.length > 900){
+             //    textArea[i].style.height = textArea[i].scrollHeight+175 + 'px'
+             //  }else if(textArea[i].value.length > 750){
+             //    textArea[i].style.height = textArea[i].scrollHeight+150 + 'px'
+             //  }else if(textArea[i].value.length > 600){
+             //    textArea[i].style.height = textArea[i].scrollHeight+120 + 'px'
+             //  }else if(textArea[i].value.length > 300){
+             //    textArea[i].style.height = textArea[i].scrollHeight+80 + 'px'
+             //  }else if(textArea[i].value.length > 200){
+             //    textArea[i].style.height = textArea[i].scrollHeight+60 + 'px'
+             //  }else{
+             //     textArea[i].style.height = textArea[i].scrollHeight+30 + 'px'
+             //  }
+             
             } 
             win.print();
             win.close();
-         },1000)
+         },1500)
         
         })