1

src/views/adminCenter/adminCate/parts/five.vue

@@ -8,10 +8,14 @@
           </el-col>
           <el-col :span="24" class="info">
             <el-table :data="form.research" border style="width: 100%" :highlight-current-row="false">
-              <el-table-column prop="research_name" label="姓名" align="center"> </el-table-column>
+              <el-table-column prop="name" label="姓名" align="center"> </el-table-column>
               <el-table-column prop="gender" label="性别" align="center"> </el-table-column>
-              <el-table-column prop="research_company" label="工作单位" align="center"> </el-table-column>
-              <el-table-column prop="position" label="技术职称" align="center"> </el-table-column>
+              <el-table-column prop="birth" label="出生年月" align="center"> </el-table-column>
+              <el-table-column prop="zc" label="技术职称" align="center"> </el-table-column>
+              <el-table-column prop="education" label="文化程度" align="center"> </el-table-column>
+              <el-table-column prop="abroad" label="是否留学归国" align="center"> </el-table-column>
+              <el-table-column prop="company" label="工作单位" align="center"> </el-table-column>
+              <el-table-column prop="devote" label="对成果创造性贡献" align="center"> </el-table-column>
             </el-table>
           </el-col>
         </el-col>

src/views/adminCenter/adminCate/parts/two.vue

@@ -142,13 +142,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].research_name : '暂无' }}
+                            <el-input v-model="form.research[0].name"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].gender : '暂无' }}
+                            <el-input v-model="form.research[0].gender"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -156,13 +156,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].education : '暂无' }}
+                            <el-input v-model="form.research[0].education"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].degree : '暂无' }}
+                            <el-input v-model="form.research[0].degree"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -170,13 +170,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].zw : '暂无' }}
+                            <el-input v-model="form.research[0].zw"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].position : '暂无' }}
+                            <el-input v-model="form.research[0].zc"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -184,7 +184,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[0] ? form.research[0].research_company : '暂无' }}
+                            <el-input v-model="form.research[0].company"></el-input>
                           </el-col>
                         </el-col>
                       </el-col>
@@ -195,7 +195,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0] ? form.research[0].birth : '暂无' }}
+                          <el-input v-model="form.research[0].birth"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -203,7 +203,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0] ? form.research[0].card : '暂无' }}
+                          <el-input v-model="form.research[0].card"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -211,7 +211,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0] ? form.research[0].phone : '暂无' }}
+                          <el-input v-model="form.research[0].phone"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -219,7 +219,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0] ? form.research[0].email : '暂无' }}
+                          <el-input v-model="form.research[0].email"></el-input>
                         </el-col>
                       </el-col>
                     </el-col>
@@ -235,13 +235,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].research_name : '暂无' }}
+                            <el-input v-model="form.research[1].name"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].gender : '暂无' }}
+                            <el-input v-model="form.research[1].gender"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -249,13 +249,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].education : '暂无' }}
+                            <el-input v-model="form.research[1].education"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].degree : '暂无' }}
+                            <el-input v-model="form.research[1].degree"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -263,13 +263,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].zw : '暂无' }}
+                            <el-input v-model="form.research[1].zw"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].position : '暂无' }}
+                            <el-input v-model="form.research[1].zc"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -277,7 +277,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[1] ? form.research[1].research_company : '暂无' }}
+                            <el-input v-model="form.research[1].company"></el-input>
                           </el-col>
                         </el-col>
                       </el-col>
@@ -288,7 +288,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1] ? form.research[1].birth : '暂无' }}
+                          <el-input v-model="form.research[1].birth"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -296,7 +296,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1] ? form.research[1].card : '暂无' }}
+                          <el-input v-model="form.research[1].card"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -304,7 +304,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1] ? form.research[1].phone : '暂无' }}
+                          <el-input v-model="form.research[1].phone"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -312,7 +312,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1] ? form.research[1].email : '暂无' }}
+                          <el-input v-model="form.research[1].email"></el-input>
                         </el-col>
                       </el-col>
                     </el-col>
@@ -320,7 +320,7 @@
                   <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">
@@ -328,13 +328,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].research_name : '暂无' }}
+                            <el-input v-model="form.research[2].name"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].gender : '暂无' }}
+                            <el-input v-model="form.research[2].gender"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -342,13 +342,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].education : '暂无' }}
+                            <el-input v-model="form.research[2].education"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].degree : '暂无' }}
+                            <el-input v-model="form.research[2].degree"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -356,13 +356,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].zw : '暂无' }}
+                            <el-input v-model="form.research[2].zw"></el-input>
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].position : '暂无' }}
+                            <el-input v-model="form.research[2].zc"></el-input>
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -370,7 +370,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[2] ? form.research[2].research_company : '暂无' }}
+                            <el-input v-model="form.research[2].company"></el-input>
                           </el-col>
                         </el-col>
                       </el-col>
