1

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

@@ -8,7 +8,7 @@
               成果编号：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_num }}
+              {{ info.achieve_num || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -16,7 +16,7 @@
               成果名称：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_name }}
+              {{ info.achieve_name || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -24,7 +24,7 @@
               成果类别：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_type }}
+              {{ info.achieve_type || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -32,7 +32,7 @@
               成果形式：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_form }}
+              {{ info.achieve_form || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -40,7 +40,7 @@
               成果取得时间：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_date }}
+              {{ info.achieve_date || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -48,15 +48,15 @@
               申请人：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.apply_personal }}
+              {{ info.apply_personal || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="3" class="shortText">
-              申请电话：
+              申请人电话：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.apply_phone }}
+              {{ info.apply_phone || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -72,7 +72,7 @@
               地址：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.address }}
+              {{ info.address || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -80,7 +80,7 @@
               申请单位/申请人属性：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.apply_nature }}
+              {{ info.apply_nature || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -88,7 +88,7 @@
               联系人：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.contacts }}
+              {{ info.contacts || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -96,7 +96,7 @@
               联系电话：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.phone }}
+              {{ info.phone || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -104,7 +104,7 @@
               邮箱：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.email }}
+              {{ info.email || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -112,7 +112,7 @@
               传真：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.fax }}
+              {{ info.fax || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -120,7 +120,7 @@
               评价目的：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.objective }}
+              {{ info.objective || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -128,7 +128,7 @@
               成果所处阶段：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.stage }}
+              {{ info.stage || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -136,7 +136,7 @@
               经济效益产值：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.output }}
+              {{ info.output || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -144,7 +144,7 @@
               经济效益利润：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.profit }}
+              {{ info.profit || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -152,7 +152,7 @@
               经济效益税收：
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.revenue }}
+              {{ info.revenue || '暂无' }}
             </el-col>
           </el-col>
         </el-col>

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

@@ -5,7 +5,7 @@
         <el-col :span="24" class="one">
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              研究工作报告（必备）
+              1.工作报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
               <el-link :underline="false" type="primary" v-if="getProp('work_report.url')" :href="getProp('work_report.url')">文件下载</el-link>
@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              研究技术报告（必备）
+              2.技术报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
               <el-link :underline="false" type="primary" v-if="getProp('techol_report.url')" :href="getProp('techol_report.url')">文件下载</el-link>
