liuxiangqi пре 1 година
родитељ
комит
7cb03d30ba

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -137,7 +137,7 @@
 /** 表格更多操作下拉样式 */
 .el-table .el-dropdown-link {
 	cursor: pointer;
-	color: #115EA6;
+	color: #409EFF;
 	margin-left: 5px;
 }
 

+ 1 - 1
src/assets/styles/variables.scss

@@ -7,7 +7,7 @@ $green: #30B08F;
 $tiffany: #4AB7BD;
 $yellow:#FEC171;
 $panGreen: #30B08F;
-$menuActiveText:#115EA6;
+$menuActiveText:#409EFF;
 
 // 默认菜单主题风格
 $base-menu-color:#bfcbd9;

+ 6 - 6
src/views/admin/project/index.vue

@@ -59,25 +59,25 @@
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" width="50" label="序号"></el-table-column>
-      <el-table-column label="加计扣除年度" prop="projectYear"></el-table-column>
+      <el-table-column type="index" width="80" label="序号" align="center"></el-table-column>
+      <el-table-column label="加计扣除年度" prop="projectYear" align="center" width="120"></el-table-column>
       <el-table-column label="项目名称" prop="projectName" align="center" width="180"></el-table-column>
       <el-table-column label="企业名称" prop="entName" align="center" width="180"/>
       <el-table-column label="统一社会信用代码" prop="creditCode" align="center" width="180" />
-      <el-table-column label="是否跨年项目" prop="overYearFlag" :formatter="overYearFormat"></el-table-column>
+      <el-table-column label="是否跨年项目" prop="overYearFlag" :formatter="overYearFormat" align="center"></el-table-column>
       <!-- <el-table-column label="跨年申报"></el-table-column> -->
-      <el-table-column label="是否追溯项目" prop="backFlag" :formatter="flagFormat"></el-table-column>
+      <el-table-column label="是否追溯项目" prop="backFlag" :formatter="flagFormat" align="center"></el-table-column>
       <el-table-column label="项目起止时间" align="center" width="200">
         <template slot-scope="scope">
           <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="资料完善度" prop="linkEmail" align="center" width="340">
