srm处理

src/views/flow/index.vue

@@ -639,21 +639,23 @@ onMounted(async () => {
       });
       crmTasks.value = crmRes;
 
-      // const srmRes = await getSRMTasks({
-      //   id: userStore.getUser.username,
+      const srmRes = await getSRMTasks({
+        id: userStore.getUser.username,
 
-      //   pageNum: 1,
-      //   pageSize: 10,
-      // });
+        pageNum: 1,
+        pageSize: 10,
+      });
 
-      // srmTasks.value = srmRes;
+      srmTasks.value = srmRes;
 
       stats.value[0].number =
-        Number(oaTasks.value.todoCount) + Number(crmTasks.value.todoCount);
+        Number(oaTasks.value.todoCount) +
+        Number(crmTasks.value.todoCount) +
+        Number(srmTasks.value.todoCount);
       todoCount.value = [
         { name: "OA", value: oaTasks.value.todoCount ?? 0 },
         { name: "CRM", value: crmTasks.value.todoCount ?? 0 },
-        // { name: "SRM", value: srmTasks.value.todoCount ?? 0 },
+        { name: "SRM", value: srmTasks.value.todoCount ?? 0 },
       ];
 
       // *****************已办事项统计*************************
@@ -665,20 +667,22 @@ onMounted(async () => {
         pageSize: 10,
       });
 
-      // const srmDoneRes = await getSRMTasks({
-      //   id: userStore.getUser.username,
+      const srmDoneRes = await getSRMTasks({
+        id: userStore.getUser.username,
 
-      //   pageNum: 1,
-      //   pageSize: 10,
-      // });
+        pageNum: 1,
+        pageSize: 10,
+      });
 
       stats.value[1].number =
