Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/App.vue

@@ -94,7 +94,7 @@
         font-size: 18px;
         font-weight:bold;
         margin-top: 20px;
-        margin-bottom: 5px;
+        margin-bottom: 13px;
         display: flex;
         justify-content: space-between;
         [type='button']{
@@ -140,7 +140,7 @@
   }
 
   .operations{   //所有表格按钮栏
-    display: flex;
+    // display: flex;
     flex-shrink: 0;
     [type='button']{
       font-size: 14px;

src/views/ProjectManagement2.vue

@@ -191,7 +191,7 @@
         }
     }
     .PA2textArea{
-        margin: 15px 10px;
+        margin: 15px 0px;
         .PA2textAreaTit{
             width: 100%;
             text-align: left;

src/views/ProjectManagementFund2.vue

@@ -37,21 +37,21 @@
           prop="projectPerson"
           align="center"
 
-          label="项目负责人"
+          label="负责人"
           >
         </el-table-column>
         <el-table-column
           prop="relevancy"
           align="center"
 
-          label="关联项目"
+          label="项目类型"
           >
         </el-table-column>
         <el-table-column
           prop="budget"
           align="center"
 
-          label="预算经费"
+          label="申请经费(元)"
           >
         </el-table-column>
         <el-table-column
@@ -61,23 +61,18 @@
           label="所在部门"
           >
         </el-table-column>
-        <el-table-column
-          prop="status"
-          align="center"
 
-          label="状态"
-          >
-        </el-table-column>
         <el-table-column
           prop="date"
           align="center"
 
-          label="活动时间"
+          label="申请时间"
          >
         </el-table-column>
         <el-table-column
           prop="operation"
           label="操作"
+          align="center"
           width="250px"
           >
           <template #default="scope">
@@ -140,7 +135,7 @@
         </div>
         
         <div class="dagRemark">
-          支出类别(单位:元)
+          经费支出支出类别(单位:元)
         </div>
 
         <!-- 支出类别(单位:元)第一部分开始 -->
@@ -314,12 +309,6 @@
         
       }
     }
-    .operation{
-      display: flex;
-      justify-content: flex-start;
-    }
-  
-
   
   .pAHeader{
       width: 90%;
@@ -423,7 +412,7 @@
 
     .dagRemark{
       display: flex;
-      margin: 20px 10px;
+      margin: 20px 0px;
       font-size: 16px;
       font-weight: 550;
     }