@@ -381,7 +381,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2] ? form.research[2].birth : '暂无' }}
+                          <el-input v-model="form.research[2].birth"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -389,7 +389,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2] ? form.research[2].card : '暂无' }}
+                          <el-input v-model="form.research[2].card"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -397,7 +397,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2] ? form.research[2].phone : '暂无' }}
+                          <el-input v-model="form.research[2].phone"></el-input>
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -405,7 +405,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2] ? form.research[2].email : '暂无' }}
+                          <el-input v-model="form.research[2].email"></el-input>
                         </el-col>
                       </el-col>
                     </el-col>
@@ -764,6 +764,11 @@ export default {
                       border-right: 1px solid #000;
                       font-size: 12px;
                       text-align: center;
+                      /deep/.el-input__inner {
+                        height: 23px;
+                        line-height: 25px;
+                        padding: 0 5px;
+                      }
                     }
                     .right1_oneright1_one:last-child {
                       border-right: none;
@@ -785,6 +790,11 @@ export default {
                     height: 24px;
                     line-height: 24px;
                     padding: 0 5px;
+                    /deep/.el-input__inner {
+                      height: 23px;
+                      line-height: 25px;
+                      padding: 0 5px;
+                    }
                   }
                 }
               }

src/views/adminCenter/adminExamine/parts/research.vue