-        Number(oaTasks.value.doneCount) + Number(crmDoneRes.todoCount);
+        Number(oaTasks.value.doneCount) +
+        Number(crmDoneRes.todoCount) +
+        Number(srmDoneRes.doneCount);
 
       doneCount.value = [
         { name: "OA", value: oaTasks.value.doneCount ?? 0 },
         { name: "CRM", value: crmDoneRes.todoCount ?? 0 },
-        // { name: "SRM", value: srmDoneRes.doneCount ?? 0 },
+        { name: "SRM", value: srmDoneRes.doneCount ?? 0 },
       ];
     } finally {
       statsLoading.value = false;
@@ -701,20 +705,27 @@ onMounted(async () => {
         });
         crmTasks.value = crmRes;
 
-        // const srmRes = await getSRMTasks({
-        //   id: userStore.getUser.username,
-        //   pageNum: 1,
-        //   pageSize: 10,
-        // });
+        try {
+          const srmRes = await getSRMTasks({
+            id: userStore.getUser.username,
+            pageNum: 1,
+            pageSize: 10,
+          });
 
-        // srmTasks.value = srmRes;
+          srmTasks.value = srmRes;
+        } catch (error) {
+          srmTasks.value.todoCount = 0;
+          srmTasks.value.doneCount = 0;
+        }
 
         stats.value[0].number =
-          Number(oaTasks.value.todoCount) + Number(crmTasks.value.todoCount);
+          Number(oaTasks.value.todoCount) +
+          Number(crmTasks.value.todoCount) +
+          Number(srmTasks.value.todoCount);
         todoCount.value = [
           { name: "OA", value: oaTasks.value.todoCount ?? 0 },
           { name: "CRM", value: crmTasks.value.todoCount ?? 0 },
-          // { name: "SRM", value: srmTasks.value.todoCount ?? 0 },
+          { name: "SRM", value: srmTasks.value.todoCount ?? 0 },
         ];
 
         const crmDoneRes = await getCRMTasks({
@@ -724,19 +735,25 @@ onMounted(async () => {
           pageSize: 10,
         });
 
-        // const srmDoneRes = await getSRMTasks({
-        //   id: userStore.getUser.username,
-        //   pageNum: 1,
-        //   pageSize: 10,
-        // });
-
+        let srmDoneRes = {};
+        try {
+          srmDoneRes = await getSRMTasks({
+            id: userStore.getUser.username,
+            pageNum: 1,
+            pageSize: 10,
+          });
+        } catch (error) {
+          srmDoneRes.doneCount = 0;
+        }
         stats.value[1].number =
-          Number(oaTasks.value.doneCount) + Number(crmDoneRes.todoCount);
+          Number(oaTasks.value.doneCount) +
+          Number(crmDoneRes.todoCount) +
+          Number(srmDoneRes.doneCount);
 
         doneCount.value = [
           { name: "OA", value: oaTasks.value.doneCount ?? 0 },
           { name: "CRM", value: crmDoneRes.todoCount ?? 0 },
-          // { name: "SRM", value: srmDoneRes.doneCount ?? 0 },
+          { name: "SRM", value: srmDoneRes.doneCount ?? 0 },
         ];
       },
       10 * 60 * 1000,
@@ -797,8 +814,9 @@ onBeforeUnmount(() => {
       transparent 28%
     ),
     linear-gradient(180deg, #eef3f9 0%, #f7faff 46%, #eef3f9 100%);
-  height: 100vh;
+  /* height: 100vh;  */
   /* margin-bottom: 200px; */
+  padding-bottom: 50px;
 }
 
 :global([data-theme="dark"] .ehr-page) {

src/views/flow/srmDone.vue

@@ -129,49 +129,46 @@ const pagination = ref({
 });
 
 const goBackPage = async (row) => {
-  const res = await ssoLogin({
-    username: userStore.getUser.username,
-  });
-
-  if (res) {
-    const ua = window.navigator.userAgent.toLowerCase();
-    if (ua.includes("dingtalk") || ua.includes("dingtalkwork")) {
-      dd.biz.util.openLink({
-        url:
-          "https://yfoa.keruioil.com/wui/index.html" +
-          "?ssoToken=" +
-          res +
-          "#/main", // 先跳你的 SSO 链接
-        onSuccess: () => {
-          // 延迟跳目标业务地址（和你原来 setTimeout 逻辑一致）
-          setTimeout(() => {
-            dd.biz.util.openLink({
-              url: `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`,
-            });
-          }, 100);
-        },
-      });
-    } else {
-      const loading = ElLoading.service({
-        lock: true,
-        text: "正在跳转，请稍候...",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      const newTab = window.open("", "_blank");
-      newTab.location.href =
-        "https://yfoa.keruioil.com/wui/index.html" +
-        "?ssoToken=" +
-        res +
-        "#/main";
-
-      setTimeout(function () {
-        newTab.location.href = `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`;
-        setTimeout(() => {
-          loading.close();
-        }, 500);
-      }, 100);
-    }
-  }
+  // const res = await ssoLogin({
+  //   username: userStore.getUser.username,
+  // });
+  // if (res) {
+  //   const ua = window.navigator.userAgent.toLowerCase();
+  //   if (ua.includes("dingtalk") || ua.includes("dingtalkwork")) {
+  //     dd.biz.util.openLink({
+  //       url:
+  //         "https://yfoa.keruioil.com/wui/index.html" +
+  //         "?ssoToken=" +
+  //         res +
+  //         "#/main",
+  //       onSuccess: () => {
+  //         setTimeout(() => {
+  //           dd.biz.util.openLink({
+  //             url: `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`,
+  //           });
+  //         }, 100);
+  //       },
+  //     });
+  //   } else {
+  //     const loading = ElLoading.service({
+  //       lock: true,
+  //       text: "正在跳转，请稍候...",
+  //       background: "rgba(0, 0, 0, 0.7)",
+  //     });
+  //     const newTab = window.open("", "_blank");
+  //     newTab.location.href =
+  //       "https://yfoa.keruioil.com/wui/index.html" +
+  //       "?ssoToken=" +
+  //       res +
+  //       "#/main";
+  //     setTimeout(function () {
+  //       newTab.location.href = `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`;
+  //       setTimeout(() => {
+  //         loading.close();
+  //       }, 500);
+  //     }, 100);
+  //   }
+  // }
 };
 
 const handleCurrentChange = async (page) => {

src/views/flow/srmTodo.vue

@@ -129,49 +129,46 @@ const pagination = ref({
 });
 
 const goBackPage = async (row) => {
-  const res = await ssoLogin({
-    username: userStore.getUser.username,
-  });
-
-  if (res) {
-    const ua = window.navigator.userAgent.toLowerCase();
-    if (ua.includes("dingtalk") || ua.includes("dingtalkwork")) {
-      dd.biz.util.openLink({
-        url:
-          "https://yfoa.keruioil.com/wui/index.html" +
-          "?ssoToken=" +
-          res +
-          "#/main", // 先跳你的 SSO 链接
-        onSuccess: () => {
-          // 延迟跳目标业务地址（和你原来 setTimeout 逻辑一致）
-          setTimeout(() => {
-            dd.biz.util.openLink({
-              url: `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`,
-            });
-          }, 100);
-        },
-      });
-    } else {
-      const loading = ElLoading.service({
-        lock: true,
-        text: "正在跳转，请稍候...",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      const newTab = window.open("", "_blank");
-      newTab.location.href =
-        "https://yfoa.keruioil.com/wui/index.html" +
-        "?ssoToken=" +
-        res +
-        "#/main";
-
-      setTimeout(function () {
-        newTab.location.href = `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`;
-        setTimeout(() => {
-          loading.close();
-        }, 500);
-      }, 100);
-    }
-  }
+  // const res = await ssoLogin({
+  //   username: userStore.getUser.username,
+  // });
+  // if (res) {
+  //   const ua = window.navigator.userAgent.toLowerCase();
+  //   if (ua.includes("dingtalk") || ua.includes("dingtalkwork")) {
+  //     dd.biz.util.openLink({
+  //       url:
+  //         "https://yfoa.keruioil.com/wui/index.html" +
+  //         "?ssoToken=" +
+  //         res +
+  //         "#/main",
+  //       onSuccess: () => {
+  //         setTimeout(() => {
+  //           dd.biz.util.openLink({
+  //             url: `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`,
+  //           });
+  //         }, 100);
+  //       },
+  //     });
+  //   } else {
+  //     const loading = ElLoading.service({
+  //       lock: true,
+  //       text: "正在跳转，请稍候...",
+  //       background: "rgba(0, 0, 0, 0.7)",
+  //     });
+  //     const newTab = window.open("", "_blank");
+  //     newTab.location.href =
+  //       "https://yfoa.keruioil.com/wui/index.html" +
+  //       "?ssoToken=" +
+  //       res +
+  //       "#/main";
+  //     setTimeout(function () {
+  //       newTab.location.href = `https://yfoa.keruioil.com/spa/workflow/static4form/index.html?_rdm=1776063595284#/main/workflow/req?requestid=${row.requestId}`;
+  //       setTimeout(() => {
+  //         loading.close();
+  //       }, 500);
+  //     }, 100);
+  //   }
+  // }
 };
 
 const handleCurrentChange = async (page) => {

src/views/index.vue

@@ -568,10 +568,12 @@ import {
   ssoLogin,
   zentaoSsoLogin,
   getOATasks,
-  getCRMTasks, getNotices,
+  getCRMTasks,
+  getSRMTasks,
+  getNotices,
   getRedHeadFiles,
   getNews,
-  srmLogin
+  srmLogin,
 } from "@/api/user";
 import { useUserStore } from "@/stores/useUserStore";
 import { useThemeStore } from "@/stores/useThemeStore";
@@ -868,7 +870,7 @@ const loadHomeData = async () => {
 
   if (!userStore.getUser.username) return;
 
-  const [oaRes, crmRes, crmDoneRes, newsRes] = await Promise.all([
+  const [oaRes, crmRes, crmDoneRes, srmRes, newsRes] = await Promise.all([
     getOATasks({
       id: userStore.getUser.username,
       pageNum: 1,
@@ -886,11 +888,11 @@ const loadHomeData = async () => {
       pageNum: 1,
       pageSize: 10,
     }),
-    // await getSRMTasks({
-    //   id: userStore.getUser.username,
-    //   pageNum: 1,
-    //   pageSize: 10,
-    // }),
+    await getSRMTasks({
+      id: userStore.getUser.username,
+      pageNum: 1,
+      pageSize: 10,
+    }),
     getNews({
       pageNum: 1,
       pageSize: 10,
@@ -898,15 +900,16 @@ const loadHomeData = async () => {
   ]);
 
   oaTasks.value = oaRes.todoList.slice(0, 3);
-  todo.value = Number(oaRes.todoCount) + crmRes.todoCount;
-  done.value = Number(oaRes.doneCount) + crmDoneRes.todoCount;
+  todo.value = Number(oaRes.todoCount) + crmRes.todoCount + srmRes.todoCount;
+  done.value =
+    Number(oaRes.doneCount) + crmDoneRes.todoCount + srmRes.doneCount;
 
   oatodo.value = oaRes.todoCount;
   oadone.value = oaRes.doneCount;
   crmtodo.value = crmRes.todoCount;
   crmdone.value = crmDoneRes.todoCount;
-  // srmtodo.value = srmRes.todoCount;
-  // srmdone.value = srmRes.doneCount;
+  srmtodo.value = srmRes.todoCount;
+  srmdone.value = srmRes.doneCount;
   newsList.value = newsRes.list.slice(0, 3);
 };
 

src/views/login.vue

@@ -21,7 +21,7 @@
         <h1 class="text-2xl font-bold text-center">登录</h1>
 
         <!-- 用户名密码登陆 -->
-        <!-- <div>
+        <div>
           <el-form
             :model="form"
             :rules="rules"
@@ -62,7 +62,7 @@
               >
             </div>
           </div>
-        </div> -->
+        </div>
 
         <!-- 钉钉登陆 -->
         <div class="text-center">