+      <el-table-column label="资料完善度" prop="linkEmail" align="center" width="220">
         <template slot-scope="scope">
           <span>技术 {{scope.row.techRate}} 财务 {{scope.row.finRate}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申报状态" prop="reportState" align="center" width="80" :formatter="reportStateFormat"></el-table-column>
+      <el-table-column label="申报状态" prop="reportState" align="center" width="100" :formatter="reportStateFormat"></el-table-column>
       <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" @click="handleDownload(scope.row)">下载</el-button>

+ 6 - 6
src/views/enterprise/employee/index.vue

@@ -45,12 +45,12 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList">
-      <el-table-column label="登录账号" prop="userName" width="200"/>
-      <el-table-column label="姓名" prop="nickName"/>
-      <el-table-column label="手机号码" prop="phonenumber" width="150" />
-      <el-table-column label="邮箱" prop="email" width="200"/>
-      <el-table-column label="用户角色" prop="userType" width="150" :formatter="userTypeFormat"/>
+    <el-table v-loading="loading" :data="roleList" border>
+      <el-table-column label="登录账号" prop="userName" width="200" align="center"/>
+      <el-table-column label="姓名" prop="nickName" align="center"/>
+      <el-table-column label="手机号码" prop="phonenumber" width="150" align="center"/>
+      <el-table-column label="邮箱" prop="email" width="200" align="center"/>
+      <el-table-column label="用户角色" prop="userType" width="150" :formatter="userTypeFormat" align="center"/>
       <el-table-column label="状态" align="center" width="100">
         <template slot-scope="scope">
           <el-switch

+ 1 - 1
src/views/enterprise/project/components/addProject.vue

@@ -179,7 +179,7 @@
       getYears(){
         let optionsArray = new Array();
         let years= new Date().getFullYear();
-        for(var i=years-3;i<=years;i++){
+        for(var i=years;i>=years-3;i++){
           let anOption = {};
           anOption.dictValue=i;
           anOption.dictLabel=i;

+ 6 - 6
src/views/enterprise/project/index.vue

@@ -32,23 +32,23 @@
     </h3>
     <el-table v-loading="loading" :data="list" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" width="50" label="序号"></el-table-column>
-      <el-table-column label="加计扣除年度" prop="projectYear" align="center"></el-table-column>
+      <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+      <el-table-column label="加计扣除年度" prop="projectYear" align="center" width="120"></el-table-column>
       <el-table-column label="项目名称" prop="projectName" align="center" width="180"></el-table-column>
-      <el-table-column label="是否跨年项目" prop="overYearFlag" :formatter="overYearFormat"></el-table-column>
+      <el-table-column label="是否跨年项目" prop="overYearFlag" :formatter="overYearFormat" align="center"></el-table-column>
       <!-- <el-table-column label="跨年申报" prop="backFlag"></el-table-column> -->
-      <el-table-column label="是否追溯项目" prop="backFlag" :formatter="flagFormat"></el-table-column>
+      <el-table-column label="是否追溯项目" prop="backFlag" :formatter="flagFormat" align="center"></el-table-column>
       <el-table-column label="项目起止时间" align="center" width="200">
         <template slot-scope="scope">
           <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="资料完善度" prop="linkEmail" align="center" width="340">
+      <el-table-column label="资料完善度" prop="linkEmail" align="center" width="220">
         <template slot-scope="scope">
           <span>技术 {{scope.row.techRate}} 财务 {{scope.row.finRate}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申报状态" prop="reportState" align="center" width="160" :formatter="reportStateFormat"></el-table-column>
+      <el-table-column label="申报状态" prop="reportState" align="center" width="120" :formatter="reportStateFormat"></el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">

+ 6 - 6
src/views/index.vue

@@ -120,12 +120,12 @@
         </h1>
       </div>
       <el-table v-loading="loading" :data="list" border>
-        <el-table-column label="申报年度" prop="projectYear" width="90"></el-table-column>
+        <el-table-column label="申报年度" prop="projectYear" width="90" align="center"></el-table-column>
         <el-table-column label="企业名称" prop="entName" align="center"/>
-        <el-table-column label="职工数" prop="totoalPersons" align="center" width="180" />
-        <el-table-column label="销售收入" prop="sales" width="90"></el-table-column>
-        <el-table-column label="研发收入" prop="techInvest" width="90"></el-table-column>
-        <el-table-column label="占销售收入比例" prop="techRate" width="90"></el-table-column>
+        <el-table-column label="职工数" prop="totoalPersons" align="center" width="90" />
+        <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">
           <template slot-scope="scope">
             <!-- <template v-if="!roleTypeFlag && (scope.row.reportState == 1 || scope.row.reportState == 2)"> -->
@@ -149,7 +149,7 @@
 
       <el-table v-loading="loading" :data="declareList" border>
         <el-table-column label="项目名称" prop="projectName" align="center"/>
-        <el-table-column label="申报年度" prop="projectYear"></el-table-column>
+        <el-table-column label="申报年度" prop="projectYear" align="center"></el-table-column>
         <el-table-column label="项目起止时间" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.projectStartDate}} - {{scope.row.projectEndDate}}</span>

+ 2 - 2
src/views/message/index.vue

@@ -15,13 +15,13 @@
     <el-table v-loading="loading" :data="list" border>
       <el-table-column label="通知类型" prop="noticeType" width="120" align="center" :formatter="noticeTypeFormat"/>
       <el-table-column label="通知标题" prop="noticeTitle" align="center"></el-table-column>
-      <el-table-column label="内容" prop="noticeContent" align="left">
+      <el-table-column label="内容" prop="noticeContent" align="center">
         <template slot-scope="scope" >
           <span class="content_msg"> {{scope.row.noticeContent}}</span> <el-button @click="handleView(scope.row)" type="text" size="small">查看详情</el-button>
          </template>
       </el-table-column>
       <el-table-column label="状态" prop="status" align="center" width="120" :formatter="statusFormat"/>
-      <el-table-column label="发送时间" align="center" prop="createTime" width="160"></el-table-column>
+      <el-table-column label="发送时间" align="center" prop="createTime" width="170"></el-table-column>
     </el-table>
     <pagination
       v-show="total>0"