@@ -23,100 +23,93 @@
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              经济效益分析（必备）
+              3.国内外对比报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('benefit.url')" :href="getProp('benefit.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('compare_report.url')" :href="getProp('compare_report.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              科技查新报告（科技项目成果，必备）
+              4.经济效益分析(必备)
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('science_report.url')" :href="getProp('science_report.url')">文件下载</el-link>
-              <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="short">
-            <el-col :span="22" class="shortText">
-              法律价值评估报告（专利成果，必备）
-            </el-col>
-            <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('assess_report.url')" :href="getProp('assess_report.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('benefit.url')" :href="getProp('benefit.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              推广应用证明（两家以上应用单位，必备）
+              5.科技查新报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('app_prove.url')" :href="getProp('app_prove.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('science_report.url')" :href="getProp('science_report.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              成果技术汇报PPT（必备）
+              6.技术检测报告
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('techol_ppt.url')" :href="getProp('techol_ppt.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('techol_detect_report.url')" :href="getProp('techol_detect_report.url')"
+                >文件下载</el-link
+              >
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              检测报告（根据项目需要提供）
+              7.用户证明
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('testing_report.url')" :href="getProp('testing_report.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('user_prove.url')" :href="getProp('user_prove.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              质量标准（检测报告所依据的标准，企业标准，行业标准，国家标准，国际标准）
+              8.专利证书
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('quality.url')" :href="getProp('quality.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('patent_cert.url')" :href="getProp('patent_cert.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              与本成果相关的授权专利证书
+              9.软著
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('patent.url')" :href="getProp('patent.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('software_copyright.url')" :href="getProp('software_copyright.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              特殊行业需要提供的相应证明材料
+              10.论文
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('special.url')" :href="getProp('special.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('treatise.url')" :href="getProp('treatise.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              项目经费预算书
+              11.工法
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('budget.url')" :href="getProp('budget.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('gf.url')" :href="getProp('gf.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              项目经费决算书
+              12.企业标准等证明材料
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('final.url')" :href="getProp('final.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('company_standard.url')" :href="getProp('company_standard.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>

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

@@ -7,8 +7,8 @@
             <el-input v-model="basicForm.achieve_name" placeholder="请输入成果名称"></el-input>
           </el-form-item>
           <el-form-item label="成果类别" prop="achieve_type">
-            <el-select v-model="basicForm.achieve_type" clearable filterable allow-create placeholder="请选择">
-              <el-option v-for="(i, index) in achievetypeList" :key="index" :label="i.name" :value="i.name"></el-option>
+            <el-select v-model="basicForm.achieve_type" multiple clearable filterable placeholder="请选择">
+              <el-option v-for="item in achievetypeList" :key="item.name" :label="item.name" :value="item.name"> </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="成果编号" prop="achieve_num">
@@ -32,8 +32,8 @@
           <el-form-item label="申请人" prop="apply_personal">
             <el-input v-model="basicForm.apply_personal" placeholder="请输入申请人"></el-input>
           </el-form-item>
-          <el-form-item label="申请电话" prop="apply_phone">
-            <el-input v-model="basicForm.apply_phone" placeholder="请输入申请电话"></el-input>
+          <el-form-item label="申请人电话" prop="apply_phone">
+            <el-input v-model="basicForm.apply_phone" placeholder="请输入申请人电话"></el-input>
           </el-form-item>
           <el-form-item label="申请单位" prop="apply_company">
             <el-input v-model="basicForm.apply_company" placeholder="请输入申请单位"></el-input>
@@ -88,6 +88,7 @@
 </template>
 
 <script>
+const { achievetype, achieveform, applynature, objective, stage } = require('@common/src/store/achieve/achieveType');
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'basic',
@@ -99,12 +100,12 @@ export default {
     return {
       rules: {
         achieve_name: [{ required: true, message: '请输入成果名称', trigger: 'blur' }],
-        achieve_type: [{ required: true, message: '请输入成果类别', trigger: 'change' }],
+        achieve_type: [{ required: true, message: '请选择成果类别', trigger: 'change' }],
         achieve_num: [{ required: false, message: '请输入成果编号', trigger: 'blur' }],
         achieve_date: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
         achieve_form: [{ required: true, message: '请输入成果形式', trigger: 'change' }],
         apply_personal: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
-        apply_phone: [{ required: true, message: '请输入申请电话', trigger: 'blur' }],
+        apply_phone: [{ required: true, message: '请输入申请人电话', trigger: 'blur' }],
         apply_company: [{ required: true, message: '请输入申请单位', trigger: 'blur' }],
         address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
         apply_nature: [{ required: true, message: '请输入申请单位/申请人属性', trigger: 'change' }],
@@ -119,33 +120,22 @@ export default {
         revenue: [{ required: true, message: '请输入经济效益税收', trigger: 'blur' }],
       },
       // 成果类别
-      achievetypeList: [{ name: '发明专利' }, { name: '实用新型专利' }, { name: '软件著作权' }, { name: '出版著作' }, { name: '论文' }, { name: '其他' }],
+      achievetypeList: achievetype,
       // 成果形式
-      achieveformList: [
-        { name: '新技术' },
-        { name: '新工艺' },
-        { name: '新产品' },
-        { name: '新材料' },
-        { name: '新装备' },
-        { name: '农业,生物新品种' },
-        { name: '矿产新品种' },
-        { name: '论文' },
-        { name: '著作' },
-        { name: '其他' },
-      ],
+      achieveformList: achieveform,
       // 申请人属性
-      applynatureList: [{ name: '独立科研机构' }, { name: '大专院校' }, { name: '医疗机构' }, { name: '企业' }, { name: '其他机构' }, { name: '自然人' }],
+      applynatureList: applynature,
       // 评价目的
-      objectiveList: [{ name: '申报奖励' }, { name: '成果转化' }, { name: '项目验收' }, { name: '其他' }],
+      objectiveList: objective,
       // 成果所处阶段
-      stageList: [{ name: '实验室' }, { name: '小试' }, { name: '中试产品' }, { name: '市场化产品' }],
+      stageList: stage,
     };
   },
   created() {},
   methods: {
     // 取消申报
     resetBtn() {
-      this.$emit('resetBtn');
+      window.history.back();
     },
     // 下一步
     basicBtn(formName) {
@@ -177,5 +167,8 @@ export default {
   .btn {
     text-align: center;
   }
+  .el-select {
+    width: 100%;
+  }
 }
 </style>

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

@@ -4,84 +4,33 @@
       <el-col :span="24" class="brief">
         <el-form :model="briefForm" :rules="rules" ref="briefForm" label-width="120px">
           <el-form-item label="成果简介" prop="achieve_brief">
-            <el-input
-              v-model="briefForm.achieve_brief"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入成果简介"
-            ></el-input>
+            <el-input v-model="briefForm.achieve_brief" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入成果简介"></el-input>
           </el-form-item>
           <el-form-item label="应用领域和技术原理" prop="field">
-            <el-input
-              v-model="briefForm.field"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入应用领域和技术原理"
-            ></el-input>
+            <el-input v-model="briefForm.field" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入应用领域和技术原理"></el-input>
           </el-form-item>
           <el-form-item label="性能指标" prop="kpi_index">
-            <el-input
-              v-model="briefForm.kpi_index"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入性能指标"
-            ></el-input>
+            <el-input v-model="briefForm.kpi_index" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入性能指标"></el-input>
           </el-form-item>
           <el-form-item label="与国内外同类技术比较" prop="compare">
-            <el-input
-              v-model="briefForm.compare"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入与国内外同类技术比较"
-            ></el-input>
+            <el-input v-model="briefForm.compare" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入与国内外同类技术比较"></el-input>
           </el-form-item>
           <el-form-item label="成果的创造性,先进性" prop="advanced">
-            <el-input
-              v-model="briefForm.advanced"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入成果的创造性,先进性"
-            ></el-input>
+            <el-input v-model="briefForm.advanced" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入成果的创造性,先进性"></el-input>
           </el-form-item>
           <el-form-item label="作用意义" prop="sense">
-            <el-input
-              v-model="briefForm.sense"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入作用意义"
-            ></el-input>
+            <el-input v-model="briefForm.sense" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入作用意义"></el-input>
           </el-form-item>
           <el-form-item label="推广应用的范围,条件和前景" prop="prospect">
             <el-input
               v-model="briefForm.prospect"
               type="textarea"
-              maxlength="200"
-              show-word-limit
               :autosize="{ minRows: 4, maxRows: 5 }"
               placeholder="请输入推广应用的范围,条件和前景"
             ></el-input>
           </el-form-item>
           <el-form-item label="存在的问题和改进意见" prop="opinion">
-            <el-input
-              v-model="briefForm.opinion"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入存在的问题和改进意见"
-            ></el-input>
+            <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>

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

@@ -5,7 +5,7 @@
         <el-form :model="datalistForm" :rules="rules" ref="datalistForm" label-width="0">
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              研究工作报告（必备）：
+              1.工作报告(必备)
             </el-col>
             <el-col :span="24" class="file">
               <el-form-item prop="work_report">
@@ -14,7 +14,7 @@
                   :data="datalistForm.work_report"
                   type="work_report"
                   listType=""
-                  :url="'/files/live/userDeclare_workreport/upload'"
+                  :url="'/files/live/work_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              研究技术报告（必备）：
+              2.技术报告(必备)
             </el-col>
             <el-col :span="24" class="file">
               <el-form-item prop="techol_report">
@@ -32,7 +32,7 @@
                   :data="datalistForm.techol_report"
                   type="techol_report"
                   listType=""
-                  :url="'/files/live/userDeclare_techolreport/upload'"
+                  :url="'/files/live/techol_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -41,16 +41,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              经济效益分析（必备）：
+              3.国内外对比报告(必备)
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="benefit">
+              <el-form-item prop="compare_report">
                 <upload
                   :limit="1"
-                  :data="datalistForm.benefit"
-                  type="benefit"
+                  :data="datalistForm.compare_report"
+                  type="compare_report"
                   listType=""
-                  :url="'/files/live/userDeclare_benefit/upload'"
+                  :url="'/files/live/compare_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -59,34 +59,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              科技查新报告（科技项目成果，必备）：
+              4.经济效益分析(必备)
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="science_report">
-                <upload
-                  :limit="1"
-                  :data="datalistForm.science_report"
-                  type="science_report"
-                  listType=""
-                  :url="'/files/live/userDeclare_sciencereport/upload'"
-                  @upload="uploadSuccess"
-                  @delete="uploadDelete"
-                ></upload>
-              </el-form-item>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="text">
-            <el-col :span="24" class="title">
-              法律价值评估报告（专利成果，必备）：
-            </el-col>
-            <el-col :span="24" class="file">
-              <el-form-item prop="assess_report">
+              <el-form-item prop="benefit">
                 <upload
                   :limit="1"
-                  :data="datalistForm.assess_report"
-                  type="assess_report"
+                  :data="datalistForm.benefit"
+                  type="benefit"
                   listType=""
-                  :url="'/files/live/userDeclare_assessreport/upload'"
+                  :url="'/files/live/benefit/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -95,16 +77,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              推广应用证明（两家以上应用单位，必备）：
+              5.科技查新报告(必备)
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="app_prove">
+              <el-form-item prop="science_report">
                 <upload
                   :limit="1"
-                  :data="datalistForm.app_prove"
-                  type="app_prove"
+                  :data="datalistForm.science_report"
+                  type="science_report"
                   listType=""
-                  :url="'/files/live/userDeclare_appprove/upload'"
+                  :url="'/files/live/science_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -113,16 +95,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              成果技术汇报PPT（必备）：
+              6.技术检测报告
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="techol_ppt">
+              <el-form-item prop="techol_detect_report">
                 <upload
                   :limit="1"
-                  :data="datalistForm.techol_ppt"
-                  type="techol_ppt"
+                  :data="datalistForm.techol_detect_report"
+                  type="techol_detect_report"
                   listType=""
-                  :url="'/files/live/userDeclare_techolppt/upload'"
+                  :url="'/files/live/techol_detect_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -131,16 +113,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              检测报告（根据项目需要提供）：
+              7.用户证明
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="testing_report">
+              <el-form-item prop="user_prove">
                 <upload
                   :limit="1"
-                  :data="datalistForm.testing_report"
-                  type="testing_report"
+                  :data="datalistForm.user_prove"
+                  type="user_prove"
                   listType=""
-                  :url="'/files/live/userDeclare_testingreport/upload'"
+                  :url="'/files/live/user_prove/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -149,16 +131,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              质量标准（检测报告所依据的标准，企业标准，行业标准，国家标准，国际标准）：
+              8.专利证书
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="quality">
+              <el-form-item prop="patent_cert">
                 <upload
                   :limit="1"
-                  :data="datalistForm.quality"
-                  type="quality"
+                  :data="datalistForm.patent_cert"
+                  type="patent_cert"
                   listType=""
-                  :url="'/files/live/userDeclare_quality/upload'"
+                  :url="'/files/live/patent_cert/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -167,16 +149,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              与本成果相关的授权专利证书：
+              9.软著
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="patent">
+              <el-form-item prop="software_copyright">
                 <upload
                   :limit="1"
-                  :data="datalistForm.patent"
-                  type="patent"
+                  :data="datalistForm.software_copyright"
+                  type="software_copyright"
                   listType=""
-                  :url="'/files/live/userDeclare_patent/upload'"
+                  :url="'/files/live/software_copyright/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -185,16 +167,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              特殊行业需要提供的相应证明材料：
+              10.论文
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="special">
+              <el-form-item prop="treatise">
                 <upload
                   :limit="1"
-                  :data="datalistForm.special"
-                  type="special"
+                  :data="datalistForm.treatise"
+                  type="treatise"
                   listType=""
-                  :url="'/files/live/userDeclare_special/upload'"
+                  :url="'/files/live/treatise/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -203,16 +185,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              项目经费预算书：
+              11.工法
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="budget">
+              <el-form-item prop="gf">
                 <upload
                   :limit="1"
-                  :data="datalistForm.budget"
-                  type="budget"
+                  :data="datalistForm.gf"
+                  type="gf"
                   listType=""
-                  :url="'/files/live/userDeclare_budget/upload'"
+                  :url="'/files/live/gf/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -221,16 +203,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              项目经费决算书：
+              12.企业标准等证明材料
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="final">
+              <el-form-item prop="company_standard">
                 <upload
                   :limit="1"
-                  :data="datalistForm.final"
-                  type="final"
+                  :data="datalistForm.company_standard"
+                  type="company_standard"
                   listType=""
-                  :url="'/files/live/userDeclare_final/upload'"
+                  :url="'/files/live/company_standard/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -261,19 +243,18 @@ export default {
   data: function() {
     return {
       rules: {
-        work_report: [{ required: false, message: '请上传研究工作报告', trigger: 'blur' }],
-        techol_report: [{ required: false, message: '请上传研究技术报告', trigger: 'blur' }],
-        benefit: [{ required: false, message: '请上传经济效益分析', trigger: 'blur' }],
-        science_report: [{ required: false, message: '请上传科技查新报告', trigger: 'blur' }],
-        assess_report: [{ required: false, message: '请上传法律价值评估报告', trigger: 'blur' }],
-        app_prove: [{ required: false, message: '请上传推广应用证明', trigger: 'blur' }],
-        techol_ppt: [{ required: false, message: '请上传成果技术汇报PPT', trigger: 'blur' }],
-        testing_report: [{ required: false, message: '请上传检测报告', trigger: 'blur' }],
-        quality: [{ required: false, message: '请上传质量标准', trigger: 'blur' }],
-        patent: [{ required: false, message: '请上传与本成果相关的授权专利证书', trigger: 'blur' }],
-        special: [{ required: false, message: '请上传特殊行业需要提供的相应证明材料', trigger: 'blur' }],
-        budget: [{ required: false, message: '请上传项目经费预算书', trigger: 'blur' }],
-        final: [{ required: false, message: '请上传项目经费决算书', trigger: 'blur' }],
+        work_report: [{ required: false, message: '请上传工作报告(必备)', trigger: 'blur' }],
+        techol_report: [{ required: false, message: '请上传技术报告(必备)', trigger: 'blur' }],
+        compare_report: [{ required: false, message: '请上传国内外对比报告(必备)', trigger: 'blur' }],
+        benefit: [{ required: false, message: '请上传经济效益分析(必备)', trigger: 'blur' }],
+        science_report: [{ required: false, message: '请上传科技查新报告(必备)', trigger: 'blur' }],
+        techol_detect_report: [{ required: false, message: '请上传技术检测报告', trigger: 'blur' }],
+        user_prove: [{ required: false, message: '请上传用户证明', trigger: 'blur' }],
+        patent_cert: [{ required: false, message: '请上传专利证书', trigger: 'blur' }],
+        software_copyright: [{ required: false, message: '请上传软著', trigger: 'blur' }],
+        treatise: [{ required: false, message: '请上传论文', trigger: 'blur' }],
+        gf: [{ required: false, message: '请上传工法', trigger: 'blur' }],
+        company_standard: [{ required: false, message: '请上传企业标准等证明材料', trigger: 'blur' }],
       },
     };
   },

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

@@ -16,7 +16,7 @@
               <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="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>
@@ -42,7 +42,7 @@
           <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="请输入身份证号"></el-input>
+          <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">
@@ -51,7 +51,7 @@
           </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"> </el-date-picker>
+          <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>
@@ -65,8 +65,8 @@
         <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 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>
@@ -116,11 +116,11 @@ export default {
         card: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
         gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
         position: [{ required: true, message: '请输入技术职称', trigger: 'blur' }],
-        education: [{ required: true, message: '请输入文化程度', trigger: 'blur' }],
+        education: [{ required: true, message: '请输入学历', trigger: 'blur' }],
         degree: [{ required: true, message: '请输入学位', trigger: 'blur' }],
-        abroad: [{ required: true, message: '请选择是否留学归国', trigger: 'change' }],
+        abroad: [{ required: false, message: '请选择是否留学归国', trigger: 'change' }],
         research_company: [{ required: true, message: '请输入工作单位', trigger: 'blur' }],
-        devote: [{ required: true, message: '请输入对成果创造性贡献', trigger: 'blur' }],
+        devote: [{ required: false, message: '请输入对成果创造性贡献', trigger: 'blur' }],
       },
       // 列表
       list: [],
@@ -128,6 +128,25 @@ export default {
   },
   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');
     },

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

@@ -20,7 +20,6 @@ export default {
         {
           label: '资料查看',
           method: 'view',
-          // display: i => i.status === '0',
         },
         {
           label: '修改申请',

src/views/userDeclare/index.vue

@@ -52,139 +52,99 @@ export default {
       active: 1,
       // 基本信息
       basic: {
-        // 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: '实验室',
+        achieve_date: '2021-05-24 10:13:08',
+        achieve_form: '新技术',
+        achieve_name: '05-24成果',
+        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: '作用意义',
+        achieve_brief: '成果简介',
+        advanced: '成果的创造性，先进性',
+        compare: '与国内外同类技术比较',
+        field: '应用领域和技术原理',
+        kpi_index: '性能指标',
+        opinion: '坐在的问题和改进意见',
+        prospect: '推广应用的范围',
+        sense: '作用意义',
       },
       // 研发人员名单
       research: [
-        // {
-        //   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',
-        // },
+        {
+          abroad: '否',
+          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',
+        },
+        {
+          abroad: '否',
+          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',
+        },
+        {
+          abroad: '否',
+          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',
+        },
       ],
       // 补充材料
       datalist: {
-        // 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',
-        // },
+        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' },
       },
     };
   },
@@ -224,9 +184,8 @@ export default {
         research: this.research,
         datalist: this.datalist,
       };
-      console.log(data);
       this.$alert(
-        '<strong><p>1：用户</p><p>当您进行成果申报时，系统会自动提取联系人和联系电话进行平台用户注册，您可用【联系电话】和【初始密码(123456)】进行登录查看。</p></strong>',
+        '<strong><p>1：用户</p><p>当您进行成果申报时，系统会自动识别您是否为平台用户，未注册用户，系统会自动拾取【申请人】和【申请人电话】进行平台用户注册，您可用【申请人电话】和【初始密码123456】进行登录查看。</p></strong>',
         '信息提示',
         {
           dangerouslyUseHTMLString: true,

src/views/userDeclare/parts/basic.vue

@@ -7,8 +7,8 @@
             <el-input v-model="basicForm.achieve_name" placeholder="请输入成果名称"></el-input>
           </el-form-item>
           <el-form-item label="成果类别" prop="achieve_type">
-            <el-select v-model="basicForm.achieve_type" clearable filterable allow-create placeholder="请选择">
-              <el-option v-for="(i, index) in achievetypeList" :key="index" :label="i.name" :value="i.name"></el-option>
+            <el-select v-model="basicForm.achieve_type" multiple clearable filterable placeholder="请选择">
+              <el-option v-for="item in achievetypeList" :key="item.name" :label="item.name" :value="item.name"> </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="成果编号" prop="achieve_num">
@@ -32,8 +32,8 @@
           <el-form-item label="申请人" prop="apply_personal">
             <el-input v-model="basicForm.apply_personal" placeholder="请输入申请人"></el-input>
           </el-form-item>
-          <el-form-item label="申请电话" prop="apply_phone">
-            <el-input v-model="basicForm.apply_phone" placeholder="请输入申请电话"></el-input>
+          <el-form-item label="申请人电话" prop="apply_phone">
+            <el-input v-model="basicForm.apply_phone" placeholder="请输入申请人电话"></el-input>
           </el-form-item>
           <el-form-item label="申请单位" prop="apply_company">
             <el-input v-model="basicForm.apply_company" placeholder="请输入申请单位"></el-input>
@@ -88,6 +88,7 @@
 </template>
 
 <script>
+const { achievetype, achieveform, applynature, objective, stage } = require('@common/src/store/achieve/achieveType');
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
   name: 'basic',
@@ -99,12 +100,12 @@ export default {
     return {
       rules: {
         achieve_name: [{ required: true, message: '请输入成果名称', trigger: 'blur' }],
-        achieve_type: [{ required: true, message: '请输入成果类别', trigger: 'change' }],
+        achieve_type: [{ required: true, message: '请选择成果类别', trigger: 'change' }],
         achieve_num: [{ required: false, message: '请输入成果编号', trigger: 'blur' }],
         achieve_date: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
         achieve_form: [{ required: true, message: '请输入成果形式', trigger: 'change' }],
         apply_personal: [{ required: true, message: '请输入申请人', trigger: 'blur' }],
-        apply_phone: [{ required: true, message: '请输入申请电话', trigger: 'blur' }],
+        apply_phone: [{ required: true, message: '请输入申请人电话', trigger: 'blur' }],
         apply_company: [{ required: true, message: '请输入申请单位', trigger: 'blur' }],
         address: [{ required: true, message: '请输入地址', trigger: 'blur' }],
         apply_nature: [{ required: true, message: '请输入申请单位/申请人属性', trigger: 'change' }],
@@ -119,26 +120,15 @@ export default {
         revenue: [{ required: true, message: '请输入经济效益税收', trigger: 'blur' }],
       },
       // 成果类别
-      achievetypeList: [{ name: '发明专利' }, { name: '实用新型专利' }, { name: '软件著作权' }, { name: '出版著作' }, { name: '论文' }, { name: '其他' }],
+      achievetypeList: achievetype,
       // 成果形式
-      achieveformList: [
-        { name: '新技术' },
-        { name: '新工艺' },
-        { name: '新产品' },
-        { name: '新材料' },
-        { name: '新装备' },
-        { name: '农业,生物新品种' },
-        { name: '矿产新品种' },
-        { name: '论文' },
-        { name: '著作' },
-        { name: '其他' },
-      ],
+      achieveformList: achieveform,
       // 申请人属性
-      applynatureList: [{ name: '独立科研机构' }, { name: '大专院校' }, { name: '医疗机构' }, { name: '企业' }, { name: '其他机构' }, { name: '自然人' }],
+      applynatureList: applynature,
       // 评价目的
-      objectiveList: [{ name: '申报奖励' }, { name: '成果转化' }, { name: '项目验收' }, { name: '其他' }],
+      objectiveList: objective,
       // 成果所处阶段
-      stageList: [{ name: '实验室' }, { name: '小试' }, { name: '中试产品' }, { name: '市场化产品' }],
+      stageList: stage,
     };
   },
   created() {},
@@ -177,5 +167,8 @@ export default {
   .btn {
     text-align: center;
   }
+  .el-select {
+    width: 100%;
+  }
 }
 </style>

src/views/userDeclare/parts/brief.vue

@@ -4,84 +4,33 @@
       <el-col :span="24" class="brief">
         <el-form :model="briefForm" :rules="rules" ref="briefForm" label-width="120px">
           <el-form-item label="成果简介" prop="achieve_brief">
-            <el-input
-              v-model="briefForm.achieve_brief"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入成果简介"
-            ></el-input>
+            <el-input v-model="briefForm.achieve_brief" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入成果简介"></el-input>
           </el-form-item>
           <el-form-item label="应用领域和技术原理" prop="field">
-            <el-input
-              v-model="briefForm.field"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入应用领域和技术原理"
-            ></el-input>
+            <el-input v-model="briefForm.field" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入应用领域和技术原理"></el-input>
           </el-form-item>
           <el-form-item label="性能指标" prop="kpi_index">
-            <el-input
-              v-model="briefForm.kpi_index"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入性能指标"
-            ></el-input>
+            <el-input v-model="briefForm.kpi_index" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入性能指标"></el-input>
           </el-form-item>
           <el-form-item label="与国内外同类技术比较" prop="compare">
-            <el-input
-              v-model="briefForm.compare"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入与国内外同类技术比较"
-            ></el-input>
+            <el-input v-model="briefForm.compare" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入与国内外同类技术比较"></el-input>
           </el-form-item>
           <el-form-item label="成果的创造性,先进性" prop="advanced">
-            <el-input
-              v-model="briefForm.advanced"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入成果的创造性,先进性"
-            ></el-input>
+            <el-input v-model="briefForm.advanced" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入成果的创造性,先进性"></el-input>
           </el-form-item>
           <el-form-item label="作用意义" prop="sense">
-            <el-input
-              v-model="briefForm.sense"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入作用意义"
-            ></el-input>
+            <el-input v-model="briefForm.sense" type="textarea" :autosize="{ minRows: 4, maxRows: 5 }" placeholder="请输入作用意义"></el-input>
           </el-form-item>
           <el-form-item label="推广应用的范围,条件和前景" prop="prospect">
             <el-input
               v-model="briefForm.prospect"
               type="textarea"
-              maxlength="200"
-              show-word-limit
               :autosize="{ minRows: 4, maxRows: 5 }"
               placeholder="请输入推广应用的范围,条件和前景"
             ></el-input>
           </el-form-item>
           <el-form-item label="存在的问题和改进意见" prop="opinion">
-            <el-input
-              v-model="briefForm.opinion"
-              type="textarea"
-              maxlength="200"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 5 }"
-              placeholder="请输入存在的问题和改进意见"
-            ></el-input>
+            <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>

src/views/userDeclare/parts/datalists.vue

@@ -5,7 +5,7 @@
         <el-form :model="datalistForm" :rules="rules" ref="datalistForm" label-width="0">
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              研究工作报告（必备）：
+              1.工作报告(必备)
             </el-col>
             <el-col :span="24" class="file">
               <el-form-item prop="work_report">
@@ -14,7 +14,7 @@
                   :data="datalistForm.work_report"
                   type="work_report"
                   listType=""
-                  :url="'/files/live/userDeclare_workreport/upload'"
+                  :url="'/files/live/work_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              研究技术报告（必备）：
+              2.技术报告(必备)
             </el-col>
             <el-col :span="24" class="file">
               <el-form-item prop="techol_report">
@@ -32,7 +32,7 @@
                   :data="datalistForm.techol_report"
                   type="techol_report"
                   listType=""
-                  :url="'/files/live/userDeclare_techolreport/upload'"
+                  :url="'/files/live/techol_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -41,16 +41,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              经济效益分析（必备）：
+              3.国内外对比报告(必备)
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="benefit">
+              <el-form-item prop="compare_report">
                 <upload
                   :limit="1"
-                  :data="datalistForm.benefit"
-                  type="benefit"
+                  :data="datalistForm.compare_report"
+                  type="compare_report"
                   listType=""
-                  :url="'/files/live/userDeclare_benefit/upload'"
+                  :url="'/files/live/compare_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -59,34 +59,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              科技查新报告（科技项目成果，必备）：
+              4.经济效益分析(必备)
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="science_report">
-                <upload
-                  :limit="1"
-                  :data="datalistForm.science_report"
-                  type="science_report"
-                  listType=""
-                  :url="'/files/live/userDeclare_sciencereport/upload'"
-                  @upload="uploadSuccess"
-                  @delete="uploadDelete"
-                ></upload>
-              </el-form-item>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="text">
-            <el-col :span="24" class="title">
-              法律价值评估报告（专利成果，必备）：
-            </el-col>
-            <el-col :span="24" class="file">
-              <el-form-item prop="assess_report">
+              <el-form-item prop="benefit">
                 <upload
                   :limit="1"
-                  :data="datalistForm.assess_report"
-                  type="assess_report"
+                  :data="datalistForm.benefit"
+                  type="benefit"
                   listType=""
-                  :url="'/files/live/userDeclare_assessreport/upload'"
+                  :url="'/files/live/benefit/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -95,16 +77,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              推广应用证明（两家以上应用单位，必备）：
+              5.科技查新报告(必备)
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="app_prove">
+              <el-form-item prop="science_report">
                 <upload
                   :limit="1"
-                  :data="datalistForm.app_prove"
-                  type="app_prove"
+                  :data="datalistForm.science_report"
+                  type="science_report"
                   listType=""
-                  :url="'/files/live/userDeclare_appprove/upload'"
+                  :url="'/files/live/science_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -113,16 +95,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              成果技术汇报PPT（必备）：
+              6.技术检测报告
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="techol_ppt">
+              <el-form-item prop="techol_detect_report">
                 <upload
                   :limit="1"
-                  :data="datalistForm.techol_ppt"
-                  type="techol_ppt"
+                  :data="datalistForm.techol_detect_report"
+                  type="techol_detect_report"
                   listType=""
-                  :url="'/files/live/userDeclare_techolppt/upload'"
+                  :url="'/files/live/techol_detect_report/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -131,16 +113,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              检测报告（根据项目需要提供）：
+              7.用户证明
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="testing_report">
+              <el-form-item prop="user_prove">
                 <upload
                   :limit="1"
-                  :data="datalistForm.testing_report"
-                  type="testing_report"
+                  :data="datalistForm.user_prove"
+                  type="user_prove"
                   listType=""
-                  :url="'/files/live/userDeclare_testingreport/upload'"
+                  :url="'/files/live/user_prove/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -149,16 +131,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              质量标准（检测报告所依据的标准，企业标准，行业标准，国家标准，国际标准）：
+              8.专利证书
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="quality">
+              <el-form-item prop="patent_cert">
                 <upload
                   :limit="1"
-                  :data="datalistForm.quality"
-                  type="quality"
+                  :data="datalistForm.patent_cert"
+                  type="patent_cert"
                   listType=""
-                  :url="'/files/live/userDeclare_quality/upload'"
+                  :url="'/files/live/patent_cert/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -167,16 +149,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              与本成果相关的授权专利证书：
+              9.软著
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="patent">
+              <el-form-item prop="software_copyright">
                 <upload
                   :limit="1"
-                  :data="datalistForm.patent"
-                  type="patent"
+                  :data="datalistForm.software_copyright"
+                  type="software_copyright"
                   listType=""
-                  :url="'/files/live/userDeclare_patent/upload'"
+                  :url="'/files/live/software_copyright/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -185,16 +167,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              特殊行业需要提供的相应证明材料：
+              10.论文
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="special">
+              <el-form-item prop="treatise">
                 <upload
                   :limit="1"
-                  :data="datalistForm.special"
-                  type="special"
+                  :data="datalistForm.treatise"
+                  type="treatise"
                   listType=""
-                  :url="'/files/live/userDeclare_special/upload'"
+                  :url="'/files/live/treatise/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -203,16 +185,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              项目经费预算书：
+              11.工法
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="budget">
+              <el-form-item prop="gf">
                 <upload
                   :limit="1"
-                  :data="datalistForm.budget"
-                  type="budget"
+                  :data="datalistForm.gf"
+                  type="gf"
                   listType=""
-                  :url="'/files/live/userDeclare_budget/upload'"
+                  :url="'/files/live/gf/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -221,16 +203,16 @@
           </el-col>
           <el-col :span="24" class="text">
             <el-col :span="24" class="title">
-              项目经费决算书：
+              12.企业标准等证明材料
             </el-col>
             <el-col :span="24" class="file">
-              <el-form-item prop="final">
+              <el-form-item prop="company_standard">
                 <upload
                   :limit="1"
-                  :data="datalistForm.final"
-                  type="final"
+                  :data="datalistForm.company_standard"
+                  type="company_standard"
                   listType=""
-                  :url="'/files/live/userDeclare_final/upload'"
+                  :url="'/files/live/company_standard/upload'"
                   @upload="uploadSuccess"
                   @delete="uploadDelete"
                 ></upload>
@@ -261,19 +243,18 @@ export default {
   data: function() {
     return {
       rules: {
-        work_report: [{ required: false, message: '请上传研究工作报告', trigger: 'blur' }],
-        techol_report: [{ required: false, message: '请上传研究技术报告', trigger: 'blur' }],
-        benefit: [{ required: false, message: '请上传经济效益分析', trigger: 'blur' }],
-        science_report: [{ required: false, message: '请上传科技查新报告', trigger: 'blur' }],
-        assess_report: [{ required: false, message: '请上传法律价值评估报告', trigger: 'blur' }],
-        app_prove: [{ required: false, message: '请上传推广应用证明', trigger: 'blur' }],
-        techol_ppt: [{ required: false, message: '请上传成果技术汇报PPT', trigger: 'blur' }],
-        testing_report: [{ required: false, message: '请上传检测报告', trigger: 'blur' }],
-        quality: [{ required: false, message: '请上传质量标准', trigger: 'blur' }],
-        patent: [{ required: false, message: '请上传与本成果相关的授权专利证书', trigger: 'blur' }],
-        special: [{ required: false, message: '请上传特殊行业需要提供的相应证明材料', trigger: 'blur' }],
-        budget: [{ required: false, message: '请上传项目经费预算书', trigger: 'blur' }],
-        final: [{ required: false, message: '请上传项目经费决算书', trigger: 'blur' }],
+        work_report: [{ required: false, message: '请上传工作报告(必备)', trigger: 'blur' }],
+        techol_report: [{ required: false, message: '请上传技术报告(必备)', trigger: 'blur' }],
+        compare_report: [{ required: false, message: '请上传国内外对比报告(必备)', trigger: 'blur' }],
+        benefit: [{ required: false, message: '请上传经济效益分析(必备)', trigger: 'blur' }],
+        science_report: [{ required: false, message: '请上传科技查新报告(必备)', trigger: 'blur' }],
+        techol_detect_report: [{ required: false, message: '请上传技术检测报告', trigger: 'blur' }],
+        user_prove: [{ required: false, message: '请上传用户证明', trigger: 'blur' }],
+        patent_cert: [{ required: false, message: '请上传专利证书', trigger: 'blur' }],
+        software_copyright: [{ required: false, message: '请上传软著', trigger: 'blur' }],
+        treatise: [{ required: false, message: '请上传论文', trigger: 'blur' }],
+        gf: [{ required: false, message: '请上传工法', trigger: 'blur' }],
+        company_standard: [{ required: false, message: '请上传企业标准等证明材料', trigger: 'blur' }],
       },
     };
   },

src/views/userDeclare/parts/research.vue

@@ -16,7 +16,7 @@
               <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="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>
@@ -42,7 +42,7 @@
           <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="请输入身份证号"></el-input>
+          <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">
@@ -51,7 +51,7 @@
           </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"> </el-date-picker>
+          <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>
@@ -65,8 +65,8 @@
         <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 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>
@@ -116,11 +116,11 @@ export default {
         card: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
         gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
         position: [{ required: true, message: '请输入技术职称', trigger: 'blur' }],
-        education: [{ required: true, message: '请输入文化程度', trigger: 'blur' }],
+        education: [{ required: true, message: '请输入学历', trigger: 'blur' }],
         degree: [{ required: true, message: '请输入学位', trigger: 'blur' }],
-        abroad: [{ required: true, message: '请选择是否留学归国', trigger: 'change' }],
+        abroad: [{ required: false, message: '请选择是否留学归国', trigger: 'change' }],
         research_company: [{ required: true, message: '请输入工作单位', trigger: 'blur' }],
-        devote: [{ required: true, message: '请输入对成果创造性贡献', trigger: 'blur' }],
+        devote: [{ required: false, message: '请输入对成果创造性贡献', trigger: 'blur' }],
       },
       // 列表
       list: [],
@@ -128,6 +128,25 @@ export default {
   },
   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');
     },