guhongwei před 3 roky
rodič
revize
58203fadac

+ 1 - 1
src/components/frame/e-dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="e-dialog">
-    <el-dialog :title="dialog.title" :visible.sync="dialog.show" width="40%" :before-close="toClose" :close-on-click-modal="false">
+    <el-dialog :title="dialog.title" :visible.sync="dialog.show" width="40%" :before-close="toClose" :close-on-click-modal="false" :append-to-body="true">
       <slot name="info"></slot>
     </el-dialog>
   </div>

+ 5 - 4
src/components/frame/s-upload.vue

@@ -95,13 +95,14 @@ export default {
       }
       // 文件大小改为10Mb
       const isLt20M = file.size / 1024 / 1024 < 10;
-      if (!isType) {
-        this.$message.error('图片格式不正确');
-      }
+      // if (!isType) {
+      //   this.$message.error('图片格式不正确');
+      // }
       if (!isLt20M) {
         this.$message.error('文件超出10M');
       }
-      return isType && isLt20M;
+      // return isType && isLt20M;
+      return isLt20M;
     },
     defalutProcess(val) {
       if (_.isArray(val)) {

+ 46 - 0
src/layout/deploy/achieveType.js

@@ -0,0 +1,46 @@
+// 成果类别
+export const achievetype = [{ name: '发明专利' }, { name: '实用新型专利' }, { name: '软件著作权' }, { name: '出版著作' }, { name: '论文' }, { name: '其他' }];
+// 成果形式
+export const achieveform = [
+  { name: '新技术' },
+  { name: '新工艺' },
+  { name: '新产品' },
+  { name: '新材料' },
+  { name: '新装备' },
+  { name: '农业,生物新品种' },
+  { name: '矿产新品种' },
+  { name: '论文' },
+  { name: '著作' },
+  { name: '其他' },
+];
+// 申请人属性
+export const applynature = [{ name: '独立科研机构' }, { name: '大专院校' }, { name: '医疗机构' }, { name: '企业' }, { name: '其他机构' }, { name: '自然人' }];
+// 评价目的
+export const objective = [{ name: '申报奖励' }, { name: '成果转化' }, { name: '项目验收' }, { name: '其他' }];
+// 成果所处阶段
+export const stage = [{ name: '实验室' }, { name: '小试' }, { name: '中试产品' }, { name: '市场化产品' }];
+
+// 成果影响及作用
+export const achieveinfluence = [
+  { name: '形成自主研发能力' },
+  { name: '突破关键技术' },
+  { name: '试点示范' },
+  { name: '规模生产' },
+  { name: '推广应用' },
+  { name: '其他' },
+];
+
+// 成果评价审核状态
+export const status = [
+  { label: '10', value: '草稿' },
+  { label: '0', value: '待审中' },
+  { label: '1', value: '形式审查通过,待评分' },
+  { label: '-1', value: '形式审查拒绝' },
+  { label: '-2', value: '评分审核未通过' },
+  { label: '3', value: '评分审核通过,待会审' },
+  { label: '4', value: '资料完善' },
+  { label: '-5', value: '会审审核未通过' },
+  { label: '5', value: '会审审核通过' },
+  { label: '6', value: '待发证书' },
+  { label: '7', value: '已发证书' },
+];

+ 110 - 6
src/layout/deploy/menu.js

@@ -23,11 +23,55 @@ export const system = [
   },
 ];
 export const uMenu = [
-  // {
-  //   icon: 'icon-ceshi',
-  //   index: '/adminCenter/test/index',
-  //   title: '测试页面',
-  // },
+  {
+    icon: 'icon-shouye',
+    index: '3',
+    title: '我的申报',
+    subs: [
+      {
+        icon: 'icon-shouye',
+        index: '/user/my/now',
+        title: '申报中',
+      },
+      {
+        icon: 'icon-shouye',
+        index: '/user/my/past',
+        title: '已往申报',
+      },
+    ],
+  },
+  {
+    icon: 'icon-shouye',
+    index: '/user/expertscore',
+    title: '专家评分',
+  },
+  {
+    icon: 'icon-shouye',
+    index: '/user/meeting',
+    title: '专家会审',
+  },
+  {
+    icon: 'icon-shouye',
+    index: '6',
+    title: '证书管理',
+    subs: [
+      {
+        icon: 'icon-shouye',
+        index: '/user/cert/file',
+        title: '资料归档',
+      },
+      {
+        icon: 'icon-shouye',
+        index: '/user/cert/grant',
+        title: '待发证书',
+      },
+      {
+        icon: 'icon-shouye',
+        index: '/user/cert/issued',
+        title: '已发证书',
+      },
+    ],
+  },
 ];
 export const aMenu = [
   {
@@ -45,7 +89,67 @@ export const aMenu = [
         index: '/admin/personal/expert',
         title: '专家用户',
       },
+      {
+        icon: 'icon-shouye',
+        index: '/admin/personal/psexpert',
+        title: '评审专家',
+      },
+    ],
+  },
+  {
+    icon: 'icon-shouye',
+    index: '/admin/shape',
+    title: '形式审查',
+  },
+  {
+    icon: 'icon-shouye',
+    index: '/admin/expertscore',
+    title: '专家评分',
+  },
+  {
+    icon: 'icon-shouye',
+    index: '/admin/meeting',
+    title: '专家会审',
+  },
+  {
+    icon: 'icon-shouye',
+    index: '7',
+    title: '证书管理',
+    subs: [
+      {
+        icon: 'icon-shouye',
+        index: '/admin/cert/file',
+        title: '资料归档',
+      },
+      {
+        icon: 'icon-shouye',
+        index: '/admin/cert/grant',
+        title: '证书发放',
+      },
+      {
+        icon: 'icon-shouye',
+        index: '/admin/cert/issued',
+        title: '已发证书',
+      },
+    ],
+  },
+];
+export const eMenu = [
+  {
+    icon: 'icon-shouye',
+    index: '3',
+    title: '审核管理',
+    subs: [
+      {
+        icon: 'icon-shouye',
+        index: '/expert/examine/review',
+        title: '专家初评',
+      },
+      {
+        icon: 'icon-shouye',
+        index: '/expert/examine/meeting',
+        title: '专家会审',
+      },
     ],
   },
 ];
