1

README.md

@@ -2,3 +2,11 @@
 ### 下载依赖包 npm i &&  npm install
 ### 运行项目 npm run serve
 ### 打包项目 npm run build
+
+
+
+用户个人中心-userCenter
+
+申请书管理-userExamine
+  待审中-firstApply
+  

src/components/common/Sidebar.vue

@@ -98,30 +98,47 @@ export default {
         this.$set(this, `items`, _.uniqBy(list, 'index'));
       } else {
         let data = [
-          { icon: 'el-icon-eleme', index: 'userExamine', title: '申请书' },
-          { icon: 'el-icon-eleme', index: 'userScore', title: '评分总结' },
-          { icon: 'el-icon-eleme', index: 'userExamine', title: '申请书' },
-          { icon: 'el-icon-eleme', index: 'userExamine', title: '申请书' },
-          { icon: 'el-icon-eleme', index: 'userExamine', title: '申请书' },
+          {
+            icon: 'el-icon-eleme',
+            index: '2',
+            title: '申请书管理',
+            subs: [
+              {
+                icon: 'el-icon-eleme',
+                index: 'firstApply',
+                title: '待审中',
+              },
+              {
+                icon: 'el-icon-eleme',
+                index: 'updateApply',
+                title: '审核未通过',
+              },
+            ],
+          },
+          {
+            icon: 'el-icon-eleme',
+            index: '3',
+            title: '专家评分',
+            subs: [
+              {
+                icon: 'el-icon-eleme',
+                index: 'expertExam',
+                title: '待评分',
+              },
+              {
+                icon: 'el-icon-eleme',
+                index: 'expetScoreUpdate',
+                title: '审核未通过',
+              },
+            ],
+          },
+          // { icon: 'el-icon-eleme', index: 'userScore', title: '申请书' },
+          // { icon: 'el-icon-eleme', index: 'userExamine', title: '申请书' },
+          // { icon: 'el-icon-eleme', index: 'userExamine', title: '申请书' },
         ];
         list.push(...data);
         this.$set(this, `items`, _.uniqBy(list, 'index'));
       }
