Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/report/project/components/cooperativeUnitsInfo.vue

@@ -15,27 +15,27 @@
       </a-col>
       <a-col :span="5" class="bg-gray">
         <div class="special-middle">
-          <div class="required">单位名称</div>
+          <div >单位名称</div>
         </div>
       </a-col>
       <a-col :span="4" class="bg-gray">
         <div class="special-middle">
-          <div class="required">单位国别</div>
+          <div >单位国别</div>
         </div>
       </a-col>
       <a-col :span="6" class="bg-gray">
         <div class="special-middle">
-          <div class="required">单位地址</div>
+          <div >单位地址</div>
         </div>
       </a-col>
       <a-col :span="4" class="bg-gray">
         <div class="special-middle">
-          <div class="required">组织机构代码/统社会信用代码</div>
+          <div >组织机构代码/统社会信用代码</div>
         </div>
       </a-col>
       <a-col :span="4" class="bg-gray">
         <div class="special-middle">
-          <div class="required">分 工</div>
+          <div >分 工</div>
         </div>
       </a-col>
     </a-row>

src/views/report/project/components/projectView.vue

@@ -55,17 +55,17 @@ export default {
     return {
       tabsData: [
         { title: '全部', key: '0', isShow: true },
-        { title: '基本情况', key: '1', isShow: false },
-        { title: '项目人员情况', key: '2', isShow: false },
-        { title: '项目可行性研究情况', key: '3', isShow: false },
-        { title: '项目实施目标', key: '4', isShow: false },
-        { title: '项目考核指标', key: '5', isShow: false },
+        { title: '基本情况', key: '1', isShow: true },
+        { title: '项目人员情况', key: '2', isShow: true },
+        { title: '项目可行性研究情况', key: '3', isShow: true },
+        { title: '项目实施目标', key: '4', isShow: true },
+        { title: '项目考核指标', key: '5', isShow: true },
         { title: '项目经费', key: '6' },
-        { title: '项目绩效目标表', key: '7', isShow: false },
+        { title: '项目绩效目标表', key: '7', isShow: true },
         { title: '项目课题设置', key: '8' },
         { title: '附件清单', key: '9' },
-        { title: '单位科研项目及资金管理制度', key: '10', isShow: false },
-        { title: '诚信承诺书', key: '11', isShow: false },
+        { title: '单位科研项目及资金管理制度', key: '10', isShow: true },
+        { title: '诚信承诺书', key: '11', isShow: true },
       ],
       projectInfo: {
         id: null,