Merge branch 'master' of http://git.cc-lotus.info/laboratory/ruoyi-project

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: {},

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

@@ -34,19 +34,20 @@
       custom-class="dialog"
     >
       <div class="info">
-        <result-1></result-1>
+        <result-1 :info="info"></result-1>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import result1 from "./parts/result-1.vue";
 import dataTable from "@/components/free/filter-page-table.vue";
 import { mapState, mapGetters, createNamespacedHelpers } from "vuex";
 const { mapActions: updateapply } = createNamespacedHelpers("updateapply");
 export default {
   name: "index",
-  components: { dataTable },
+  components: { dataTable, result1 },
   props: {},
   data: function () {
     return {
@@ -54,6 +55,8 @@ export default {
       total: 0,
       fields: [
         { label: "用户名称", prop: "user_name", filter: true },
+        { label: "修改内容", prop: "update_content", filter: true },
+
         {
           label: "审核状态",
           prop: "status",
@@ -65,7 +68,7 @@ export default {
               : i == "2"
               ? "机构审核拒绝"
               : i == "3"
-              ? "基础处待审通过"
+              ? "基础处审核通过"
               : i == "4"
               ? "基础处待审拒绝"
               : "",
@@ -84,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 },

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

@@ -0,0 +1,82 @@
+<template>
+  <div id="result-1">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="one">
+          <el-timeline>
+            <el-timeline-item
+              v-for="(i, index) in info.record"
+              :key="index"
+              :timestamp="i.examine_date"
+              placement="top"
+            >
+              <el-card>
+                <p>{{ i.examine_user }}</p>
+                <p>状态：{{ getStu(i.status) }}</p>
+                <p>意见：{{ i.desc }}</p>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from "vuex";
+export default {
+  name: "result-1",
+  props: {
+    info: { type: Object },
+  },
+  components: {},
+  data: function () {
+    return {};
+  },
+  created() {},
+  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"]),
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  watch: {
+    test: {
+      deep: true,
+      immediate: true,
+      handler(val) {},
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-card__body {
+  padding: 10px;
+}
+p {
+  padding: 0;
+  margin: 0;
+}
+.main {
+  .one {
+    p {
+      margin: 10px 0 0 0;
+    }
+    p:first-child {
+      font-weight: bold;
+    }
+  }
+}
+</style>