Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

在jwc-undo.vue、fdy-undo.vue和xw-undo.vue组件中新增了国家励志奖学金审核和学生返校审核的待办事项，以满足不同角色的审核需求

src/views/Home/comps/fdy-undo.vue

@@ -86,6 +86,19 @@ export default {
                     value: 0,
                     url: "/survey/leave/fdy"
                 },
+                {
+                  // 宁博
+                    label: "辅导员·学生返校审核",
+                    name: "return",
+                    value: 0,
+                    url: "/survey/return/fdy"
+                },
+                {
+                    label: "辅导员·国家励志奖学金审核",
+                    name: "knzzgl",
+                    value: 0,
+                    url: "/hard/gl/fdy"
+                }
             ],
 
 

src/views/Home/comps/jwc-undo.vue

@@ -80,6 +80,13 @@ export default {
                     value: 0,
                     url: "hard/tufa/xg"
                 },
+                // 宁博
+                {
+                  label: "学工·国家励志奖学金审核",
+                  name: "knzzgl",
+                  value: 0,
+                  url: "/hard/gl/xg"
+                }
             ]
 
         }

src/views/Home/comps/xw-undo.vue

@@ -1,13 +1,22 @@
 <template>
   <div>
     <div class="six-action-container">
-            <div style="padding: 1rem;" class="six-action-item" v-for="(v, i) in taskList" :key="i">
-                <div class="bubble"
-                    :style="{ backgroundImage: `url(${require('@/assets/index_bg/' + (i + 1) + '.png')})` }">
+      <div
+        style="padding: 1rem"
+        class="six-action-item"
+        v-for="(v, i) in taskList"
+        :key="i"
+      >
+        <div
+          class="bubble"
+          :style="{
+            backgroundImage: `url(${require('@/assets/index_bg/' +
+              (i + 1) +
+              '.png')})`,
+          }"
+        >
           <div class="act-text">
-                        <div class="title">
-                            {{ v.label }}·待办
-                        </div>
+            <div class="title">{{ v.label }}·待办</div>
             <div class="todo">
               {{ v.value }}
             </div>
@@ -20,7 +29,6 @@
 </template>
 
 <script>
-
 import { countXwUnDo as countUndo } from "@/api/stuCQS/good/apply";
 import { isEmpty } from "@/api/helpFunc";
 import { checkPermi } from "@/utils/permission";
@@ -78,15 +86,20 @@ export default {
           label: "学务·困难资助审核",
           name: "knzz",
           value: 0,
-                    url: "hard/tufa/xw"
+          url: "hard/tufa/xw",
+        },
+        // 宁博
+        {
+          label: "学务·国家励志奖学金审核",
+          name: "knzzgl",
+          value: 0,
+          url: "/hard/gl/xw",
         },
       ],
-
-
-        }
+    };
   },
   created() {
-        if (checkPermi(['home:xw:undo1'])) {
+    if (checkPermi(["home:xw:undo1"])) {
       this.countUndo();
       this.hasPrem = true;
     }
@@ -96,8 +109,8 @@ export default {
       let res = await countUndo();
       if (res.code == 200) {
         let data = [...res.data];
-                this.taskList.map(x => {
-                    let temp = data.filter(y => y.startsWith(x.name));
+        this.taskList.map((x) => {
+          let temp = data.filter((y) => y.startsWith(x.name));
           if (!isEmpty(temp)) {
             let result = temp[0].split("-")[1];
             x.value = result;
@@ -111,9 +124,8 @@ export default {
         this.$router.push(url);
       }
     },
-    }
-
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -143,7 +155,6 @@ export default {
   z-index: 2;
   margin: 1rem;
 
-
   .title {
     text-align: left;
     font-size: 1.25rem;