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

src/cas/sso.js

@@ -9,6 +9,8 @@ const init = (callback) => {
   let token = Vue.ls.get(ACCESS_TOKEN);
   let st = getUrlParam("ticket");
   var sevice = "http://"+window.location.host+"/";
+  // console.log("-------单点登1录开始-------",st);
+  // console.log("-------单点登2录开始-------",sevice);
   if(token){
     loginSuccess(callback);
   }else{
@@ -28,7 +30,8 @@ const SSO = {
 function getUrlParam(paraName) {
   var url = document.location.toString();
   var arrObj = url.split("?");
-
+// console.log("-------单点登3录开始-------",url);
+// console.log("-------单点登4录开始-------",arrObj);
   if (arrObj.length > 1) {
     var arrPara = arrObj[1].split("&");
     var arr;

src/store/modules/user.js

@@ -200,9 +200,9 @@ const user = {
         commit('SET_TOKEN', '')
         commit('SET_PERMISSIONLIST', [])
         
-        commit('SET_INFO', '')
-        commit('SET_NAME', {})
-        commit('SET_AVATAR', '')
+        // commit('SET_INFO', '')
+        // commit('SET_NAME', {})
+        // commit('SET_AVATAR', '')
         
         Vue.ls.remove(ACCESS_TOKEN)
         Vue.ls.remove(USER_INFO)
@@ -215,11 +215,13 @@ const user = {
             let serviceUrl = encodeURIComponent(sevice)
             // window.location.href = process.env.VUE_APP_CAS_BASE_URL + '/logout?service=' + serviceUrl
             window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
-            resolve()
+            // resolve()
             // setTimeout(function(){
-            //   resolve()
-            // },0)
+            //   window.location.href = 'http://www.myfitt.cn:18086/';
+            //   // resolve()
+            // },110)
         }).catch(() => {
+          console.log("1111111111111111111111111111111111111111111111111111")
           resolve()
         })
       })

src/views/activiti/form/demoForm2.vue

@@ -541,19 +541,38 @@ export default {
                         // 赋值
                         this.$refs.KFB.setData(this.data)
                         this.btndisabled = false
-                        
-                        if(this.processData.status == 2){
+                        // debugger
+                        // console.log(this.processData);
+                        if(this.processData.result == 2){
                           this.printTitle = true;
                           
-                          if(this.processData.businessTable == 'meeting_summary'){
-                            let leadership_pass = this.$refs.KFB.form.getFieldValue('leadership_pass');
-                            if(leadership_pass == 2){
-                              this.printTitleImg = false;
-                            }else{
-                              this.printTitleImg = true;
-                            }
-                          }else{
+                          if(this.processData.businessTable == 'meeting_summary'){ //会议纪要
+                              let leadership_pass = this.$refs.KFB.form.getFieldValue('leadership_pass');
+                              if(leadership_pass == 2){
+                                this.printTitleImg = false;
+                              }else{
+                                this.printTitleImg = true;
+                              }
+                          }else if(this.processData.businessTable == 'separation_application' || //离职
+                                  this.processData.businessTable == 'personnel_recruitment_apply' || //人员需求
+                                  this.processData.businessTable == 'supplieses_apply_a' || //物资申请
+                                  this.processData.businessTable == 'regular_employee_apply' || //转正申请
+                                  this.processData.businessTable == 'incident_ticket' || //质量事故单
+                                  this.processData.businessTable == 'welfare'){ //福利发放单
+                                  
                             this.printTitleImg = true;
+                            
+                          }else if(this.processData.businessTable == 'expense_account'){//报销单
+                          
+                              let expense_type = this.$refs.KFB.form.getFieldValue('expense_type');
+                              if(expense_type != '差旅费报销'){ //业务需求报销/日常用品报销需要，其他不需要
+                                this.printTitleImg = true;
+                              }else{
+                                this.printTitleImg = false;
+                              }
+                              
+                          }else{
+                            this.printTitleImg = false;
                           }
                          
                         }else{

src/views/dashboard/MyToDo.vue

@@ -52,7 +52,8 @@
       <a-col :xs="24" :sm="24" :md="24" :lg="6" :style="{ marginBottom: '8px',}">
         <!-- 等高设置 -->
         <a-card title="常用流程" :bordered="false" style="height: 250px;">
-          <div v-for="(item, index) in activeKeyAll.slice(5, 10)" :key="index" class="oaBig">
+          <!-- <div v-for="(item, index) in activeKeyAll.slice(5, 10)" :key="index" class="oaBig"> -->
+          <div v-for="(item, index) in activeKeyAll.slice(0, 6)" :key="index" class="oaBig">
             <a @click.prevent="aClick(item)" class="oaItem fl">
               <!-- 图标 -->
               <a-avatar shape="square" :size="36" :src="item.iconAddress" />