1

src/router/index.js

@@ -239,12 +239,6 @@ export default new Router({
           component: () => import('../views/userCenter/userCert/index.vue'),
           meta: { title: '证书管理' },
         },
-        // 证书查看
-        {
-          path: '/userCert/detail',
-          component: () => import('../views/userCenter/userCert/detail.vue'),
-          meta: { title: '证书查看' },
-        },
         // 个人中心-公共组件
         // 资料信息
         {
@@ -270,6 +264,12 @@ export default new Router({
           component: () => import('../views/userCenter/common/update.vue'),
           meta: { title: '修改申请' },
         },
+        // 证书查看
+        {
+          path: '/userCommon/certDetail',
+          component: () => import('../views/userCenter/common/certDetail.vue'),
+          meta: { title: '证书查看' },
+        },
       ],
     },
     {

src/views/adminCenter/adminHaveCert/index.vue

@@ -3,7 +3,7 @@
     <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>
+          <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @cert="toCert"></data-table>
         </el-col>
       </el-col>
     </el-row>
@@ -26,7 +26,12 @@ export default {
   },
   data: function() {
     return {
-      opera: [],
+      opera: [
+        {
+          label: '证书查看',
+          method: 'cert',
+        },
+      ],
       fields: [
         { label: '成果编号', prop: 'basic.achieve_num', filter: 'input', showTip: true },
         { label: '成果名称', prop: 'basic.achieve_name', showTip: true },
@@ -50,6 +55,10 @@ export default {
         this.$set(this, `total`, res.total);
       }
     },
+    // 证书查看
+    toCert({ data }) {
+      this.$router.push({ path: '/userCommon/certDetail', query: { id: data.id } });
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/userCenter/userCert/detail.vue

@@ -104,7 +104,7 @@ export default {
     // },
     // 返回
     back() {
-      this.$router.push({ path: '/userCert' });
+      window.history.back();
     },
   },
   computed: {

src/views/userCenter/common/update.vue

@@ -55,10 +55,11 @@ export default {
     };
   },
   async created() {
+    console.log(this.user);
     await this.search();
   },
   methods: {
-    ...achieveApply(['fetch', 'update']),
+    ...achieveApply(['fetch', 'update', 'create']),
     async search() {
       if (this.id) {
         let res = await this.fetch(this.id);
@@ -95,14 +96,25 @@ export default {
     async onSubmit() {
       let data = this.form;
       data.status = this.status;
-      console.log(data);
-      let res = await this.update(data);
-      if (this.$checkRes(res)) {
-        this.$message({
-          message: '修改信息完成，等待审核',
-          type: 'success',
-        });
-        this.back();
+      if (data.id) {
+        let res = await this.update(data);
+        if (this.$checkRes(res)) {
+          this.$message({
+            message: '修改信息完成，等待审核',
+            type: 'success',
+          });
+          this.back();
+        }
+      } else {
+        data.user_id = this.user.id;
+        let res = await this.create(data);
+        if (this.$checkRes(res)) {
+          this.$message({
+            message: '申报完成，等待审核',
+            type: 'success',
+          });
+          this.back();
+        }
       }
     },
     // 返回

src/views/userCenter/common/updateParts/basic.vue

@@ -28,6 +28,9 @@
           <el-form-item label="申请人" prop="apply_personal">
             <el-input v-model="basicForm.apply_personal" placeholder="请输入申请人"></el-input>
           </el-form-item>
+          <el-form-item label="申请电话" prop="apply_phone">
+            <el-input v-model="basicForm.apply_phone" placeholder="请输入申请电话"></el-input>
+          </el-form-item>
           <el-form-item label="申请单位" prop="apply_company">
             <el-input v-model="basicForm.apply_company" placeholder="请输入申请单位"></el-input>
           </el-form-item>
@@ -98,6 +101,7 @@ export default {
         achieve_date: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
         achieve_form: [{ required: true, message: '请输入成果形式', trigger: 'blur' }],
         apply_personal: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
+        apply_phone: [{ required: true, message: '请输入申请电话', trigger: 'blur' }],
         apply_company: [{ required: true, message: '请输入申请单位', trigger: 'blur' }],
         address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
         apply_nature: [{ required: true, message: '请输入申请单位/申请人属性', trigger: 'blur' }],

src/views/userCenter/common/updateParts/datalists.vue

@@ -294,7 +294,8 @@ export default {
     },
     // 图片上传
     uploadSuccess({ type, data }) {
-      this.$set(this.datalistForm, `${type}`, data.uri);
+      let newData = { url: data.uri, name: data.name };
+      this.$set(this.datalistForm, `${type}`, newData);
     },
     // 删除图片
     uploadDelete(data) {

src/views/userCenter/userCert/index.vue

@@ -91,7 +91,7 @@ export default {
     },
     // 证书查看
     toCert({ data }) {
-      this.$router.push({ path: '/userCert/detail', query: { id: data.id } });
+      this.$router.push({ path: '/userCommon/certDetail', query: { id: data.id } });
     },
   },
   computed: {

src/views/userCenter/userMydeclare/nowDeclare.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="main">
         <el-col :span="24" class="top">
-          <el-button type="primary" size="mini">新加申报</el-button>
+          <el-button type="primary" size="mini" @click="add">新加申报</el-button>
         </el-col>
         <el-col :span="24" class="down">
           <el-tabs type="card" v-model="active">
@@ -33,7 +33,12 @@ export default {
     };
   },
   created() {},
-  methods: {},
+  methods: {
+    // 新增申报
+    add() {
+      this.$router.push({ path: '/userCommon/update', query: { status: '0' } });
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/views/userCenter/userMydeclare/parts/list.vue

@@ -20,7 +20,7 @@ export default {
         {
           label: '资料查看',
           method: 'view',
-          display: i => i.status === '0',
+          // display: i => i.status === '0',
         },
         {
           label: '修改申请',
@@ -41,7 +41,7 @@ export default {
           label: '状态',
           prop: 'status',
           format: item => {
-            return item === '0' ? '待审中' : item === '-1' ? '审核未通过' : '未识别';
+            return item === '0' ? '待审中' : item === '-1' ? '审核未通过' : item === '-5' ? '申报失败' : item === '6' ? '申报成功' : '未识别';
           },
         },
       ],