申报页的重置版本完成

src/api/startEvaluation.js

@@ -15,6 +15,14 @@ export function getTerritoryTwoMenu(params) {
   });
 }
 // 智能评估->开始评估
+export function saveEvaluationResult(data) {
+  return request({
+    url: '/mobile/saveEvaluationResult',
+    method: 'post',
+    data
+  });
+}
+// 智能评估->开始评估
 export function firstAssess(data) {
   return request({
     url: '/mobile/firstAssess',

src/views/home/achievements.vue

@@ -91,9 +91,9 @@
                   }}</el-tag>
                 </div>
               </div>
-              <span class="txt">{{
+              <!-- <span class="txt">{{
                 parseTime(item.createTime, '{y}-{m}-{d}')
-              }}</span>
+              }}</span> -->
             </router-link>
           </div>
         </div>

src/views/startEvaluation.vue

@@ -70,7 +70,7 @@
             </el-col>
           </el-row>
 
-          <el-form-item label="所属领域">
+          <el-form-item label="所属领域" class="mb0">
             <el-row :gutter="10">
               <el-col :span="4">
                 <el-form-item class="mb10">
@@ -132,7 +132,7 @@
       </el-form>
       <!-- 财务数据 -->
       <p>二、企业基本数据</p>
-      <el-table :data="tableData" size="small" border>
+      <el-table :data="tableData" size="small" border style="margin:18px 0">
         <el-table-column
           type="index"
           align="center"
@@ -164,8 +164,12 @@
         <el-table-column
           align="center"
           header-align="center"
-          label="高新技术产品收入（万元）"
+          label="高新技术产品（服务）收入（万元）"
         >
+          <!-- <template slot="header" slot-scope="scope">
+            <div>高新技术产品（服务）收入</div>
+            <div>（万元）</div>
+          </template> -->
           <template slot-scope="{ row, $index }">
             <span v-if="!showEdit[$index]">{{ row.skill_income }}</span>
             <el-input
@@ -196,7 +200,7 @@
         <el-table-column
           align="center"
           header-align="center"
-          label="研发费用（万元）"
+          label="研究开发费用（万元）"
         >
           <template slot-scope="{ row, $index }">
             <span v-if="!showEdit[$index]">{{ row.r_d_expenses }}</span>
@@ -242,7 +246,7 @@
         </el-table-column>
       </el-table>
       <!-- 人力资源 -->
-      <p v-if="tableData.length">三、人力资源</p>
+      <p v-if="tableData.length">三、人力资源（实际工作时间在183天）</p>
       <el-form
         :model="formA"
         :rules="rulesB"
@@ -250,10 +254,10 @@
         v-if="tableData.length"
       >
         <el-row :gutter="20">
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item
-              label="当年年均员工数"
+              label="当年月平均职工总数"
-              label-width="120px"
+              label-width="150px"
               class="mb0"
             >
               <el-input-number
@@ -263,10 +267,10 @@
               ></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item
-              label="技术创新科技人员（入职满183天）"
+              label="当年月平均科技人员数(入职满183天)"
-              label-width="280px"
+              label-width="260px"
               class="mb0"
             >
               <el-input-number
@@ -293,15 +297,15 @@
           </el-select>
         </el-form-item>
         <p>五、知识产权</p>
-        <el-form-item class="mb0" label="知识产权获得方式：">
+        <el-form-item class="mb0" label="知识产权获得方式（单选）：">
           <el-radio-group v-model="formA.propertyMode">
-            <el-radio :label="3">受让、受赠和并购</el-radio>
             <el-radio :label="6">自主研发</el-radio>
+            <el-radio :label="3">受让、受赠和并购</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item
           class="mb0"
-          label="对主要产品（服务）在技术上发挥核心支持作用:"
+          label="对主要产品（服务）在技术上发挥核心支持作用（单选）:"
         >
           <el-radio-group v-model="formA.supportLevel">
             <el-radio :label="8">强</el-radio>
@@ -443,8 +447,7 @@
 import {
   getTerritoryOneMenu,
   getTerritoryTwoMenu,
-  firstAssess,
+  saveEvaluationResult
-  secondAssess
 } from '@/api/startEvaluation';
 const dataList = [
   {
@@ -527,12 +530,12 @@ export default {
         companyName: '',
         regTime: '',
         territoryId: '',
-        hasIntellectualProperty: 0,
+        hasIntellectualProperty: 1,
         totalEmployee: 0,
         scienceEmployee: 0,
         hasBad: 0,
         propertyMode: 6,
-        supportLevel: 0,
+        supportLevel: 4,
         propertyNumI: 0,
         propertyNumII: 0,
         hasStandard: 0,
@@ -676,7 +679,7 @@ export default {
                 yearAch += parseInt(item.achievements);
                 saleTotal += parseInt(item.sale_income || 0);
                 rdTotal += parseInt(item.r_d_expenses || 0);
-                if ((item.skill_income / item.total_income) * 100 > 60) {
+                if ((item.skill_income / item.total_income) * 100 >= 60) {
                   item.isA = true;
                 } else {
                   item.isA = false;
@@ -924,6 +927,19 @@ export default {
                 this.fourTwoAdd += 2;
               }
               this.dialogVisible = true;
+              this.formA.tableData = this.tableData;
+              this.formA.territoryIName = this.oneMenuList.find(item => {
+                return item.id == this.formA.one;
+              }).name;
+              this.formA.territoryIIName = this.twoMenuList.find(item => {
+                return item.id == this.formA.territoryId;
+              }).name;
+              this.formA.planTime = this.planOption.find(item => {
+                return item.value == this.formA.plan;
+              }).newTime;
+              saveEvaluationResult(this.formA).then(res => {
+                this.msgSuccess(res.message);
+              });
             }
           });
         } else {
@@ -969,6 +985,7 @@ export default {
     min-height: 350px;
     p {
       margin: 10px 0;
+      font-weight: bold;
     }
     .mb0 {
       margin-bottom: 0;
@@ -977,7 +994,7 @@ export default {
       margin-bottom: 10px;
     }
     .el-checkbox-group {
-      line-height: 20px;
+      line-height: 26px;
       .el-checkbox {
         // margin: 5px 0;
       }