guhongwei 4 jaren geleden
bovenliggende
commit
6bae984a32

+ 1 - 0
package.json

@@ -16,6 +16,7 @@
     "jsonwebtoken": "^8.5.1",
     "jspdf": "^2.3.1",
     "lodash": "^4.17.20",
+    "moment": "^2.29.1",
     "naf-core": "^0.1.2",
     "qrcode": "^1.4.4",
     "vue": "^2.6.11",

+ 7 - 3
src/views/adminCenter/adminCate/detail.vue

@@ -52,7 +52,7 @@ export default {
   data: function() {
     return {
       // 成果详情
-      active: 2,
+      active: 1,
       form: {
         // 基本信息
         basic: {},
@@ -69,7 +69,7 @@ export default {
     await this.search();
   },
   methods: {
-    ...achieveApply(['fetch']),
+    ...achieveApply(['fetch', 'update']),
     async search() {
       if (this.id) {
         let res = await this.fetch(this.id);
@@ -82,8 +82,12 @@ export default {
       this.$router.push({ path: '/adminCate' });
     },
     // 提交
-    onSubmit({ data }) {
+    async onSubmit({ data }) {
       console.log(data);
+      let res = await this.update(data);
+      if (this.$checkRes(res)) {
+        console.log(res);
+      }
     },
     // 上一步
     up(type) {

+ 0 - 184
src/views/adminCenter/adminCate/parts/one copy.vue

@@ -1,184 +0,0 @@
-<template>
-  <div id="one">
-    <el-row>
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="top" id="demo">
-          <el-form ref="form" :model="form" label-width="100px">
-            <el-col :span="24" class="title">
-              吉林省科技成果评价证书
-            </el-col>
-            <el-col :span="24" class="num">
-              <p>吉发号[<el-input v-model="form.basic.jf_num"></el-input>]第<el-input v-model="form.basic.jf_nums"></el-input>号</p>
-            </el-col>
-            <el-col :span="24" class="info">
-              <el-col :span="24" class="infoMess">
-                <span>成果名称:</span>
-                <el-input v-model="form.basic.achieve_name"></el-input>
-              </el-col>
-              <el-col :span="24" class="infoMess">
-                <span>完成单位(盖章):</span>
-                <el-input v-model="form.basic.apply_company"></el-input>
-              </el-col>
-              <el-col :span="24" class="infoMess">
-                <span>完成人(签字):</span>
-                <el-input v-model="form.basic.contacts"></el-input>
-              </el-col>
-            </el-col>
-            <el-col :span="24" class="date">
-              <p>
-                申请评价日期:<span>{{ getDate('yyyy') }}年</span><span>{{ getDate('MM') }}月</span><span>{{ getDate('DD') }}日</span>
-              </p>
-            </el-col>
-            <el-col :span="24" class="make">
-              <p>吉林省发明协会</p>
-              <p>二0一八年十二月制</p>
-            </el-col>
-          </el-form>
-        </el-col>
-        <el-col :span="24" class="down">
-          <el-button type="primary" size="mini" @click="next">下一步</el-button>
-          <el-button type="primary" size="mini" @click="handleDown">下载</el-button>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import htmlToPdf from '@/unit/htmlToPdf.js';
-const moment = require('moment');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'one',
-  props: {
-    form: { type: Object },
-  },
-  components: {},
-  data: function() {
-    return {};
-  },
-  created() {},
-  methods: {
-    getDate(date) {
-      if (date == 'yyyy') {
-        return moment().format('YYYY');
-      } else if (date == 'MM') {
-        return moment().format('MM');
-      } else if (date == 'DD') {
-        return moment().format('DD');
-      }
-    },
-    next() {
-      this.$emit('next');
-    },
-    handleDown() {
-      htmlToPdf.downloadPDF(document.querySelector('#demo'), '测试');
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  padding: 0 28%;
-  .top {
-    width: 700px;
-    height: 990px;
-    // border: 1px solid #ccc;
-    padding: 0 15px;
-    .title {
-      font-size: 45px;
-      text-align: center;
-      font-weight: bold;
-      padding: 120px 0 0 0;
-      font-family: cursive;
-      margin: 0 0 30px 0;
-    }
-    .num {
-      text-align: center;
-      margin: 0 0 90px 0;
-      p {
-        font-size: 24px;
-        font-family: cursive;
-      }
-      /deep/.el-input {
-        width: 10%;
-      }
-      /deep/.el-input__inner {
-        border: none;
-        border-bottom: 2px solid #000;
-        border-radius: 0;
-        font-size: 20px;
-        padding: 0 0;
-        text-align: center;
-      }
-    }
-    .info {
-      padding: 0 40px;
-      .infoMess {
-        height: 40px;
-        line-height: 40px;
-        margin: 10px 0;
-        span {
-          display: inline-block;
-          width: 37%;
-          height: 45px;
-          line-height: 45px;
-          font-size: 24px;
-          font-family: cursive;
-        }
-        /deep/.el-input {
-          width: 63%;
-        }
-        /deep/.el-input__inner {
-          border: none;
-          border-bottom: 2px solid #000;
-          border-radius: 0;
-          font-size: 20px;
-          line-height: 45px;
-          height: 45px;
-        }
-      }
-    }
-    .date {
-      height: 45px;
-      line-height: 45px;
-      margin: 60px 0 0 0;
-      font-size: 25px;
-      padding: 0 40px;
-      font-family: cursive;
-      span {
-        display: inline-block;
-        height: 45px;
-        line-height: 45px;
-        padding: 0 10px;
-      }
-    }
-    .make {
-      margin: 220px 0 0 0;
-      text-align: center;
-      p {
-        font-size: 20px;
-        padding: 5px 0;
-      }
-    }
-  }
-  .down {
-    margin: 15px 0 0 0;
-    text-align: center;
-  }
-}
-</style>

+ 42 - 43
src/views/adminCenter/adminCate/parts/two.vue

@@ -175,7 +175,7 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[0].zw }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
@@ -200,7 +200,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          出生
+                          {{ form.research[0].birth }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -208,7 +208,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          card
+                          {{ form.research[0].card }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -216,7 +216,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          出生
+                          {{ form.research[0].phone }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -224,7 +224,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          邮箱
+                          {{ form.research[0].email }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -232,57 +232,57 @@
                   <el-col :span="24" class="right1">
                     <el-col :span="12" class="right1_one">
                       <el-col :span="6" class="right1_oneleft">
-                        第参加人
+                        第参加人
                       </el-col>
                       <el-col :span="18" class="right1_oneright">
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_name }}
+                            {{ form.research[1].research_name }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].gender }}
+                            {{ form.research[1].gender }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].education }}
+                            {{ form.research[1].education }}
                           </el-col>
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].degree }}
+                            {{ form.research[1].degree }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[1].zw }}
                           </el-col>
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[1].position }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_company }}
+                            {{ form.research[1].research_company }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -293,7 +293,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          出生
+                          {{ form.research[1].birth }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -301,7 +301,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          card
+                          {{ form.research[1].card }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -309,7 +309,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          出生
+                          {{ form.research[1].phone }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -317,7 +317,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          邮箱
+                          {{ form.research[1].email }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -325,57 +325,57 @@
                   <el-col :span="24" class="right1">
                     <el-col :span="12" class="right1_one">
                       <el-col :span="6" class="right1_oneleft">
-                        第三参加人
+                        第二參加人
                       </el-col>
                       <el-col :span="18" class="right1_oneright">
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_name }}
+                            {{ form.research[2].research_name }}
                           </el-col>
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].gender }}
+                            {{ form.research[2].gender }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].education }}
+                            {{ form.research[2].education }}
                           </el-col>
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].degree }}
+                            {{ form.research[2].degree }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[2].zw }}
                           </el-col>
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[2].position }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
-                          <el-col :span="6" class="right1_oneright1_one">
+                          <el-col :span="6" class="right1_oneright1_one ">
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_company }}
+                            {{ form.research[2].research_company }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -386,7 +386,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          出生
+                          {{ form.research[2].birth }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -394,7 +394,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          card
+                          {{ form.research[2].card }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -402,7 +402,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          出生
+                          {{ form.research[2].phone }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -410,7 +410,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          邮箱
+                          {{ form.research[2].email }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -1002,6 +1002,5 @@ export default {
 /deep/.el-radio {
   color: #000;
   font-size: 14px;
-  // font-weight: bold;
 }
 </style>

+ 4 - 0
src/views/userCenter/common/parts/research.vue

@@ -25,6 +25,10 @@ export default {
         { label: '姓名', prop: 'research_name', showTip: true },
         { label: '身份证号', prop: 'card', showTip: true },
         { label: '性别', prop: 'gender', showTip: true },
+        { label: '出生日期', prop: 'birth', showTip: true },
+        { label: '电话', prop: 'phone', showTip: true },
+        { label: '邮箱', prop: 'email', showTip: true },
+        { label: '职务', prop: 'zw', showTip: true },
         { label: '技术职称', prop: 'position', showTip: true },
         { label: '文化程度', prop: 'education', showTip: true },
         { label: '学位', prop: 'degree', showTip: true },

+ 1 - 1
src/views/userCenter/common/update.vue

@@ -45,7 +45,7 @@ export default {
   data: function() {
     return {
       // 步骤
-      active: 1,
+      active: 3,
       form: {
         basic: {},
         brief: {},

+ 19 - 3
src/views/userCenter/common/updateParts/research.vue

@@ -11,7 +11,11 @@
               <el-table-column prop="research_name" label="姓名" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="card" label="身份证号" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="gender" label="性别" align="center" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="position" label="技术职称" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="birth" label="出生日期" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="phone" label="电话" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="email" label="邮箱" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="zw" label="职务" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="position" label="职称" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="education" label="文化程度" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="degree" label="学位" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="abroad" label="是否留学归国" align="center" show-overflow-tooltip> </el-table-column>
@@ -46,8 +50,20 @@
             <el-radio label="女"></el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="技术职称" prop="position">
-          <el-input v-model="form.position" placeholder="请输入技术职称"></el-input>
+        <el-form-item label="出生日期" prop="birth">
+          <el-date-picker v-model="form.birth" type="date" placeholder="选择日期时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入电话"></el-input>
+        </el-form-item>
+        <el-form-item label="email" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
+        </el-form-item>
+        <el-form-item label="职务" prop="zw">
+          <el-input v-model="form.zw" placeholder="请输入职务"></el-input>
+        </el-form-item>
+        <el-form-item label="职称" prop="position">
+          <el-input v-model="form.position" placeholder="请输入职称"></el-input>
         </el-form-item>
         <el-form-item label="文化程度" prop="education">
           <el-input v-model="form.education" placeholder="请输入文化程度"></el-input>

+ 124 - 51
src/views/userDeclare/index.vue

@@ -52,66 +52,139 @@ export default {
       active: 1,
       // 基本信息
       basic: {
-        // achieve_date: '2021-03-18 15:54:57',
-        // achieve_form: '成果形式',
-        // achieve_name: '成果名称',
-        // achieve_num: '成果编号',
-        // achieve_type: '成果类别',
-        // address: '地址',
-        // apply_company: '申请单位',
-        // apply_nature: '申请属性',
-        // apply_personal: '申请人',
-        // apply_phone: '13943018185',
-        // contacts: '长春市福瑞科技有限公司',
-        // email: 'myhope1977@163.com',
-        // fax: '传真',
-        // objective: '评价目的',
-        // output: '效益产值',
-        // phone: '13943018186',
-        // profit: '效益利润',
-        // revenue: '效益税收',
-        // stage: '所处阶段',
+        achieve_date: '2021-04-13 09:32:30',
+        achieve_form: '新工艺',
+        achieve_name: '0413-测试成果',
+        achieve_num: '1',
+        achieve_type: '发明专利',
+        address: '吉林省长春市',
+        apply_company: '长春市福瑞科技有限公司',
+        apply_nature: '企业',
+        apply_personal: '长春市福瑞科技有限公司',
+        apply_phone: '13943018186',
+        contacts: '联系人',
+        email: '123456',
+        fax: '123456',
+        objective: '申报奖励',
+        output: '100',
+        phone: '13943018186',
+        profit: '200',
+        revenue: '300',
+        stage: '实验室',
       },
       // 内容简介
       brief: {
-        // achieve_brief: '成果简介',
-        // advanced: '先进性',
-        // compare: '技术比较',
-        // field: '技术原理',
-        // kpi_index: '性能指标',
-        // opinion: '改进意见',
-        // prospect: '推广前景',
-        // sense: '作用意义',
+        achieve_brief: '简介',
+        advanced: '先进性',
+        compare: '技术比较',
+        field: '技术原理',
+        kpi_index: '性能指标',
+        opinion: '改进意见',
+        prospect: '前景',
+        sense: '作用意义',
       },
       // 研发人员名单
       research: [
-        // {
-        //   abroad: '是',
-        //   card: '1',
-        //   degree: '1',
-        //   devote: '1',
-        //   education: '1',
-        //   gender: '男',
-        //   position: '1',
-        //   research_company: '1',
-        //   research_name: '专家1',
-        // },
+        {
+          abroad: '否',
+          birth: '2021-04-13',
+          card: '220182199603257019',
+          degree: '学士',
+          devote: '1',
+          education: '本科',
+          email: '1',
+          gender: '男',
+          phone: '17319450324',
+          zw: '职务',
+          position: '职称',
+          research_company: '长春市福瑞科技有限公司',
+          research_name: '研发1',
+        },
+        {
+          abroad: '否',
+          birth: '2021-04-13',
+          card: '220182199603257020',
+          degree: '学士',
+          devote: '1',
+          education: '本科',
+          email: '1',
+          gender: '男',
+          phone: '17543727325',
+          zw: '职务',
+          position: '职称',
+          research_company: '长春市福瑞科技有限公司',
+          research_name: '研发2',
+        },
+        {
+          abroad: '否',
+          birth: '2021-04-13',
+          card: '220182199603257021',
+          degree: '学士',
+          devote: '1',
+          education: '本科',
+          email: '1',
+          gender: '男',
+          phone: '14798190770',
+          zw: '职务',
+          position: '职称',
+          research_company: '长春市福瑞科技有限公司',
+          research_name: '研发3',
+        },
       ],
       // 补充材料
       datalist: {
-        // app_prove: '/files/live/userDeclare/appprove/20210318155724.docx',
-        // assess_report: '/files/live/userDeclare/assessreport/20210318155722.docx',
-        // benefit: '/files/live/userDeclare/benefit/20210318155716.docx',
-        // budget: '/files/live/userDeclare/budget/20210318155742.docx',
-        // final: '/files/live/userDeclare/final/20210318155745.docx',
-        // patent: '/files/live/userDeclare/patent/20210318155736.docx',
-        // quality: '/files/live/userDeclare/quality/20210318155733.docx',
-        // science_report: '/files/live/userDeclare/sciencereport/20210318155719.docx',
-        // special: '/files/live/userDeclare/special/20210318155739.docx',
-        // techol_ppt: '/files/live/userDeclare/techolppt/20210318155727.docx',
-        // techol_report: '/files/live/userDeclare/techolreport/20210318155713.docx',
-        // testing_report: '/files/live/userDeclare/testingreport/20210318155730.docx',
-        // work_report: '/files/live/userDeclare/workreport/20210318155710.docx',
+        app_prove: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/appprove/20210413093752.txt',
+        },
+        assess_report: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/assessreport/20210413093750.txt',
+        },
+        benefit: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/benefit/20210413093744.txt',
+        },
+        budget: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/budget/20210413093807.txt',
+        },
+        final: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/final/20210413093810.txt',
+        },
+        patent: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/patent/20210413093802.txt',
+        },
+        quality: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/quality/20210413093800.txt',
+        },
+        science_report: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/sciencereport/20210413093747.txt',
+        },
+        special: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/special/20210413093805.txt',
+        },
+        techol_ppt: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/techolppt/20210413093755.txt',
+        },
+        techol_report: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/techolreport/20210413093742.txt',
+        },
+        testing_report: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/testingreport/20210413093758.txt',
+        },
+        work_report: {
+          name: '程序.txt',
+          url: '/files/live/userDeclare/workreport/20210413093739.txt',
+        },
       },
     };
   },

