From 911045410d0db5372ee8f37e5b1654b51fc90d16 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 19 May 2022 13:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=96=B9=E6=B3=95=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=BF=E7=94=A8=E7=BB=84=E7=BB=87=E7=9A=84=E5=85=A8?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84Sid=E5=92=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-scm/anrui-scm-ui/src/main.js | 50 ++++++++++++++++--------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/main.js b/anrui-scm/anrui-scm-ui/src/main.js
index 9f0893e298..f94c25ba9b 100644
--- a/anrui-scm/anrui-scm-ui/src/main.js
+++ b/anrui-scm/anrui-scm-ui/src/main.js
@@ -25,8 +25,8 @@ import eimage from '@/components/E-image/index.vue'
 Vue.component('eimage', eimage)
 import moment from 'moment'
 Vue.prototype.moment = moment
-Vue.filter('dateFormat',function(dateStr,pattern='YYYY-MM-DD'){
-  return moment(dateStr).format(pattern);
+Vue.filter('dateFormat', function(dateStr, pattern = 'YYYY-MM-DD') {
+  return moment(dateStr).format(pattern)
 })
 import Print from '@/utils/print' // 引入附件的js文件
 Vue.use(Print) // 注册
@@ -42,43 +42,47 @@ href = href.split(`token=${token}`)[0]
 window.location.href = href.slice(0, href.length - 1)
 }
 
-//获取登录用户信息
-function getUserInfo(){
+// 获取登录用户信息
+function getUserInfo() {
   return request({
     url: '/portal/v1/sysuser/loginDetails',
     method: 'post',
     headers: {
       'Content-Type': 'application/json'
     }
-  }).then(rep=>{
-    const data=rep.data;
+  }).then(rep => {
+    const data = rep.data
     let user = {
       roleSid: data.roleSid,
       name: data.name,
       userName: data.userName,
-      departmentName: data.departmentName, //部门名称
-      departmentSid:data.departmentSid, //部门sid
+      departmentName: data.departmentName, // 部门名称
+      departmentSid: data.departmentSid, // 部门sid
       isAdmin: data.isAdmin,
-      staffSid: data.staffSid, //业务员sid
+      staffSid: data.staffSid, // 业务员sid
       userSid: data.sid,
-      orgSid: data.organizationSid, //单位sid
+      orgSid: data.organizationSid, // 单位sid
       Orgname: data.organizationName,
-      dwjb: data.dwjb
-    };
-    //结果存入缓存
-    window.sessionStorage.setItem('staffSid',user.staffSid);
-    window.sessionStorage.setItem('userSid', user.userSid);
-    window.sessionStorage.setItem('Orgname', user.Orgname);
-    window.sessionStorage.setItem('orgSid',user.orgSid);
-    window.sessionStorage.setItem('departmentName', user.departmentName);
-    window.sessionStorage.setItem('name', user.name);
-    window.sessionStorage.setItem('user', user);
-    window.sessionStorage.setItem('departmentName',user.departmentName);
-    window.sessionStorage.setItem('departmentSid',user.departmentSid);
+      dwjb: data.dwjb,
+      orgNamePath: data.orgNamePath, // 使用组织全路径名称
+      orgSidPath: data.orgSidPath // 使用组织全路径Sid
+    }
+    // 结果存入缓存
+    window.sessionStorage.setItem('staffSid', user.staffSid)
+    window.sessionStorage.setItem('userSid', user.userSid)
+    window.sessionStorage.setItem('Orgname', user.Orgname)
+    window.sessionStorage.setItem('orgSid', user.orgSid)
+    window.sessionStorage.setItem('departmentName', user.departmentName)
+    window.sessionStorage.setItem('name', user.name)
+    window.sessionStorage.setItem('user', user)
+    window.sessionStorage.setItem('departmentName', user.departmentName)
+    window.sessionStorage.setItem('departmentSid', user.departmentSid)
+    window.sessionStorage.setItem('orgNamePath', user.orgNamePath)
+    window.sessionStorage.setItem('orgSidPath', user.orgSidPath)
   })
 }
 
-getUserInfo();
+getUserInfo()
 function GetQueryString(name) {
   var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
   var r = window.location.search.substr(1).match(reg)