修改路由的页面跳转，修改评估结果的回显

src/router/dynamicRoutes.js

@@ -5,7 +5,7 @@ Vue.use(Router);
 
 /* Router Modules */
 import policyPage from './modules/policyPage';
-import configPage from './modules/configPage';
+// import configPage from './modules/configPage';
 import transferPage from './modules/transferPage';
 import customerManagement from './modules/customerManagement';
 import accountManagement from './modules/accountManagement';
@@ -20,7 +20,7 @@ export const DynamicRoutes = [
   // 政策管理
   policyPage,
   // 前端配置
-  configPage,
+  // configPage,
   // 技术转移
   transferPage,
   // 客户管理

src/router/modules/policyPage.js

@@ -27,6 +27,34 @@ const nestedRouter = {
       component: resolve => require(['@/views/policy/tag/index'], resolve),
       name: 'tag',
       meta: { title: '政策标签', icon: 'list' }
+    },
+    {
+      path: 'unscramble',
+      component: resolve =>
+        require(['@/views/front/unscramble/index'], resolve),
+      name: 'unscramble',
+      meta: { title: '政策解读库', icon: 'list' }
+    },
+    {
+      path: 'addUnscramble',
+      component: resolve => require(['@/views/front/unscramble/add'], resolve),
+      name: 'addUnscramble',
+      meta: { title: '政策解读' },
+      hidden: true
+    },
+    {
+      path: 'expressNews',
+      component: resolve =>
+        require(['@/views/front/expressNews/index'], resolve),
+      name: 'expressNews',
+      meta: { title: '资讯快报', icon: 'list' }
+    },
+    {
+      path: 'addExpressNews',
+      component: resolve => require(['@/views/front/expressNews/add'], resolve),
+      name: 'addExpressNews',
+      meta: { title: '资讯快报' },
+      hidden: true
     }
   ]
 };

src/views/customer/index.vue

@@ -284,23 +284,33 @@
       class="result-dialog"
       title="评估结果"
       :visible.sync="dialogVisible"
-      width="55%"
+      width="63%"
     >
       <el-row :gutter="20">
         <el-col :span="24">
           <el-card class="box-card">
-            <el-form ref="formA" :model="formA" disabled>
+            <!-- 基本信息 -->
-              <h3>A 高企认定门槛</h3>
+      <el-form
+        ref="formA"
+        :model="formA"
+        :show-message="false"
+        label-width="100px"
+        disabled
+      >
         <section class="padding-left">
-                <h4>一、企业基本情况</h4>
+          <p>一、企业基本情况</p>
-                <el-form-item label="企业全称">
+          <el-form-item label="企业全称" prop="companyName" class="mb10">
             <el-input
               v-model.trim="formA.companyName"
-                    style="max-width: 420px"
+              size="mini"
+              style="width:50%"
             ></el-input>
           </el-form-item>
-                <el-form-item label="成立时间">
+          <el-row :gutter="20">
+            <el-col :span="7">
+              <el-form-item label="成立时间" prop="regTime" class="mb10">
                 <el-date-picker
+                  size="mini"
                   v-model="formA.regTime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="date"
@@ -308,20 +318,56 @@
                 >
                 </el-date-picker>
               </el-form-item>
-                <el-form-item label="所属领域">
+            </el-col>
-                  <el-col :span="6">
+            <el-col :span="13">
-                    <el-form-item>
+              <el-form-item
-                      <el-select v-model="formA.territoryIName"> </el-select>
+                label="计划申报时间"
+                label-width="110px"
+                class="mb10"
+                prop="plan"
+              >
+                <el-date-picker
+                  size="mini"
+                  v-model="formA.planTime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="month"
+                  placeholder="选择日期时间"
+                >
+                </el-date-picker>
               </el-form-item>
             </el-col>