@@ -22,18 +22,17 @@ export default {
   data: function() {
     return {
       fields: [
-        { label: '姓名', prop: 'research_name', showTip: true },
-        { label: '身份证号', prop: 'card', showTip: true },
+        { label: '姓名', prop: 'name', 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: 'age', showTip: true },
+        { label: '出生年月', prop: 'birth', showTip: true },
+        { label: '技术职称', prop: 'zc', showTip: true },
+        { label: '学历', prop: 'education', showTip: true },
         { label: '学位', prop: 'degree', showTip: true },
+        { label: '现从事专业', prop: 'major', showTip: true },
         { label: '是否留学归国', prop: 'abroad', showTip: true },
-        { label: '工作单位', prop: 'research_company', showTip: true },
+        { label: '工作单位', prop: 'company', showTip: true },
+        { label: '在项目中承担的主要工作', prop: 'work', showTip: true },
         { label: '对成果创造性贡献', prop: 'devote', showTip: true },
       ],
     };

src/views/userCenter/common/parts/research.vue

@@ -22,18 +22,17 @@ export default {
   data: function() {
     return {
       fields: [
-        { label: '姓名', prop: 'research_name', showTip: true },
-        { label: '身份证号', prop: 'card', showTip: true },
+        { label: '姓名', prop: 'name', 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: 'age', showTip: true },
+        { label: '出生年月', prop: 'birth', showTip: true },
+        { label: '技术职称', prop: 'zc', showTip: true },
+        { label: '学历', prop: 'education', showTip: true },
         { label: '学位', prop: 'degree', showTip: true },
+        { label: '现从事专业', prop: 'major', showTip: true },
         { label: '是否留学归国', prop: 'abroad', showTip: true },
-        { label: '工作单位', prop: 'research_company', showTip: true },
+        { label: '工作单位', prop: 'company', showTip: true },
+        { label: '在项目中承担的主要工作', prop: 'work', showTip: true },
         { label: '对成果创造性贡献', prop: 'devote', showTip: true },
       ],
     };

src/views/userCenter/common/update.vue

@@ -15,10 +15,10 @@
             </el-steps>
           </el-col>
           <el-col :span="24" class="twoInfo">
-            <basic :basicForm="form.basic" @resetBtn="back" @basicBtn="basicBtn" v-if="active == '1'"></basic>
-            <brief :briefForm="form.brief" @briefUp="briefUp" @briefBtn="briefBtn" v-else-if="active == '2'"></brief>
-            <research :researchForm="form.research" @researchUp="researchUp" @researchBtn="researchBtn" v-else-if="active == '3'"></research>
-            <datalists :datalistForm="form.datalist" @detailedUp="detailedUp" @onSubmit="onSubmit" v-else-if="active == '4'"></datalists>
+            <basic :basicForm="form.basic" @timeBtn="timeBtn" @resetBtn="back" @basicBtn="basicBtn" v-if="active == '1'"></basic>
+            <brief :briefForm="form.brief" @timeBtn="timeBtn" @briefUp="briefUp" @briefBtn="briefBtn" v-else-if="active == '2'"></brief>
+            <research :researchForm="form.research" @timeBtn="timeBtn" @researchUp="researchUp" @researchBtn="researchBtn" v-else-if="active == '3'"></research>
+            <datalists :datalistForm="form.datalist" @timeBtn="timeBtn" @detailedUp="detailedUp" @onSubmit="onSubmit" v-else-if="active == '4'"></datalists>
           </el-col>
         </el-col>
       </el-col>
@@ -47,10 +47,99 @@ export default {
       // 步骤
       active: 1,
       form: {
-        basic: {},
-        brief: {},
-        research: [],
-        datalist: {},
+        // 基本信息
+        basic: {
+          // achieve_date: '2021-05-24 10:13:08',
+          // achieve_form: '新技术',
+          // achieve_name: '06-01成果5',
+          // achieve_num: '123456',
+          // achieve_type: ['发明专利', '实用新型专利'],
+          // address: '长春市',
+          // apply_company: '福瑞',
+          // apply_nature: '企业',
+          // apply_personal: '顾红伟',
+          // apply_phone: '13943018186',
+          // contacts: '顾红伟',
+          // email: '123456@163.com',
+          // fax: '123456',
+          // objective: '申报奖励',
+          // output: '1',
+          // phone: '13943018186',
+          // profit: '2',
+          // revenue: '3',
+          // stage: '实验室',
+        },
+        // 内容简介
+        brief: {
+          // achieve_brief: '成果简介',
+          // advanced: '成果的创造性，先进性',
+          // compare: '与国内外同类技术比较',
+          // field: '应用领域和技术原理',
+          // kpi_index: '性能指标',
+          // opinion: '坐在的问题和改进意见',
+          // prospect: '推广应用的范围',
+          // sense: '作用意义',
+        },
+        // 研发人员名单
+        research: [
+          // {
+          //   name: '姓名',
+          //   gender: '女',
+          //   age: '25',
+          //   birth: '1996-03-25',
+          //   zc: '职称',
+          //   education: '本科',
+          //   degree: '学士',
+          //   major: '计算机',
+          //   abroad: '否',
+          //   company: '工作单位',
+          //   work: '主要工作',
+          //   devote: '创造性意见',
+          // },
+          // {
+          //   name: '姓名',
+          //   gender: '女',
+          //   age: '25',
+          //   birth: '1996-03-25',
+          //   zc: '职称',
+          //   education: '本科',
+          //   degree: '学士',
+          //   major: '计算机',
+          //   abroad: '否',
+          //   company: '工作单位',
+          //   work: '主要工作',
+          //   devote: '创造性意见',
+          // },
+          // {
+          //   name: '姓名',
+          //   gender: '女',
+          //   age: '25',
+          //   birth: '1996-03-25',
+          //   zc: '职称',
+          //   education: '本科',
+          //   degree: '学士',
+          //   major: '计算机',
+          //   abroad: '否',
+          //   company: '工作单位',
+          //   work: '主要工作',
+          //   devote: '创造性意见',
+          // },
+        ],
+        // 补充材料
+        datalist: {
+          // benefit: { name: '科教之旅.txt', url: '/files/live/benefit/20210524101550.txt' },
+          // compare_report: { name: '05-06.txt', url: '/files/live/compare/report/20210524101548.txt' },
+          // gf: { name: '科教之旅.txt', url: '/files/live/gf/20210524101611.txt' },
+          // patent_cert: { name: '科教之旅.txt', url: '/files/live/patent/cert/20210524101601.txt' },
+          // science_report: { name: '05-06.txt', url: '/files/live/science/report/20210524101553.txt' },
+          // software_copyright: { name: '05-06.txt', url: '/files/live/software/copyright/20210524101604.txt' },
+          // techol_detect_report: { name: '科教之旅.txt', url: '/files/live/techol/detect/report/20210524101556.txt' },
+          // techol_report: { name: '科教之旅.txt', url: '/files/live/techol/report/20210524101545.txt' },
+          // treatise: { name: '科教之旅.txt', url: '/files/live/treatise/20210524101606.txt' },
+          // user_prove: { name: '05-06.txt', url: '/files/live/user/prove/20210524101559.txt' },
+          // work_report: { name: '05-06.txt', url: '/files/live/work/report/20210524101543.txt' },
+          // company_standard: { name: '05-06.txt', url: '/files/live/company/standard/20210524102319.txt' },
+        },
       },
     };
   },
@@ -93,9 +182,24 @@ export default {
     detailedUp() {
       this.active = 3;
     },
+    // 临时保存
+    async timeBtn({ arr, type }) {
+      if (type == '3') this.$set(this.form, `research`, arr);
+      let data = this.form;
+      data.user_id = this.user.id;
+      data.status = '10';
+      let res = await this.create(data);
+      if (this.$checkRes(res)) {
+        this.$message({
+          message: '临时保存申报成功',
+          type: 'success',
+        });
+        this.back();
+      }
+    },
     async onSubmit() {
       let data = this.form;
-      data.status = this.status;
+      data.status = this.status == '10' ? '0' : this.status;
       if (data.id) {
         let res = await this.update(data);
         if (this.$checkRes(res)) {

src/views/userCenter/common/updateParts/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')" v-if="status == '0' || status == '10'">临时保存</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 => {
@@ -151,6 +163,9 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    status() {
+      return this.$route.query.status;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },

src/views/userCenter/common/updateParts/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')" v-if="status == '0' || status == '10'">临时保存</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 => {
@@ -84,6 +96,9 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    status() {
+      return this.$route.query.status;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },

src/views/userCenter/common/updateParts/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')" v-if="status == '0' || status == '10'">临时保存</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) {
@@ -285,6 +297,9 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    status() {
+      return this.$route.query.status;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },

src/views/userCenter/common/updateParts/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" v-if="status == '0' || status == '10'">临时保存</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 });
     },
@@ -198,6 +208,9 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    status() {
+      return this.$route.query.status;
+    },
     pageTitle() {
       return `${this.$route.meta.title}`;
     },

src/views/userCenter/userMydeclare/nowDeclare.vue

@@ -7,6 +7,9 @@
         </el-col>
         <el-col :span="24" class="down">
           <el-tabs type="card" v-model="active">
+            <el-tab-pane label="草稿" name="10">
+              <list status="10"></list>
+            </el-tab-pane>
             <el-tab-pane label="待审中" name="0">
               <list status="0"></list>
             </el-tab-pane>
@@ -29,7 +32,7 @@ export default {
   components: { list },
   data: function() {
     return {
-      active: '0',
+      active: '10',
     };
   },
   created() {},

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

@@ -1,6 +1,18 @@
 <template>
   <div id="list">
-    <data-table :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @view="toView" @edit="toEdit" @idea="toIdea"></data-table>
+    <data-table
+      :fields="fields"
+      :opera="opera"
+      :data="list"
+      :total="total"
+      @query="search"
+      @view="toView"
+      @edit="toEdit"
+      @idea="toIdea"
+      @editor="editor"
+      @publish="publish"
+      @delete="toDelete"
+    ></data-table>
   </div>
 </template>
 
@@ -11,7 +23,7 @@ const { mapActions: achieveApply } = createNamespacedHelpers('achieveApply');
 export default {
   name: 'list',
   props: {
-    status: { type: String, default: '0' },
+    status: { type: String, default: '10' },
   },
   components: { dataTable },
   data: function() {
@@ -31,6 +43,21 @@ export default {
           method: 'idea',
           display: i => i.status === '-1',
         },
+        {
+          label: '编辑',
+          method: 'editor',
+          display: i => i.status === '10',
+        },
+        {
+          label: '发布',
+          method: 'publish',
+          display: i => i.status === '10',
+        },
+        {
+          label: '删除',
+          method: 'delete',
+          display: i => i.status === '10',
+        },
       ],
       fields: [
         { label: '成果编号', prop: 'basic.achieve_num', filter: 'input', showTip: true },
@@ -52,7 +79,7 @@ export default {
     this.search();
   },
   methods: {
-    ...achieveApply(['query']),
+    ...achieveApply(['query', 'update', 'delete']),
     // 查询列表
     async search({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.query({ skip, limit, status: this.status, user_id: this.user.id, ...info });
@@ -65,6 +92,7 @@ export default {
     toView({ data }) {
       this.$router.push({ path: '/userCommon/dataInfo', query: { id: data.id, type: '0' } });
     },
+
     // 修改申请
     toEdit({ data }) {
       this.$router.push({ path: '/userCommon/update', query: { id: data.id, status: '0' } });
@@ -73,6 +101,33 @@ export default {
     toIdea({ data }) {
       this.$router.push({ path: '/userCommon/opinion', query: { id: data.id, step: '初审' } });
     },
+    // 编辑-10
+    editor({ data }) {
+      this.$router.push({ path: '/userCommon/update', query: { id: data.id, status: '10' } });
+    },
+    // 申报发布
+    async publish({ data }) {
+      data.status = '0';
+      let res = await this.update(data);
+      if (this.$checkRes(res)) {
+        this.$message({
+          message: '申报发布成功，请等待管理员审核',
+          type: 'success',
+        });
+        this.search();
+      }
+    },
+    // 删除
+    async toDelete({ data }) {
+      let res = await this.delete(data.id);
+      if (this.$checkRes(res)) {
+        this.$message({
+          message: '信息删除成功！',
+          type: 'success',
+        });
+        this.search();
+      }
+    },
   },
   computed: {
     ...mapState(['user', 'menuParams']),