redict

src/router/index.js

@@ -53,8 +53,10 @@ router.beforeEach(async (to, from, next) => {
 	if (to.path === "/redirect") {
 		if (to.query.userId) {
 			const { token, user } = await api.auth.oa.getUserToken(to.query);
-			tool.cookie.set("TOKEN", token);
-			tool.data.set("USER_INFO", user.user);
+			if (!token) {
+				tool.cookie.set("TOKEN", token);
+				tool.data.set("USER_INFO", user.user);
+			} else tool.data.set("OA_USER_INFO", user.user);
 		}
 		next(to.query.path && to.fullPath.replace("/redirect", to.query.path) || from.fullPath);
 		return false;

src/views/procurement/process/index.vue

@@ -292,7 +292,8 @@ export default {
         // oa 情况通知-是否开启
         openChange(status, { id, oaStatus }) {
             if (status === 1 && oaStatus === undefined) return;
-
+console.log(status)
+console.log(oaStatus)
             this.loading = true;
             this.$API.auth.oa.updateStatus({ id, status }).then(() => {
                 this.loading = false;

src/views/supplier/evaluation/components/detail.vue

@@ -66,12 +66,12 @@
 			// 是否为评价人
 			isEvaluator() {
 				if (!this.detailList) return false;
-				return this.detailList.findIndex(d => d.evaluatorId == this.$TOOL.data.get("USER_INFO").id) != -1;
+				return this.detailList.findIndex(d => d.evaluatorId == this.$TOOL.data.get("OA_USER_INFO") && this.$TOOL.data.get("OA_USER_INFO").id || this.$TOOL.data.get("USER_INFO").id) != -1;
 			},
 
 			list() {
 				if (!this.isEvaluator) return this.detailList;
-				return this.detailList && this.detailList.filter(d => d.evaluatorId == this.$TOOL.data.get("USER_INFO").id) || [];
+				return this.detailList && this.detailList.filter(d => d.evaluatorId == this.$TOOL.data.get("OA_USER_INFO") && this.$TOOL.data.get("OA_USER_INFO").id || this.$TOOL.data.get("USER_INFO").id) || [];
 			}
 		},