liuxiangqi пре 1 година
родитељ
комит
4336365d1e

+ 5 - 0
src/assets/styles/element-ui.scss

@@ -32,6 +32,11 @@
     padding: 5px 0;
   }
 }
+.pd10 {
+  .cell {
+    padding: 10px 0;
+  }
+}
 
 .fixed-width {
   .el-button--mini {

+ 7 - 1
src/assets/styles/index.scss

@@ -759,7 +759,7 @@ $border: #ddd;
     font-size: 18px;
     font-weight: 700;
     line-height: 19px;
-    // padding: 15px 20px;
+    padding: 12px 20px;
   }
 }
 .table_edit {
@@ -843,3 +843,9 @@ $border: #ddd;
 .el-table {
   font-size: 15px;
 }
+.el-tabs__item {
+  font-size: 17px;
+}
+.pd10 {
+  padding: 10px 0;
+}

+ 4 - 4
src/views/enterprise/project/components/enclosure-edit.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
+    <div>
+      <b style="color: red;font-size: 15px;">根据您填报的项目信息,系统自动将需要上传的文件列出,每种类型文件只能上传单个文件(大小限制4M),如有多个请打包上传!</b><br><b style="color: red;font-size: 15px;">技术人员上传1-7项相关文件,财务人员上传8-10项相关文件。当技术、财务资料达到 100%时,可提交项目申报。</b>
+    </div>
     <h3 class="toolbar">
-      <span class="title">加计扣除备查资料清单</span>
+      <!-- <span class="title">加计扣除备查资料清单</span> -->
       <div class="tool">
         <el-button type="primary" plain icon="el-icon-download" size="mini" @click="handleDownloadBatch">批量下载</el-button>
       </div>
     </h3>
-    <div>
-      <b style="color: red;font-size: 15px;">根据您填报的项目信息,系统自动将需要上传的文件列出,每种类型文件只能上传单个文件(大小限制4M),如有多个请打包上传!</b><br><b style="color: red;font-size: 15px;">技术人员上传1-7项相关文件,财务人员上传8-10项相关文件。当技术、财务资料达到 100%时,可提交项目申报。</b>
-    </div>
     <div class="table-con">
       <table class="table_register mt20 tablebar" style="width: 100%;">
             <tr>

+ 1 - 1
src/views/enterprise/project/components/ent-edit.vue

@@ -60,7 +60,7 @@
           </td>
         </tr>
       </table>
-      <table class="table_edit mt20" style="width: 100%;">
+      <table class="table_register mt20" style="width: 100%;">
         <tr>
           <th colspan="4" class="th_title">项目负责人及研发人员
             <!-- <div class="tool"> -->

+ 20 - 12
src/views/enterprise/project/components/year-edit.vue

@@ -170,18 +170,26 @@
           </tr>
         </template>
       </table>
-      <h3 class="toolbar">
-        <span class="title">研发项目情况表</span>
-      </h3>
-      <el-table v-loading="tableLoading" :data="list" border>
-        <el-table-column label="项目名称" prop="projectName"></el-table-column>
-        <el-table-column label="项目起止时间" align="center">
-          <template slot-scope="scope">
-            <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="研发人员数" prop="techPersons" align="center"/>
-      </el-table>
+      <table class="table_register mt20" style="width: 100%;">
+        <tr>
+          <th colspan="4" class="th_title">研发项目情况表
+          </th>
+        </tr>
+        <tr>
+          <td colspan="4">
+            <el-table v-loading="tableLoading" :data="list" border>
+              <el-table-column label="项目名称" prop="projectName" align="center"></el-table-column>
+              <el-table-column label="项目起止时间" align="center">
+                <template slot-scope="scope">
+                  <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="研发人员数" prop="techPersons" align="center" class-name="small-padding fixed-width pd5"/>
+            </el-table>
+          </td>
+        </tr>
+      </table>
+
       <template v-if="type == 'year' || type == 'update'">
         <el-row :gutter="40" v-if="!disabledVisible">
           <el-col :span="24">