-      // if (user) {
-      //   // 复制列表
-      //   let list = _.cloneDeep(this.items);
-      //   if (user.role == '0') {
-      //     let res = await this.query();
-      //     if (this.$checkRes(res)) {
-      //       list.push(...res.data);
-      //       this.$set(this, `items`, _.uniqBy(list, 'index'));
-      //     }
-      //   } else {
-      //     let data = user.menus;
-      //     list.push(...data);
-      //     this.$set(this, `items`, _.uniqBy(list, 'index'));
-      //   }
-      // }
     },
   },
   watch: {

src/router/index.js

@@ -90,25 +90,30 @@ export default new Router({
         // 用户中心
         // 申请书
         {
-          path: '/userExamine',
-          component: () => import('../views/userCenter/userExamine/index.vue'),
-          meta: { title: '申请书' },
+          path: '/firstApply',
+          component: () => import('../views/userCenter/userExamine/firstApply.vue'),
+          meta: { title: '待审中' },
+        },
+        {
+          path: '/updateApply',
+          component: () => import('../views/userCenter/userExamine/updateApply.vue'),
+          meta: { title: '审核未通过' },
         },
         {
           path: '/userExamine/detail',
           component: () => import('../views/userCenter/userExamine/detail.vue'),
-          meta: { title: '修改申请书' },
+          meta: { title: '审核意见查看' },
         },
         {
           path: '/userExamine/update',
           component: () => import('../views/userCenter/userExamine/update.vue'),
-          meta: { title: '审核结果查看' },
+          meta: { title: '修改申请书' },
         },
         // 评分总结
         {
-          path: '/userScore',
-          component: () => import('../views/userCenter/userScore/index.vue'),
-          meta: { title: '评分总结' },
+          path: '/expertExam',
+          component: () => import('../views/userCenter/userScore/expertExam.vue'),
+          meta: { title: '待专家评分' },
         },
       ],
     },

src/views/userCenter/userExamine/detail.vue

@@ -43,6 +43,13 @@ export default {
         { label: '审核人', prop: 'verify', showTip: true },
         { label: '审核电话', prop: 'verify_phone', showTip: true },
         { label: '审核时间', prop: 'create_time', showTip: true },
+        {
+          label: '状态',
+          prop: 'status',
+          format: item => {
+            return item === '1' ? '审核通过' : item === '-1' ? '审核未通过' : '未识别';
+          },
+        },
       ],
       list: [],
       total: 0,
@@ -76,7 +83,7 @@ export default {
     },
     // 返回
     back() {
-      this.$router.push({ path: '/userExamine' });
+      this.$router.push({ path: '/updateApply' });
     },
   },
   computed: {

src/views/userCenter/userExamine/firstApply.vue

@@ -0,0 +1,66 @@
+<template>
+  <div id="firstApply">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="down">
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search"></data-table>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import dataTable from '@common/src/components/frame/filter-page-table.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: achieveApply } = createNamespacedHelpers('achieveApply');
+export default {
+  name: 'firstApply',
+  props: {},
+  components: { dataTable },
+  data: function() {
+    return {
+      opera: [],
+      fields: [
+        { label: '成果编号', prop: 'basic.achieve_num', filter: 'input', showTip: true },
+        { label: '成果名称', prop: 'basic.achieve_name', showTip: true },
+        { label: '成果类别', prop: 'basic.achieve_type', showTip: true },
+        {
+          label: '状态',
+          prop: 'status',
+          format: item => {
+            return item === '0' ? '待审中' : item === '-1' ? '审核未通过' : '未识别';
+          },
+        },
+      ],
+      list: [],
+      total: 0,
+    };
+  },
+  async created() {
+    await this.search();
+  },
+  methods: {
+    ...achieveApply(['query']),
+    // 查询列表
+    async search({ skip = 0, limit = 10, ...info } = {}) {
+      const res = await this.query({ skip, limit, status: 0, user_id: this.user.id, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, 'list', res.data);
+        this.$set(this, `total`, res.total);
+      }
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/userCenter/userExamine/update.vue

@@ -107,7 +107,7 @@ export default {
     },
     // 返回
     back() {
-      this.$router.push({ path: '/userExamine' });
+      this.$router.push({ path: '/updateApply' });
     },
   },
   computed: {

src/views/userCenter/userExamine/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="index">
+  <div id="updateApply">
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="down">
@@ -15,7 +15,7 @@ import dataTable from '@common/src/components/frame/filter-page-table.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: achieveApply } = createNamespacedHelpers('achieveApply');
 export default {
-  name: 'index',
+  name: 'updateApply',
   props: {},
   components: { dataTable },
   data: function() {
@@ -24,9 +24,6 @@ export default {
         {
           label: '审核意见查看',
           method: 'view',
-          // display: item => {
-          //   return item == '-1' ? true : false;
-          // },
         },
         {
           label: '申请书修改',
@@ -57,7 +54,7 @@ export default {
     ...achieveApply(['query']),
     // 查询列表
     async search({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.query({ skip, limit, user_id: this.user.id, ...info });
+      const res = await this.query({ skip, limit, status: -1, user_id: this.user.id, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, 'list', res.data);
         this.$set(this, `total`, res.total);

src/views/userCenter/userScore/expertExam.vue

@@ -0,0 +1,66 @@
+<template>
+  <div id="expertExam">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="down">
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search"></data-table>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import dataTable from '@common/src/components/frame/filter-page-table.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: achieveApply } = createNamespacedHelpers('achieveApply');
+export default {
+  name: 'expertExam',
+  props: {},
+  components: { dataTable },
+  data: function() {
+    return {
+      opera: [],
+      fields: [
+        { label: '成果编号', prop: 'basic.achieve_num', filter: 'input', showTip: true },
+        { label: '成果名称', prop: 'basic.achieve_name', showTip: true },
+        { label: '成果类别', prop: 'basic.achieve_type', showTip: true },
+        {
+          label: '状态',
+          prop: 'status',
+          format: item => {
+            return item === '1' ? '待专家评分' : '未识别';
+          },
+        },
+      ],
+      list: [],
+      total: 0,
+    };
+  },
+  async created() {
+    await this.search();
+  },
+  methods: {
+    ...achieveApply(['query']),
+    // 查询列表
+    async search({ skip = 0, limit = 10, ...info } = {}) {
+      const res = await this.query({ skip, limit, status: 1, user_id: this.user.id, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, 'list', res.data);
+        this.$set(this, `total`, res.total);
+      }
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/userCenter/userScore/index.vue

@@ -1,30 +0,0 @@
-<template>
-  <div id="index">
-    <p>评分总结</p>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'index',
-  props: {},
-  components: {},
-  data: function() {
-    return {};
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-};
-</script>
-
-<style lang="less" scoped></style>

vue.config.js

@@ -25,12 +25,12 @@ module.exports = {
         target: 'http://broadcast.waityou24.cn',
       },
       '/api/live': {
-        target: 'http://192.168.1.19:9101',
+        target: 'http://broadcast.waityou24.cn',
         changeOrigin: true,
         ws: false,
       },
       '/api/achieve': {
-        target: 'http://192.168.1.19:9103',
+        target: 'http://broadcast.waityou24.cn',
         changeOrigin: true,
         ws: false,
       },