-                  <el-col :span="6">
+          </el-row>
-                    <el-form-item>
+
-                      <el-select v-model="formA.territoryIIName"> </el-select>
+          <el-form-item label="所属领域" class="mb0">
-                    </el-form-item>
+            <el-row :gutter="10">
-                  </el-col>
+              <el-col :span="4">
-                </el-form-item>
+                <el-form-item class="mb10">
-                <el-form-item label="拥有在所属领域发挥核心作用的知识产权？">
                   <el-select
+                    size="mini"
+                    v-model="formA.territoryIName"
+                    placeholder="请选择"
+                  >
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4">
+                <el-form-item prop="territoryId" class="mb10">
+                  <el-select
+                    size="mini"
+                    v-model="formA.territoryIIName"
+                    placeholder="请选择"
+                  >
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item
+                  class="mb10"
+                  label="拥有所属领域发挥核心作用的知识产权？"
+                  label-width="300px"
+                >
+                  <el-select
+                    size="mini"
                     v-model="formA.hasIntellectualProperty"
                     placeholder="请选择"
                   >
@@ -334,76 +380,168 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <h4>二、财务数据（单位：万元）</h4>
+              </el-col>
-                <el-form-item label="近一年企业总收入">
+            </el-row>
-                  <el-input-number
-                    v-model="formA.lastYearTotalRevenue"
-                  ></el-input-number>
-                </el-form-item>
-                <el-form-item label="近一年主营业务部分收入">
-                  <el-input-number
-                    v-model="formA.lastYearBusinessRevenue"
-                  ></el-input-number>
-                </el-form-item>
-                <el-form-item label="近一年研究开发费用">
-                  <el-input-number
-                    v-model="formA.lastYearResearchExpend"
-                  ></el-input-number>
-                </el-form-item>
-                <h4>三、人力资源</h4>
-                <el-form-item label="当年企业职工总数">
-                  <el-input-number
-                    v-model="formA.totalEmployee"
-                  ></el-input-number>
-                </el-form-item>
-                <el-form-item label="当年企业入职满183天的科技人员职工总数">
-                  <el-input-number
-                    v-model="formA.scienceEmployee"
-                  ></el-input-number>
-                </el-form-item>
-                <h4>四、其他</h4>
-                <el-form-item
-                  label="企业近一年内未发生重大安全、重大质量事故或严重环境违法行为。 "
-                >
-                  <el-select v-model="formA.hasBad" placeholder="请选择">
-                    <el-option
-                      v-for="item in propertyOption"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
           </el-form-item>
         </section>
       </el-form>
-          </el-card>
+      <!-- 财务数据 -->
-          <el-card class="box-card" style="margin-top:15px">
+      <p>二、企业基本数据</p>
-            <el-form ref="formA" :model="formA" disabled>
+      <el-table :data="formA.tableData" size="small" border style="margin:18px 0">
-              <section class="padding-left">
+        <el-table-column
-                <h3>B 创新指标评分</h3>
+          type="index"
-                <h4>一、知识产权</h4>
+          align="center"
+          label="序号"
+          width="60"
+        ></el-table-column>
+        <el-table-column prop="years" align="center" label="年限" width="100">
+          <template slot="header" slot-scope="scope">
+            <div>年限</div>
+            <div>（从远到近）</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          header-align="center"
+          label="总收入（万元）"
+        >
+          <template slot-scope="{ row, $index }">
+            <span v-if="!showEdit[$index]">{{ row.total_income }}</span>
+            <el-input
+              type="text"
+              v-model="row.total_income"
+              v-else
+              placeholder="请输入"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          header-align="center"
+          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
+              type="text"
+              v-model="row.skill_income"
+              v-else
+              placeholder="请输入"
+            ></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          header-align="center"
+          label="销售收入（万元）"
+        >
+          <template slot-scope="{ row, $index }">
+            <span v-if="!showEdit[$index]">{{ row.sale_income }}</span>
+            <el-input
+              type="text"
+              v-model="row.sale_income"
+              v-else
+              placeholder="请输入"
+            ></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          header-align="center"
+          label="研究开发费用（万元）"
+        >
+          <template slot-scope="{ row, $index }">
+            <span v-if="!showEdit[$index]">{{ row.r_d_expenses }}</span>
+            <el-input
+              type="text"
+              v-model="row.r_d_expenses"
+              v-else
+              placeholder="请输入"
+            ></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          header-align="center"
+          label="净资产（万元）"
+        >
+          <template slot-scope="{ row, $index }">
+            <span v-if="!showEdit[$index]">{{ row.net_assets }}</span>
+            <el-input
+              type="text"
+              v-model="row.net_assets"
+              v-else
+              placeholder="请输入"
+            ></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          header-align="center"
+          label="成果（个）"
+        >
+          <template slot-scope="{ row, $index }">
+            <span v-if="!showEdit[$index]">{{ row.achievements }}</span>
+            <el-input
+              type="text"
+              v-model="row.achievements"
+              v-else
+              placeholder="请输入"
+            ></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 人力资源 -->
+      <p v-if="formA.tableData.length">三、人力资源（实际工作时间在183天）</p>
+      <el-form
+        :model="formA"
+        ref="formB"
+        v-if="formA.tableData.length"
+        disabled
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
             <el-form-item
