Ver a proveniência

bug deptId 初始化

rongxin_test
张泽亮 há 10 meses
ascendente
cometimento
6a95515f35
2 ficheiros alterados com 9 adições e 1 eliminações
  1. +7
    -1
      src/store/modules/user.js
  2. +2
    -0
      src/views/yinnong/doneCompleted/completedNew.vue

+ 7
- 1
src/store/modules/user.js Ver ficheiro

@@ -41,6 +41,9 @@ const user = {
SET_LOGINDEPTID: (state, loginDeptId) => { SET_LOGINDEPTID: (state, loginDeptId) => {
state.loginDeptId = loginDeptId state.loginDeptId = loginDeptId
}, },
SET_DEPTID: (state, deptId) => {
state.deptId = deptId
},
SET_LOGINBOOKID: (state, loginBookId) => { SET_LOGINBOOKID: (state, loginBookId) => {
state.loginBookId = loginBookId state.loginBookId = loginBookId
}, },
@@ -74,7 +77,7 @@ const user = {
commit('SET_TOKEN', res.token) commit('SET_TOKEN', res.token)
getInfo(res.token).then(response => { getInfo(res.token).then(response => {
const user = response.user const user = response.user
console.info(user.nickName);
//console.info(user.nickName);
// const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; // const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
const avatar = ""; const avatar = "";
if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组
@@ -86,6 +89,7 @@ const user = {
commit('SET_BOOKNAME', user.bookName) commit('SET_BOOKNAME', user.bookName)
commit('SET_NAME', user.userName) commit('SET_NAME', user.userName)
commit('SET_USERID', user.userId) commit('SET_USERID', user.userId)
commit('SET_DEPTID', user.deptId)
commit('SET_LOGINDEPTID', user.loginDeptId) commit('SET_LOGINDEPTID', user.loginDeptId)
commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_LOGINBOOKID', user.loginBookId)
commit('SET_DEPTNAME', user.deptName) commit('SET_DEPTNAME', user.deptName)
@@ -157,6 +161,7 @@ const user = {
commit('SET_BOOKNAME', user.bookName) commit('SET_BOOKNAME', user.bookName)
commit('SET_NAME', user.userName) commit('SET_NAME', user.userName)
commit('SET_USERID', user.userId) commit('SET_USERID', user.userId)
commit('SET_DEPTID', user.deptId)
commit('SET_LOGINDEPTID', user.loginDeptId) commit('SET_LOGINDEPTID', user.loginDeptId)
commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_LOGINBOOKID', user.loginBookId)
commit('SET_DEPTNAME', user.deptName) commit('SET_DEPTNAME', user.deptName)
@@ -227,6 +232,7 @@ const user = {
commit('SET_BOOKNAME', user.bookName) commit('SET_BOOKNAME', user.bookName)
commit('SET_NAME', user.userName) commit('SET_NAME', user.userName)
commit('SET_USERID', user.userId) commit('SET_USERID', user.userId)
commit('SET_DEPTID', user.deptId)
commit('SET_LOGINDEPTID', user.loginDeptId) commit('SET_LOGINDEPTID', user.loginDeptId)
commit('SET_LOGINBOOKID', user.loginBookId) commit('SET_LOGINBOOKID', user.loginBookId)
commit('SET_DEPTNAME', user.deptName) commit('SET_DEPTNAME', user.deptName)


+ 2
- 0
src/views/yinnong/doneCompleted/completedNew.vue Ver ficheiro

@@ -78,6 +78,8 @@
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize:5, pageSize:5,
systemType: null,
deptId: null,
}, },
activityBusinessTypeOptions:[], activityBusinessTypeOptions:[],
images:['../../../../static/images/yinnong/banner_03.jpg'], images:['../../../../static/images/yinnong/banner_03.jpg'],


Carregando…
Cancelar
Guardar