liuxiangqi пре 1 година
родитељ
комит
986af658de

+ 6 - 1
src/assets/styles/element-ui.scss

@@ -27,6 +27,11 @@
     padding-right: 5px;
   }
 }
+.pd5 {
+  .cell {
+    padding: 5px 0;
+  }
+}
 
 .fixed-width {
   .el-button--mini {
@@ -89,4 +94,4 @@
   > .el-submenu__title
   .el-submenu__icon-arrow {
   display: none;
-}
+}

+ 13 - 13
src/assets/styles/index.scss

@@ -824,19 +824,19 @@ $border: #ddd;
 //     font-size: 16px;
 //   }
 // }
-.table-con {
-  counter-reset: myCounter;
-}
-.table-con table::before {
-  counter-increment: myCounter;
-  content: counter(myCounter) '.';
-  position: absolute;
-  left: 2%;
-  color: #5282b6;
-  font-size: 18px;
-  font-weight: 700;
-  line-height: 19px;
-}
+// .table-con {
+//   counter-reset: myCounter;
+// }
+// .table-con table::before {
+//   counter-increment: myCounter;
+//   content: counter(myCounter) '.';
+//   position: absolute;
+//   left: 2%;
+//   color: #5282b6;
+//   font-size: 18px;
+//   font-weight: 700;
+//   line-height: 19px;
+// }
 .th_tips {
   color: #4882B5;
 }

+ 14 - 10
src/views/common/registerFirst.vue

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" :rules="registerRules" label-width="200px">
         <table class="table_register media">
           <tr>
-            <th rowspan="6" style="width: 20%;">企业信息</th>
+            <th rowspan="6" style="width: 20%;" class="th_tips">企业信息</th>
             <th><span style="color: red;">*</span>企业名称</th>
             <td>
               <el-form-item label-width="0" prop="entName">
@@ -110,7 +110,7 @@
             </td>
           </tr>
           <tr>
-            <th rowspan="3">法人信息</th>
+            <th rowspan="3" class="th_tips">法人信息</th>
             <th><span style="color: red;">*</span>姓名</th>
             <td>
               <el-form-item label-width="0" prop="legalName">
@@ -159,7 +159,7 @@
             </td>
           </tr>
           <tr>
-            <th rowspan="3">联系人信息</th>
+            <th rowspan="3" class="th_tips">联系人信息</th>
             <th><span style="color: red;">*</span>姓名</th>
             <td>
               <el-form-item label-width="0" prop="linkName">
@@ -208,7 +208,7 @@
             </td>
           </tr>
           <tr>
-            <th>企业上市信息</th>
+            <th class="th_tips">企业上市信息</th>
             <th><span style="color: red;">*</span>企业是否上市</th>
             <td>
               <el-form-item label-width="0" prop="listedFlag">
@@ -228,7 +228,7 @@
             </template>
           </tr>
           <tr>
-            <th>风险投资信息</th>
+            <th class="th_tips">风险投资信息</th>
             <th><span style="color: red;">*</span>是否引入风险投资</th>
             <td>
               <el-form-item label-width="0" prop="investFlag">
@@ -249,7 +249,7 @@
             </template>
           </tr>
           <tr>
-            <th>高新企业</th>
+            <th class="th_tips">高新企业</th>
             <th><span style="color: red;">*</span>是否为高新企业</th>
             <td>
               <el-form-item label-width="0" prop="techFlag">
@@ -269,7 +269,7 @@
             </template>
           </tr>
           <tr>
-            <th>上年度是否做加计扣除</th>
+            <th class="th_tips">上年度是否做加计扣除</th>
             <th><span style="color: red;">*</span>上年度是否做加计扣除</th>
             <td>
               <el-form-item label-width="0" prop="deductionFlag">
@@ -280,7 +280,7 @@
             </td>
           </tr>
           <tr>
-            <th rowspan="2">附件</th>
+            <th rowspan="2" class="th_tips">附件</th>
             <th><span style="color: red;">*</span>企业营业执照</th>
             <td colspan="3">
               <el-form-item label-width="3" prop="licensePath" ref="licenseUpload">
@@ -307,7 +307,7 @@
             </td>
           </tr>
           <tr>
-            <th>文件水印</th>
+            <th class="th_tips">文件水印</th>
             <th>文件水印</th>
             <td colspan="3">
               <el-form-item label-width="0" prop="logo" ref="logoUpload">
@@ -792,5 +792,9 @@ export default {
   //   .media-short {
   //     display: none !important;
   //   }
-  // }
+  // }
+  .th_tips {
+    color: #4882B5;
+    font-size: 16px;
+  }
 </style>

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

@@ -12,13 +12,13 @@
     <div class="table-con">
       <table class="table_register mt20 tablebar" style="width: 100%;">
             <tr>
-              <th colspan="4" class="th_title">项目计划书
+              <th colspan="4" class="th_title">1、项目计划书
               </th>
             </tr>
             <tr>
               <th>项目计划书导入</th>
               <td colspan="3">
-                <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('9')" v-if="techFlag">上传</el-button>
+                <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('9')" v-if="techFlag && list9.length<=0">上传</el-button>
               </td>
             </tr>
             <tr>
@@ -44,13 +44,13 @@
 
       <table class="table_register mt20 tablebar" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">研究成果报告
+          <th colspan="4" class="th_title">2、研究成果报告
           </th>
         </tr>
         <tr>
           <th>研究成果导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('10')" v-if="techFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('10')" v-if="techFlag && list10.length <= 0">上传</el-button>
             <el-button type="primary" size="mini">
               <a href="/temp/研究成果报告模板.xls">模板下载</a>
             </el-button>
@@ -77,13 +77,13 @@
       </table>
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">自主、委托、合作研究开发项目计划书和企业有权部门关于自主、委托、合作研究开发项目立项的决议文件
+          <th colspan="4" class="th_title">3、自主、委托、合作研究开发项目计划书和企业有权部门关于自主、委托、合作研究开发项目立项的决议文件
           </th>
         </tr>
         <tr>
           <th>决议文件导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('1')" v-if="techFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('1')" v-if="techFlag && list1.length <= 0">上传</el-button>
             <el-button type="primary" size="mini">
               <a href="/temp/项目立项书模板.doc">模板下载</a>
             </el-button>
@@ -110,13 +110,13 @@
       </table>
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">自主、委托、合作研究开发专门机构或项目组的编制情况和研发人员名单
+          <th colspan="4" class="th_title">4、自主、委托、合作研究开发专门机构或项目组的编制情况和研发人员名单
           </th>
         </tr>
         <tr>
           <th>研发人员名单导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('2')" v-if="techFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('2')" v-if="techFlag && list2.length <= 0">上传</el-button>
             <el-button type="primary" size="mini">
               <a href="/temp/项目负责人及研发人员模板.xls">模板下载</a>
             </el-button>
@@ -144,13 +144,13 @@
       </table>
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">经科技行政主管部门登记的委托、合作研究开发项目的合同
+          <th colspan="4" class="th_title">5、经科技行政主管部门登记的委托、合作研究开发项目的合同
           </th>
         </tr>
         <tr>
           <th>研究开发合同导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('3')" v-if="techFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('3')" v-if="techFlag && list3.length <= 0">上传</el-button>
           </td>
         </tr>
         <tr>
@@ -176,13 +176,13 @@
 
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">“研发支出”辅助账及汇总表
+          <th colspan="4" class="th_title">6、“研发支出”辅助账及汇总表
           </th>
         </tr>
         <tr>
           <th>“研发支出”辅助账及汇总表导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('6')" v-if="techFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('6')" v-if="techFlag && list6.length <= 0">上传</el-button>
           </td>
         </tr>
         <tr>
@@ -206,13 +206,13 @@
       </table>
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">企业如果已取得地市级(含)以上科技行政主管部门出具的鉴定意见,应作为资料留存备查
+          <th colspan="4" class="th_title">7、企业如果已取得地市级(含)以上科技行政主管部门出具的鉴定意见,应作为资料留存备查
           </th>
         </tr>
         <tr>
           <th>科技主管部门鉴定意见导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('7')" v-if="techFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('7')" v-if="techFlag && list7.length <= 0">上传</el-button>
           </td>
         </tr>
         <tr>
@@ -238,13 +238,13 @@
       <!-- 财务 -->
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">从事研发活动的人员(包括外聘人员)和用于研发活动的仪器、设备、无形资产的费用分配说明(包括工作使用情况记录及费用分配计算证据材料)
+          <th colspan="4" class="th_title">8、从事研发活动的人员(包括外聘人员)和用于研发活动的仪器、设备、无形资产的费用分配说明(包括工作使用情况记录及费用分配计算证据材料)
           </th>
         </tr>
         <tr>
           <th>费用分配说明导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('4')" v-if="finFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('4')" v-if="finFlag && list4.length <= 0">上传</el-button>
           </td>
         </tr>
         <tr>
@@ -268,13 +268,13 @@
       </table>
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">集中研发项目研发费决算表、集中研发项目费用分摊明细情况表和实际分享收益比例等资料
+          <th colspan="4" class="th_title">9、集中研发项目研发费决算表、集中研发项目费用分摊明细情况表和实际分享收益比例等资料
           </th>
         </tr>
         <tr>
           <th>资料导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('5')"v-if="finFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('5')"v-if="finFlag && list5.length <= 0">上传</el-button>
           </td>
         </tr>
         <tr>
@@ -298,13 +298,13 @@
       </table>
       <table class="table_register mt20" style="width: 100%;">
         <tr>
-          <th colspan="4" class="th_title">《研发费用加计扣除优惠明细表》(a107012,选择预缴享受的企业留存备查)
+          <th colspan="4" class="th_title">10、《研发费用加计扣除优惠明细表》(a107012,选择预缴享受的企业留存备查)
           </th>
         </tr>
         <tr>
           <th>优惠明细表导入</th>
           <td colspan="3">
-            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('8')" v-if="finFlag">上传</el-button>
+            <el-button type="primary"  icon="el-icon-upload2" size="mini" @click="handleUpload('8')" v-if="finFlag && list8.length <= 0">上传</el-button>
           </td>
         </tr>
         <tr>
@@ -521,7 +521,4 @@
 </script>
 
 <style lang="scss" scoped>
-  .mt20 {
-    margin-left: 3%;
-  }
 </style>

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

@@ -465,6 +465,9 @@ export default {
 
   },
   methods: {
+    delProcess(index) {
+      this.form.headAddVOList.splice(index, 1)
+    },
     getYears(){
       let optionsArray = new Array();
       let years= new Date().getFullYear();

+ 2 - 2
src/views/enterprise/project/edit.vue

@@ -12,8 +12,8 @@
       </el-tab-pane>
     </el-tabs>
     <div class="oper" v-if="oper == 'audit'">
-      <el-button @click="handleAudit('4')">通过审核</el-button>
-      <el-button @click="handleAudit('1')">驳回</el-button>
+      <el-button @click="handleAudit('4')" type="primary">通过审核</el-button>
+      <el-button @click="handleAudit('1')" type="danger">驳回</el-button>
     </div>
   </div>
 </template>

+ 8 - 5
src/views/index.vue

@@ -4,7 +4,7 @@
       <span class="title">数据累计</span>
     </h3> -->
     <div class="page01-con page04-con">
-      <h1 class="page01-title">
+      <h1 class="page01-title" style="margin: 0;">
         <img src="../assets/images/icon15.png"/>数据累计
       </h1>
     </div>
@@ -126,11 +126,9 @@
         <el-table-column label="销售收入" prop="sales" width="90" align="center"></el-table-column>
         <el-table-column label="研发收入" prop="techInvest" width="90" align="center"></el-table-column>
         <el-table-column label="占销售收入比例" prop="techRate" width="90" align="center"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <!-- <template v-if="!roleTypeFlag && (scope.row.reportState == 1 || scope.row.reportState == 2)"> -->
               <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
-            <!-- </template> -->
           </template>
         </el-table-column>
       </el-table>
@@ -150,7 +148,7 @@
       <el-table v-loading="loading" :data="declareList" border>
         <el-table-column label="项目名称" prop="projectName" align="center"/>
         <el-table-column label="申报年度" prop="projectYear" align="center"></el-table-column>
-        <el-table-column label="项目起止时间" align="center">
+        <el-table-column label="项目起止时间" align="center" class-name="small-padding fixed-width pd5" style="padding: 10px 0;">
           <template slot-scope="scope">
             <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
           </template>
@@ -242,6 +240,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+  .el-table--medium .el-table__cell {
+    .pd5 {
+      padding: 5px 0;
+    }
+  }
 
   img {
     border: none;