-                  label="自主研发的Ⅰ类（发明专利、植物新品种、国家新药、集成电路布图等）数量："
+              label="当年月平均职工总数"
+              label-width="150px"
+              class="mb0"
             >
               <el-input-number
-                    class="w120"
+                :min="0"
-                    v-model="formA.propertyNumI"
+                v-model="formA.totalEmployee"
+                size="mini"
               ></el-input-number>
-                  <!-- <el-input v-model="formA.name" class="w120"></el-input> -->
             </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item
-                  label="自主研发的Ⅱ类（实用新型专利、外观设计专利、软件著作权等（不含商标））数量："
+              label="当年月平均科技人员数(入职满183天)"
+              label-width="260px"
+              class="mb0"
             >
               <el-input-number
-                    class="w120"
+                :min="0"
-                    v-model="formA.propertyNumII"
+                v-model="formA.scienceEmployee"
+                size="mini"
               ></el-input-number>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <p>四、其他</p>
         <el-form-item
-                  label="企业参与过编制国家标准、行业标准、检测方法、技术规范？"
+          class="mb0"
+          label="企业近一年内未发生重大安全、重大质量事故或严重环境违法行为。 "
         >
-                  <el-select v-model="formA.hasStandard" placeholder="请选择">
+          <el-select size="mini" v-model="formA.hasBad" placeholder="请选择">
             <el-option
               v-for="item in propertyOption"
               :key="item.value"
@@ -413,62 +551,85 @@
             </el-option>
           </el-select>
         </el-form-item>
-                <h4>二、科技成果转化</h4>
+        <p>五、知识产权</p>
-                <el-form-item label="近三年年均成果转化数量：">
+        <el-form-item class="mb0" label="知识产权获得方式（单选）：">
+          <el-radio-group v-model="formA.propertyMode">
+            <el-radio :label="6">自主研发</el-radio>
+            <el-radio :label="3">受让、受赠和并购</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          class="mb0"
+          label="对主要产品（服务）在技术上发挥核心支持作用（单选）:"
+        >
+          <el-radio-group v-model="formA.supportLevel">
+            <el-radio :label="8">强</el-radio>
+            <el-radio :label="6">较强</el-radio>
+            <el-radio :label="4">一般</el-radio>
+            <el-radio :label="2">较弱</el-radio>
+            <el-radio :label="0">无</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          class="mb0"
+          label="自主研发的Ⅰ类（发明专利、植物新品种、国家新药、集成电路布图等）数量："
+        >
           <el-input-number
-                    class="w120"
+            :min="0"
-                    v-model="formA.achievementNum"
+            v-model="formA.propertyNumI"
+            size="mini"
           ></el-input-number>
         </el-form-item>
