bug修复

sgzb-ui/src/store/modules/user.js

@@ -115,7 +115,7 @@ const user = {
         getInfo().then(async res => {
           const href = window.location.href
           if (!href.includes('resetPassword') && JSON.parse(localStorage.getItem('isReset'))) {
-            await checkPasswordStatus()
+            // await checkPasswordStatus()
           }
 
           const user = res.user
@@ -123,6 +123,7 @@ const user = {
           sessionStorage.setItem('userId', user.userId)
           sessionStorage.setItem('deptId', user.deptId)
           sessionStorage.setItem('userName', user.userName)
+          sessionStorage.setItem('roles', res.roles)
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)

sgzb-ui/src/views/index.vue

@@ -196,6 +196,15 @@
                     >
                         查 看
                     </el-button>
+                    <el-button
+                        v-if="isOnRoles"
+                        size="mini"
+                        type="text"
+                        icon="el-icon-collection-tag"
+                        @click="handlePreview(row.taskTypeId, row.taskCode)"
+                    >
+                        待 办
+                    </el-button>
 
                     <!-- 代办事件为领料任务时显示催办按钮 -->
                     <el-button
@@ -307,6 +316,8 @@ export default {
     },
     data() {
         return {
+            roles: sessionStorage.getItem('roles'),
+            isOnRoles: false,
             // 遮罩层
             loading: false,
             // 显示搜索条件
@@ -395,6 +406,7 @@ export default {
         }
     },
     created() {
+        this.isOnRoles = this.roles ? this.roles.split(',').some((role) => ['em01', 'em02', 'fgs', 'sgb', 'dm01', ].includes(role)) : false
         this.getList()
         this.getTaskTypeList()
     },

sgzb-ui/src/views/newLogin.vue

@@ -527,7 +527,7 @@ export default {
                             const password = encrypt(this.loginForm.password)
                             localStorage.setItem('username', username)
                             localStorage.setItem('pw', password)
-                            const res = await checkPasswordStatus()
+                            // const res = await checkPasswordStatus()
                             // console.log('🚀 ~ .then ~ res:', res)
                             this.$router.push({ path: '/' }).catch(() => {})
                         })