Merge remote-tracking branch 'origin/dev' into dev

src/components/jeecgbiz/JSelectDepart.vue

@@ -71,7 +71,6 @@
       }
     },
     mounted(){
-      console.log("this.valueXX",this.value)
       this.departIds = this.value
     },
     watch:{

src/store/modules/user.js

@@ -13,7 +13,7 @@ import {
   USER_INFORMATION,
   PUWWC_Id,
   IS_PROJECT,
-  ASIDE_MEAN
+  ASIDE_MEAN, DEPART_ID
 } from '@/store/mutation-types'
 import { welcome } from "@/utils/util"
 import { queryPermissionsByUser } from '@/api/api'
@@ -132,7 +132,7 @@ const user = {
     GetPermissionList({ commit }) {
       return new Promise((resolve, reject) => {
         queryPermissionsByUser().then(response => {
-          console.log(response)
+
           const menuData = response.result.menu;
           const authData = response.result.auth;
           const allAuthData = response.result.allAuth;
@@ -140,6 +140,7 @@ const user = {
           const puwwcId=response.result.puwwcId;
           const  isProject=response.result.isProject;
           const userInformation=response.result.userInfo;
+          console.log("登录信息》》》》》》》》》》》》》》》》》》》》》》",userInformation)
           //Vue.ls.set(USER_AUTH,authData);
           sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
           sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
@@ -152,11 +153,12 @@ const user = {
           if (isProject){
             sessionStorage.setItem(IS_PROJECT,JSON.stringify(isProject));
           }
-          if (Vue.ls.get(USER_INFO)){
-            sessionStorage.setItem(USER_INFORMATION,JSON.stringify(Vue.ls.get(USER_INFO)));
-          }else {
-            sessionStorage.setItem(USER_INFORMATION,JSON.stringify(userInformation));
-          }
+          // if (Vue.ls.get(USER_INFO)){
+          //   sessionStorage.setItem(USER_INFORMATION,JSON.stringify(Vue.ls.get(USER_INFO)));
+          // }else {
+          if (userInformation){
+            sessionStorage.setItem(USER_INFORMATION,JSON.stringify(userInformation));}
+      //  }
           sessionStorage.setItem('ASIDE_MEAN',JSON.stringify(menuData));
           if (menuData && menuData.length > 0) {
             //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -781,7 +781,6 @@
 
         // 根据请发数量计算
         if (record.column.key == 'pleaseSendNumber' && isMA || record.column.key == 'actualSendNumber' && isMA) {
-          console.log("执行了333333333333",record.row)
           let res = record.row;
           // let materialName = {}
           // this.bigIdMerchandiseNewsList.forEach(item => {
@@ -1560,14 +1559,12 @@
           })
 
         }
-        console.log('获取我的数据', res)
         if (res.orgType != 3) {
           let isDepartId = res.departIds
           this.getAction('/officeConfig/queryByDepartId', {
             id: isDepartId
           }).then((res) => {
             if (res.success) {
-              console.log(res.result.length, '***********************************************************')
               if (res.result.length != 0) {
                 this.isOffice = 1
                 this.deliveryType = 2

src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@@ -361,7 +361,6 @@
       this.showFlowData()
       let company = sessionStorage.getItem('PARENT_ID')
       let userInfo = sessionStorage.getItem('USER_INFORMATION')
-      // console.log(userInfo)
       // userInfo.company=company;
       if (!this.isNew){
         this.init();
@@ -729,10 +728,9 @@
         this.$message.error(msg)
       },
       popupCallback(company, row) {
+        console.log('获取我的数据》》》》》》》》》》》', res)
         let res = JSON.parse(row)
-        // console.log('获取我的数据', res.id)
         let param = {}
-
         param.createBy = res.username
         param.company = company
         param.departId = res.departIds

src/views/system/modules/DepartWindow.vue

@@ -138,13 +138,14 @@
         this.departList = [];
         this.checkedKeys = checkedKeys.checked;
         let checkedNodes = info.checkedNodes;
+        this.departList.length =0;
         for (let i = 0; i < checkedNodes.length; i++) {
           let de = checkedNodes[i].data.props;
           let depart = {key:"",value:"",title:""};
           depart.key = de.value;
           depart.value = de.value;
           depart.title = de.title;
-          this.departList.push(depart);
+          this.departList[0] =depart;
         }
 
       },

src/views/system/modules/UserModal.vue

@@ -857,7 +857,6 @@
         }
       },
       afterIntFiles(files,status) {
-        console.log('afterIntFiles',files)
         this.showHeadMsg = true
         if (files&&files.length){
           this.userHeads = files