-                <h4>三、组织管理水平（多选）</h4>
+        <el-form-item
+          class="mb0"
+          label="自主研发的Ⅱ类（实用新型专利、外观设计专利、软件著作权等（不含商标））数量："
+        >
+          <el-input-number
+            :min="0"
+            v-model="formA.propertyNumII"
+            size="mini"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item
+          class="mb0"
+          label="企业参与过编制国家标准、行业标准、检测方法、技术规范？"
+        >
+          <el-select
+            v-model="formA.hasStandard"
+            placeholder="请选择"
+            size="mini"
+          >
+            <el-option
+              v-for="item in propertyOption"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <p>六、研究开发组织管理水平（多选）</p>
+        <el-form-item prop="management">
           <el-checkbox-group v-model="formA.management">
-                  <el-checkbox :label="1">
+            <el-checkbox label="1">
               制定了企业研究开发的组织管理制度，建立了研发投入核算体系，编制了研发费用辅助账。
             </el-checkbox>
-                  <el-checkbox :label="2">
+            <el-checkbox label="2">
               设立了内部科学技术研究开发机构并具备相应的科研条件，与国内外研究开发机构开展多种形式产学研合作
             </el-checkbox>
-                  <el-checkbox :label="3">
+            <el-checkbox label="3">
               建立了科技成果转化的组织实施与激励奖励制度，建立开放式的创新创业平台。
             </el-checkbox>
-                  <el-checkbox :label="4">
+            <br />
+            <el-checkbox label="4">
               建立了科技人员的培养进修、职工技能培训、优秀人才引进，以及人才绩效评价奖励制度。
             </el-checkbox>
             <br />
-                  <el-checkbox :label="5">
+            <el-checkbox label="5">
               以上选项都不匹配。
             </el-checkbox>
           </el-checkbox-group>
-                <h4>四、企业成长性</h4>
-                <el-form-item
-                  label="净资产增长率赋值（其中合肥市高新区企业，政策兑现要求上一年度净资产达40万元以上） "
-                >
-                  <el-select
-                    style="max-width: 95px"
-                    v-model="formA.assetGrowth"
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in assetOption"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
         </el-form-item>
-                <el-form-item label="销售收入增长率赋值">
-                  <el-select v-model="formA.sellGrowth" placeholder="请选择">
-                    <el-option
-                      v-for="item in assetOption"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </section>
       </el-form>
           </el-card>
         </el-col>
@@ -574,9 +735,12 @@ export default {
       rouId: null,
       dialogTotal: 0,
       dialogData: [],
-      formA: {},
+      formA: {
+        tableData:[]
+      },
       oneMenuList: [], // 所属领域一级菜单
       twoMenuList: [], // 所属领域二级菜单
+      showEdit: [false, false, false],
       propertyOption: [
         {
           value: 0,
@@ -655,6 +819,7 @@ export default {
       if (!row.assess || row.assess == '') return this.msgError('暂未评估');
       this.dialogVisible = true;
       const data = JSON.parse(row.assess);
+      console.log(data);
       data.regTime = parseTime(data.regTime);
       this.formA = data;
     },
@@ -716,4 +881,22 @@ export default {
 //     border-color: white !important;
 //   }
 // }
+.el-dialog{
+  p {
+      margin: 10px 0;
+      font-weight: bold;
+    }
+    .mb0 {
+      margin-bottom: 0;
+    }
+    .mb10 {
+      margin-bottom: 10px;
+    }
+    .el-checkbox-group {
+      line-height: 26px;
+      .el-checkbox {
+        // margin: 5px 0;
+      }
+    }
+}
 </style>

src/views/front/expressNews/index.vue

@@ -71,7 +71,7 @@ export default {
     },
     // 跳转页面
     handlePage(id) {
-      this.$router.push({ path: '/front/addExpressNews', query: { id } });
+      this.$router.push({ path: '/policy/addExpressNews', query: { id } });
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/front/unscramble/index.vue

@@ -135,7 +135,7 @@ export default {
     },
     // 跳转页面
     handlePage(id) {
-      this.$router.push({ path: '/front/addUnscramble', query: { id } });
+      this.$router.push({ path: '/policy/addUnscramble', query: { id } });
     },
     /** 删除按钮操作 */
     handleDelete(id) {