guhongwei 3 gadi atpakaļ
vecāks
revīzija
be95328220

+ 0 - 125
src/views/Login copy.vue

@@ -1,125 +0,0 @@
-<template>
-  <div id="login">
-    <el-row>
-      <el-col :span="24">
-        <el-row>
-          <el-col :span="24" class="main">
-            <div class="w_1200">
-              <el-col :span="24" class="login">
-                <div class="ms-title">后台管理系统</div>
-                <el-form :model="form" :rules="rules" ref="login" label-width="0px" class="ms-content">
-                  <el-form-item prop="username">
-                    <el-input v-model="form.code_phone" placeholder="请输入手机号">
-                      <el-button slot="prepend" icon="el-icon-user"></el-button>
-                    </el-input>
-                  </el-form-item>
-                  <el-form-item prop="password">
-                    <el-input type="password" placeholder="请输入密码" v-model="form.passwd">
-                      <el-button slot="prepend" icon="el-icon-lock"></el-button>
-                    </el-input>
-                  </el-form-item>
-                  <div class="login-btn">
-                    <el-button type="primary" @click="submitForm()">登录</el-button>
-                  </div>
-                </el-form>
-              </el-col>
-            </div>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: adminLogin } = createNamespacedHelpers('adminLogin');
-export default {
-  metaInfo: { title: '登录' },
-  name: 'login',
-  props: {},
-  components: {},
-  data: function() {
-    return {
-      form: {},
-      rules: {
-        tel: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
-        pwd: [{ required: true, message: '请输入密码', trigger: 'blur' }],
-      },
-    };
-  },
-  created() {},
-  methods: {
-    ...adminLogin(['login']),
-    submitForm() {
-      this.$refs.login.validate(async valid => {
-        if (valid) {
-          let res = await this.login({ user: this.form });
-          if (this.$checkRes(res)) {
-            this.$message.success('登录成功');
-            this.$router.push('/homeIndex');
-          }
-        } else {
-          this.$message.error('请输入账号和密码');
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-  },
-  computed: {},
-};
-</script>
-
-<style lang="less" scoped>
-.w_1200 {
-  width: 1200px;
-  margin: 0 auto;
-}
-.main {
-  background-image: url(../assets/img/login-bg.jpg);
-  height: 100vh;
-  background-repeat: no-repeat;
-  background-size: cover;
-  .login {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    width: 350px;
-    margin: -190px 0 0 -175px;
-    border-radius: 5px;
-    background: hsla(0, 0%, 100%, 0.3);
-    overflow: hidden;
-    .ms-title {
-      width: 100%;
-      line-height: 50px;
-      text-align: center;
-      font-size: 20px;
-      color: #fff;
-      border-bottom: 1px solid #ddd;
-    }
-    .ms-content {
-      padding: 30px 30px;
-    }
-    .login-btn {
-      text-align: center;
-    }
-    .login-btn button {
-      width: 100%;
-      height: 36px;
-      margin-bottom: 10px;
-    }
-    .login-tips {
-      font-size: 12px;
-      line-height: 30px;
-      color: #fff;
-    }
-    /deep/.js .el-form-item__content {
-      padding: 0 25px;
-      .el-radio {
-        color: #fff;
-      }
-    }
-  }
-}
-</style>

+ 72 - 41
src/views/userDeclare/index.vue

@@ -17,10 +17,10 @@
                 </el-steps>
               </el-col>
               <el-col :span="24" class="twoInfo">
-                <basic :basicForm="basic" @basicBtn="basicBtn" v-if="active == '1'"></basic>
-                <brief :briefForm="brief" @briefUp="briefUp" @briefBtn="briefBtn" v-else-if="active == '2'"></brief>
-                <research :researchForm="research" @researchUp="researchUp" @researchBtn="researchBtn" v-else-if="active == '3'"></research>
-                <datalists :datalistForm="datalist" @detailedUp="detailedUp" @onSubmit="onSubmit" v-else-if="active == '4'"></datalists>
+                <basic :basicForm="basic" @timeBtn="timeBtn" @basicBtn="basicBtn" v-if="active == '1'"></basic>
+                <brief :briefForm="brief" @timeBtn="timeBtn" @briefUp="briefUp" @briefBtn="briefBtn" v-else-if="active == '2'"></brief>
+                <research :researchForm="research" @timeBtn="timeBtn" @researchUp="researchUp" @researchBtn="researchBtn" v-else-if="active == '3'"></research>
+                <datalists :datalistForm="datalist" @timeBtn="timeBtn" @detailedUp="detailedUp" @onSubmit="onSubmit" v-else-if="active == '4'"></datalists>
               </el-col>
             </el-col>
           </el-col>
@@ -54,7 +54,7 @@ export default {
       basic: {
         // achieve_date: '2021-05-24 10:13:08',
         // achieve_form: '新技术',
-        // achieve_name: '05-24成果',
+        // achieve_name: '06-01成果4',
         // achieve_num: '123456',
         // achieve_type: ['发明专利', '实用新型专利'],
         // address: '长春市',
@@ -86,49 +86,46 @@ export default {
       // 研发人员名单
       research: [
         // {
-        //   abroad: '否',
+        //   name: '姓名',
+        //   gender: '女',
+        //   age: '25',
         //   birth: '1996-03-25',
-        //   card: '220182199603257019',
-        //   degree: '5',
-        //   devote: '7',
-        //   education: '4',
-        //   email: '1',
-        //   gender: '男',
-        //   phone: '17319450324',
-        //   position: '3',
-        //   research_company: '6',
-        //   research_name: '专家1',
-        //   zw: '2',
+        //   zc: '职称',
+        //   education: '本科',
+        //   degree: '学士',
+        //   major: '计算机',
+        //   abroad: '否',
+        //   company: '工作单位',
+        //   work: '主要工作',
+        //   devote: '创造性意见',
         // },
         // {
-        //   abroad: '否',
+        //   name: '姓名',
+        //   gender: '女',
+        //   age: '25',
         //   birth: '1996-03-25',
-        //   card: '220182199603257019',
-        //   degree: '5',
-        //   devote: '7',
-        //   education: '4',
-        //   email: '1',
-        //   gender: '男',
-        //   phone: '17319450324',
-        //   position: '3',
-        //   research_company: '6',
-        //   research_name: '专家2',
-        //   zw: '2',
+        //   zc: '职称',
+        //   education: '本科',
+        //   degree: '学士',
+        //   major: '计算机',
+        //   abroad: '否',
+        //   company: '工作单位',
+        //   work: '主要工作',
+        //   devote: '创造性意见',
         // },
         // {
-        //   abroad: '否',
+        //   name: '姓名',
+        //   gender: '女',
+        //   age: '25',
         //   birth: '1996-03-25',
-        //   card: '220182199603257019',
-        //   degree: '5',
-        //   devote: '7',
-        //   education: '4',
-        //   email: '1',
-        //   gender: '男',
-        //   phone: '17319450324',
-        //   position: '3',
-        //   research_company: '6',
-        //   research_name: '专家3',
-        //   zw: '2',
+        //   zc: '职称',
+        //   education: '本科',
+        //   degree: '学士',
+        //   major: '计算机',
+        //   abroad: '否',
+        //   company: '工作单位',
+        //   work: '主要工作',
+        //   devote: '创造性意见',
         // },
       ],
       // 补充材料
@@ -176,6 +173,40 @@ export default {
     detailedUp() {
       this.active = 3;
     },
+    // 临时保存
+    async timeBtn({ arr, type }) {
+      if (type == '3') this.$set(this, `research`, arr);
+      let data = {
+        basic: this.basic,
+        brief: this.brief,
+        research: this.research,
+        datalist: this.datalist,
+        status: '10',
+      };
+      this.$alert(
+        '<strong><p>1:用户</p><p>当您进行成果申报时,系统会自动识别您是否为平台用户,未注册用户,系统会自动拾取【申请人】和【申请人电话】进行平台用户注册,您可用【申请人电话】和【初始密码123456】进行登录查看。</p></strong>',
+        '信息提示',
+        {
+          dangerouslyUseHTMLString: true,
+          showConfirmButton: true,
+          showCancelButton: true,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }
+      )
+        .then(async () => {
+          console.log(data);
+          let res = await this.create(data);
+          if (this.$checkRes(res)) {
+            this.$message({
+              message: '临时保存申报成功,请登录到管理中心继续编辑!',
+              type: 'success',
+            });
+            this.$router.push({ path: '/login' });
+          }
+        })
+        .catch(() => {});
+    },
     // 提交申报
     async onSubmit() {
       let data = {

+ 14 - 2
src/views/userDeclare/parts/basic.vue

@@ -78,8 +78,9 @@
             <el-input v-model="basicForm.revenue" placeholder="请输入经济效益税收"></el-input>
           </el-form-item>
           <el-col :span="24" class="btn">
-            <el-button type="primary" size="mini" @click="resetBtn">取消申报</el-button>
-            <el-button type="primary" size="mini" @click="basicBtn('basicForm')">下一步</el-button>
+            <el-button type="danger" size="mini" @click="resetBtn">取消申报</el-button>
+            <el-button type="primary" size="mini" @click="timeBtn('basicForm')">临时保存</el-button>
+            <el-button type="success" size="mini" @click="basicBtn('basicForm')">下一步</el-button>
           </el-col>
         </el-form>
       </el-col>
@@ -137,6 +138,17 @@ export default {
     resetBtn() {
       window.history.back();
     },
+    // 临时保存
+    timeBtn(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.$emit('timeBtn', { arr: this.basicForm, type: '1' });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
     // 下一步
     basicBtn(formName) {
       this.$refs[formName].validate(valid => {

+ 14 - 2
src/views/userDeclare/parts/brief.vue

@@ -33,8 +33,9 @@
             <el-input v-model="briefForm.opinion" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入存在的问题和改进意见"></el-input>
           </el-form-item>
           <el-col :span="24" class="btn">
-            <el-button type="primary" size="mini" @click="briefUp">上一步</el-button>
-            <el-button type="primary" size="mini" @click="briefBtn('briefForm')">下一步</el-button>
+            <el-button type="danger" size="mini" @click="briefUp">上一步</el-button>
+            <el-button type="primary" size="mini" @click="timeBtn('briefForm')">临时保存</el-button>
+            <el-button type="success" size="mini" @click="briefBtn('briefForm')">下一步</el-button>
           </el-col>
         </el-form>
       </el-col>
@@ -70,6 +71,17 @@ export default {
     briefUp() {
       this.$emit('briefUp');
     },
+    // 临时保存
+    timeBtn(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.$emit('timeBtn', { arr: this.briefForm, type: '2' });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
     // 下一步
     briefBtn(formName) {
       this.$refs[formName].validate(valid => {

+ 14 - 2
src/views/userDeclare/parts/datalists.vue

@@ -220,8 +220,9 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="btn">
-            <el-button type="primary" size="mini" @click="detailedUp">上一步</el-button>
-            <el-button type="primary" size="mini" @click="onSubmit('datalistForm')">提交申报</el-button>
+            <el-button type="danger" size="mini" @click="detailedUp">上一步</el-button>
+            <el-button type="primary" size="mini" @click="timeBtn('datalistForm')">临时保存</el-button>
+            <el-button type="success" size="mini" @click="onSubmit('datalistForm')">提交申报</el-button>
           </el-col>
         </el-form>
       </el-col>
@@ -263,6 +264,17 @@ export default {
     detailedUp() {
       this.$emit('detailedUp');
     },
+    // 临时保存
+    timeBtn(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.$emit('timeBtn', { arr: this.datalistForm, type: '4' });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
     onSubmit(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {

+ 251 - 0
src/views/userDeclare/parts/research copy.vue

@@ -0,0 +1,251 @@
+<template>
+  <div id="research">
+    <el-row>
+      <el-col :span="24" class="research">
+        <el-col :span="24" class="one">
+          <el-button type="primary" size="mini" @click="add">添加研发用户</el-button>
+        </el-col>
+        <el-col :span="24" class="two">
+          <el-col :span="24" class="list">
+            <el-table :data="list" border height="580">
+              <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="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>
+              <el-table-column prop="research_company" label="工作单位" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="devote" label="对成果创造性贡献" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column fixed="right" label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="toEdit(scope.$index, scope.row)">编辑</el-button>
+                  <el-button type="text" size="small" @click="toDelete(scope.$index, scope.row)">刪除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="btn">
+          <el-button type="primary" size="mini" @click="researchUp">上一步</el-button>
+          <el-button type="primary" size="mini" @click="researchBtn">下一步</el-button>
+        </el-col>
+      </el-col>
+    </el-row>
+    <el-dialog class="dialog" title="研发人员信息管理" width="40%" :visible.sync="dialog" @closed="handleClose" :destroy-on-close="true">
+      <el-form :model="form" :rules="rules" ref="form" label-width="130px">
+        <el-form-item label="姓名" prop="research_name">
+          <el-input v-model="form.research_name" placeholder="请输入姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号" prop="card">
+          <el-input v-model="form.card" placeholder="请输入身份证号" @blur="getCard(form.card)"></el-input>
+        </el-form-item>
+        <el-form-item label="性别" prop="gender">
+          <el-radio-group v-model="form.gender">
+            <el-radio label="男"></el-radio>
+            <el-radio label="女"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <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" disabled> </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>
+        </el-form-item>
+        <el-form-item label="学位" prop="degree">
+          <el-input v-model="form.degree" placeholder="请输入学位"></el-input>
+        </el-form-item>
+        <el-form-item label="是否留学归国" prop="abroad">
+          <el-radio-group v-model="form.abroad">
+            <el-radio label="是"></el-radio>
+            <el-radio label="否"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="工作单位" prop="research_company">
+          <el-input v-model="form.research_company" placeholder="请输入工作单位"></el-input>
+        </el-form-item>
+        <el-form-item label="对成果创造性贡献" prop="devote">
+          <el-input
+            v-model="form.devote"
+            type="textarea"
+            maxlength="200"
+            show-word-limit
+            :autosize="{ minRows: 4, maxRows: 5 }"
+            placeholder="请输入对成果创造性贡献"
+          ></el-input>
+        </el-form-item>
+        <el-col :span="24" class="btn">
+          <el-button type="primary" size="mini" @click="handleClose">取消</el-button>
+          <el-button type="primary" size="mini" @click="onSubmit('form')">保存</el-button>
+        </el-col>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'research',
+  props: {
+    researchForm: { type: Array },
+  },
+  components: {},
+  data: function() {
+    return {
+      dialog: false,
+      form: {},
+      rules: {
+        research_name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
+        card: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
+        gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+        position: [{ required: true, message: '请输入技术职称', trigger: 'blur' }],
+        education: [{ required: true, message: '请输入学历', trigger: 'blur' }],
+        degree: [{ required: true, message: '请输入学位', trigger: 'blur' }],
+        abroad: [{ required: false, message: '请选择是否留学归国', trigger: 'change' }],
+        research_company: [{ required: true, message: '请输入工作单位', trigger: 'blur' }],
+        devote: [{ required: false, message: '请输入对成果创造性贡献', trigger: 'blur' }],
+      },
+      // 列表
+      list: [],
+    };
+  },
+  created() {},
+  methods: {
+    // 获取出生年月日
+    getCard(idCard) {
+      var birthday = '';
+      if (idCard != null && idCard != '') {
+        if (idCard.length == 15) {
+          birthday = '19' + idCard.substr(6, 6);
+        } else if (idCard.length == 18) {
+          birthday = idCard.substr(6, 8);
+        }
+        birthday = birthday.replace(/(.{4})(.{2})/, '$1-$2-');
+      }
+      if (birthday) this.$set(this.form, `birth`, birthday);
+      else {
+        this.$message({
+          message: '请您重新填写身份证',
+          type: 'warning',
+        });
+      }
+    },
+    researchUp() {
+      this.$emit('researchUp');
+    },
+    researchBtn() {
+      this.$emit('researchBtn', { data: this.list });
+    },
+    // 添加研发人员
+    // 添加用户
+    add() {
+      this.dialog = true;
+    },
+    // 保存
+    onSubmit(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          console.log(this.form);
+          if (this.form.index == undefined) {
+            let data = _.cloneDeep(this.list);
+            data.push(this.form);
+            this.$set(this, `list`, data);
+            this.handleClose();
+          } else {
+            this.handleClose();
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    // 编辑
+    toEdit(index, row) {
+      row.index = index;
+      this.$set(this, `form`, row);
+      this.dialog = true;
+    },
+    // 删除
+    toDelete(index) {
+      this.list.splice(index, 1);
+    },
+    // 取消
+    handleClose() {
+      this.form = {};
+      this.dialog = false;
+    },
+    search() {
+      this.$set(this, `list`, this.researchForm);
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  watch: {
+    researchForm: {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        this.search();
+      },
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.research {
+  padding: 0 10px 0 0;
+  .one {
+    margin: 0 0 10px 0;
+  }
+  .two {
+    margin: 0 0 10px 0;
+    .list {
+      margin: 0 0 10px 0;
+      border-bottom: 1px solid #f1f1f1;
+    }
+    .page {
+      height: 40px;
+      overflow: hidden;
+      border: 1px solid red;
+    }
+  }
+  .btn {
+    text-align: center;
+  }
+}
+.dialog {
+  .btn {
+    text-align: center;
+    padding: 0 0 10px 0;
+  }
+}
+/deep/.el-dialog__body {
+  padding: 0 15px 40px 0;
+}
+</style>

+ 45 - 35
src/views/userDeclare/parts/research.vue

@@ -8,18 +8,17 @@
         <el-col :span="24" class="two">
           <el-col :span="24" class="list">
             <el-table :data="list" border height="580">
-              <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="name" 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="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="age" 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="zc" 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="major" label="现从事专业" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="abroad" label="是否留学归国" align="center" show-overflow-tooltip> </el-table-column>
-              <el-table-column prop="research_company" label="工作单位" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="company" label="工作单位" align="center" show-overflow-tooltip> </el-table-column>
+              <el-table-column prop="work" label="在项目中承担的主要工作" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column prop="devote" label="对成果创造性贡献" align="center" show-overflow-tooltip> </el-table-column>
               <el-table-column fixed="right" label="操作" width="100" align="center">
                 <template slot-scope="scope">
@@ -31,18 +30,16 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="btn">
-          <el-button type="primary" size="mini" @click="researchUp">上一步</el-button>
-          <el-button type="primary" size="mini" @click="researchBtn">下一步</el-button>
+          <el-button type="danger" size="mini" @click="researchUp">上一步</el-button>
+          <el-button type="primary" size="mini" @click="timeBtn">临时保存</el-button>
+          <el-button type="success" size="mini" @click="researchBtn">下一步</el-button>
         </el-col>
       </el-col>
     </el-row>
     <el-dialog class="dialog" title="研发人员信息管理" width="40%" :visible.sync="dialog" @closed="handleClose" :destroy-on-close="true">
       <el-form :model="form" :rules="rules" ref="form" label-width="130px">
-        <el-form-item label="姓名" prop="research_name">
-          <el-input v-model="form.research_name" placeholder="请输入姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="身份证号" prop="card">
-          <el-input v-model="form.card" placeholder="请输入身份证号" @blur="getCard(form.card)"></el-input>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名"></el-input>
         </el-form-item>
         <el-form-item label="性别" prop="gender">
           <el-radio-group v-model="form.gender">
@@ -50,20 +47,14 @@
             <el-radio label="女"></el-radio>
           </el-radio-group>
         </el-form-item>
-        <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" disabled> </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 label="年龄" prop="age">
+          <el-input v-model="form.age" placeholder="请输入年龄"></el-input>
         </el-form-item>
-        <el-form-item label="职务" prop="zw">
-          <el-input v-model="form.zw" 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="position">
-          <el-input v-model="form.position" placeholder="请输入职称"></el-input>
+        <el-form-item label="技术职称" prop="zc">
+          <el-input v-model="form.zc" placeholder="请输入技术职称"></el-input>
         </el-form-item>
         <el-form-item label="学历" prop="education">
           <el-input v-model="form.education" placeholder="请输入学历"></el-input>
@@ -71,14 +62,27 @@
         <el-form-item label="学位" prop="degree">
           <el-input v-model="form.degree" placeholder="请输入学位"></el-input>
         </el-form-item>
+        <el-form-item label="现从事专业" prop="major">
+          <el-input v-model="form.major" placeholder="请输入现从事专业"></el-input>
+        </el-form-item>
         <el-form-item label="是否留学归国" prop="abroad">
           <el-radio-group v-model="form.abroad">
             <el-radio label="是"></el-radio>
             <el-radio label="否"></el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="工作单位" prop="research_company">
-          <el-input v-model="form.research_company" placeholder="请输入工作单位"></el-input>
+        <el-form-item label="工作单位" prop="company">
+          <el-input v-model="form.company" placeholder="请输入工作单位"></el-input>
+        </el-form-item>
+        <el-form-item label="在项目中承担的主要工作" prop="work">
+          <el-input
+            v-model="form.work"
+            type="textarea"
+            maxlength="200"
+            show-word-limit
+            :autosize="{ minRows: 4, maxRows: 5 }"
+            placeholder="请输入在项目中承担的主要工作"
+          ></el-input>
         </el-form-item>
         <el-form-item label="对成果创造性贡献" prop="devote">
           <el-input
@@ -112,14 +116,17 @@ export default {
       dialog: false,
       form: {},
       rules: {
-        research_name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
-        card: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
-        position: [{ required: true, message: '请输入技术职称', trigger: 'blur' }],
+        age: [{ required: false, message: '请输入年龄', trigger: 'blur' }],
+        birth: [{ required: false, message: '请选择出生年月', trigger: 'change' }],
+        zc: [{ required: true, message: '请输入技术职称', trigger: 'blur' }],
         education: [{ required: true, message: '请输入学历', trigger: 'blur' }],
-        degree: [{ required: true, message: '请输入学位', trigger: 'blur' }],
-        abroad: [{ required: false, message: '请选择是否留学归国', trigger: 'change' }],
-        research_company: [{ required: true, message: '请输入工作单位', trigger: 'blur' }],
+        degree: [{ required: false, message: '请输入学位', trigger: 'blur' }],
+        major: [{ required: false, message: '请输入现从事专业', trigger: 'blur' }],
+        abroad: [{ required: false, message: '请选择', trigger: 'change' }],
+        company: [{ required: true, message: '请输入工作单位', trigger: 'blur' }],
+        work: [{ required: false, message: '请输入在项目中承担的主要工作', trigger: 'blur' }],
         devote: [{ required: false, message: '请输入对成果创造性贡献', trigger: 'blur' }],
       },
       // 列表
@@ -150,6 +157,9 @@ export default {
     researchUp() {
       this.$emit('researchUp');
     },
+    timeBtn() {
+      this.$emit('timeBtn', { arr: this.list, type: '3' });
+    },
     researchBtn() {
       this.$emit('researchBtn', { data: this.list });
     },