-export const eMenu = [];

+ 43 - 0
src/store/apply.js

@@ -0,0 +1,43 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+const jwt = require('jsonwebtoken');
+Vue.use(Vuex);
+const api = {
+  test: `/achieveAdmin/api/apply`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.test}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.test}/${payload}`);
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.test}`, payload);
+    return res;
+  },
+  async update({ commit }, { _id, ...info } = {}) {
+    const res = await this.$axios.$post(`${api.test}/${_id}`, { ...info });
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.test}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

+ 43 - 0
src/store/checkRecord.js

@@ -0,0 +1,43 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+const jwt = require('jsonwebtoken');
+Vue.use(Vuex);
+const api = {
+  test: `/achieveAdmin/api/checkRecord`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.test}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.test}/${payload}`);
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.test}`, payload);
+    return res;
+  },
+  async update({ commit }, { _id, ...info } = {}) {
+    const res = await this.$axios.$post(`${api.test}/${_id}`, { ...info });
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.test}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

+ 6 - 0
src/store/expert.js

@@ -44,6 +44,12 @@ const actions = {
     }
     return res;
   },
+  async updatepd({ commit }, { _id, ...info } = {}) {
+    const res = await this.$axios.$post(`${api.test}/updatePwd/${_id}`, {
+      ...info,
+    });
+    return res;
+  },
 };
 export default {
   namespaced: true,

+ 43 - 0
src/store/reviewExpert.js

@@ -0,0 +1,43 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+const jwt = require('jsonwebtoken');
+Vue.use(Vuex);
+const api = {
+  test: `/achieveAdmin/api/reviewExpert`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.test}`, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.test}/${payload}`);
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.test}`, payload);
+    return res;
+  },
+  async update({ commit }, { _id, ...info } = {}) {
+    const res = await this.$axios.$post(`${api.test}/${_id}`, { ...info });
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.test}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

+ 6 - 0
src/store/user.js

@@ -44,6 +44,12 @@ const actions = {
     }
     return res;
   },
+  async updatepd({ commit }, { _id, ...info } = {}) {
+    const res = await this.$axios.$post(`${api.test}/updatePwd/${_id}`, {
+      ...info,
+    });
+    return res;
+  },
 };
 export default {
   namespaced: true,