+ 19 - 3
src/views/userDeclare/parts/research.vue

@@ -11,7 +11,11 @@
               <el-table-column prop="research_name" label="姓名" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="card" label="身份证号" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="gender" label="性别" align="center" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="position" label="技术职称" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="birth" label="出生日期" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="phone" label="电话" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="email" label="邮箱" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="zw" label="职务" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="position" label="职称" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="education" label="文化程度" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="degree" label="学位" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="abroad" label="是否留学归国" align="center" show-overflow-tooltip> </el-table-column>
@@ -46,8 +50,20 @@
             <el-radio label="女"></el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="技术职称" prop="position">
-          <el-input v-model="form.position" placeholder="请输入技术职称"></el-input>
+        <el-form-item label="出生日期" prop="birth">
+          <el-date-picker v-model="form.birth" type="date" placeholder="选择日期时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入电话"></el-input>
+        </el-form-item>
+        <el-form-item label="email" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
+        </el-form-item>
+        <el-form-item label="职务" prop="zw">
+          <el-input v-model="form.zw" placeholder="请输入职务"></el-input>
+        </el-form-item>
+        <el-form-item label="职称" prop="position">
+          <el-input v-model="form.position" placeholder="请输入职称"></el-input>
         </el-form-item>
         <el-form-item label="文化程度" prop="education">
           <el-input v-model="form.education" placeholder="请输入文化程度"></el-input>

+ 2 - 2
vue.config.js

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