Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

dytyqx

8 天以前 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5

 src/store/modules/user.js

@@ -48,9 +48,13 @@
      // const code = userInfo.code
      // const uuid = userInfo.uuid
      const HOrgName = userInfo.HOrgName;
      const loginPage = userInfo.loginPage || 'login'; // 添加登录页面来源标记
      return new Promise((resolve, reject) => {
        login(username, password, HOrgName)
          .then((res) => {
            // 存储登录页面来源
            sessionStorage["loginPage"] = loginPage;
            
            sessionStorage["OrganizationID"] = userInfo.HOrgName;
            sessionStorage["Organization"] = userInfo.Organization;
            sessionStorage["HTranSlate"] = userInfo.HTranSlate;
@@ -96,7 +100,13 @@
            sessionStorage["HCheckEmpName"] = res.data[0].HCheckEmpName;
            sessionStorage["login"] = "login";
            sessionStorage["HType"] = "PC";

            commit("SET_NICK_NAME", sessionStorage["HUserName"]);
            getOrganizations().then((res) => {
              if (res.count == 1) {
                const stringifiedItems = JSON.stringify(res.data);
                sessionStorage.setItem("organizationList", stringifiedItems);
              }
            });
            setToken(res.token);
            commit("SET_TOKEN", res.token);
            resolve();
@@ -111,12 +121,6 @@
    GetInfo({ commit, state }) {
      return new Promise((resolve, reject) => {
        commit("SET_NICK_NAME", sessionStorage["HUserName"]);
        getOrganizations().then((res) => {
          if (res.count == 1) {
            const stringifiedItems = JSON.stringify(res.data);
          sessionStorage.setItem("organizationList", stringifiedItems);
          }
        });
        resolve();
      });
    },