guhongwei 3 年 前
コミット
f66d1a4f93

+ 4 - 4
java代码/ruoyi-ui/src/views/merits/checkUpdateApply/index.vue

@@ -106,9 +106,9 @@ export default {
               : i == "2"
               ? "机构审核拒绝"
               : i == "3"
-              ? "基础处审通过"
+              ? "基础处审通过"
               : i == "4"
-              ? "基础处审拒绝"
+              ? "基础处审拒绝"
               : "",
           filter: "select",
         },
@@ -125,8 +125,8 @@ export default {
         { label: "待审中", value: "0" },
         { label: "机构审核通过,基础处待审中", value: "1" },
         { label: "机构审核拒绝", value: "2" },
-        { label: "基础处审通过", value: "3" },
-        { label: "基础处审拒绝", value: "4" },
+        { label: "基础处审通过", value: "3" },
+        { label: "基础处审拒绝", value: "4" },
       ],
       dialog: { title: "修改申请审核", show: false },
       form: {},

+ 2 - 2
java代码/ruoyi-ui/src/views/merits/updateApply/index.vue

@@ -68,7 +68,7 @@ export default {
               : i == "2"
               ? "机构审核拒绝"
               : i == "3"
-              ? "基础处审通过"
+              ? "基础处审通过"
               : i == "4"
               ? "基础处待审拒绝"
               : "",
@@ -87,7 +87,7 @@ export default {
         { label: "待审中", value: "0" },
         { label: "机构审核通过,基础处待审中", value: "1" },
         { label: "机构审核拒绝", value: "2" },
-        { label: "基础处审通过", value: "3" },
+        { label: "基础处审通过", value: "3" },
         { label: "基础处待审拒绝", value: "4" },
       ],
       dialog: { title: "审核结果", show: false },

+ 11 - 1
java代码/ruoyi-ui/src/views/merits/updateApply/parts/result-1.vue

@@ -12,6 +12,7 @@
             >
               <el-card>
                 <p>{{ i.examine_user }}</p>
+                <p>状态:{{ getStu(i.status) }}</p>
                 <p>意见:{{ i.desc }}</p>
               </el-card>
             </el-timeline-item>
@@ -34,7 +35,16 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    getStu(status) {
+      if (status == "0") return "待审中";
+      else if (status == "1") return "机构审核通过,基础处待审中";
+      else if (status == "2") return "机构审核拒绝";
+      else if (status == "3") return "基础处审核通过";
+      else if (status == "4") return "基础处审核拒绝";
+      else return "";
+    },
+  },
   computed: {
     ...mapState(["user"]),
   },