检查前

src/App.vue

@@ -78,7 +78,6 @@
     margin-bottom: 15px;
     .pAHeader1{
       text-align: left;
-      width: 150px;
       font-weight: 600;
       font-size: 22px;
       flex-shrink: 0;
@@ -86,6 +85,7 @@
     .pAHeader1STit{
       font-size: 16px;
       margin-top: 10px;
+      margin-left: 15px;
     }
   }
 
@@ -210,7 +210,7 @@
               
             }
             .selectRight{
-              width: 20%;
+              width: 25%;
               height: 150px;
               display: flex;
               flex-direction: column;
@@ -283,5 +283,9 @@
     }  
   }
 
+  .twoStyle{
+    display: flex !important;
+    justify-content: flex-end;
+  }
 
 </style>

src/views/ProjectManagement1.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ProjectManagement1">
+  <div class="ProjectManagement1 core_dialogue">
     <div class="pA1Header">
       <!-- 详情页 -->
       <div style="display: flex;width: 400px;">
@@ -83,6 +83,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
+        class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
        
@@ -208,65 +209,8 @@
 
 <style lang="less">
 .ProjectManagement1{
-  .pA1Header{
-    width: 90%;
-    display: flex;
-    justify-content:space-between;
-    align-items: center;
-    .pAHeader1STit{
-      font-size: 14px;
-      margin-top: 10px;
-    }
-    .pAHeader1{
-      width: 120px;
-      font-weight: 600;
-      font-size: 22px;
-      flex-shrink: 0;
-    }
-  }
 
-  .selects{
-      width: 80%;
-      margin: 20px 0 0 30px;
-      // margin-left: 30px;
-      display: flex;
-      flex-wrap: wrap;
-    .dataTextBlock{   //输入框block
-      display: flex;
-      margin-left: 10px;
-      margin-top: 10px;
-      .inpText{
-        width: 160px;
-        text-align: right;
-        box-sizing: border-box;
-        padding-right: 10px;
-        line-height: 45px;
-        font-weight: 510;
-      }
-    }
-    
-  }
-  .operations{
-    display: flex;
-    flex-shrink: 0;
-    .btt{
-      flex-shrink: 0;
-      text-decoration: none;
-      .bt1{
-        margin-left:5px ;
-      }
-    }
-  }
-  .tabTit{
-      width: 100%;
-      text-align: left;
-      margin-left: 20px;
-      font-size: 19px;
-      font-weight:bold;
-      box-sizing: border-box;
-      // padding-bottom: 20px;
-      margin-top: 20px;
-  }
+
   .pm1footer{
       width: 100%;
       display: flex;

src/views/ProjectManagement2.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ProjectManagement2">
+    <div class="ProjectManagement2 core_dialogue">
       <div class="pA1Header">
       <!-- 详情页 -->
       <div style="display: flex;width: 400px;">
@@ -161,25 +161,7 @@
   
   <style lang="less">
   .ProjectManagement2{
-    .pA1Header{
-    width: 90%;
-    display: flex;
-    justify-content:space-between;
-    align-items: center;
-    .pAHeader1STit{
-      font-size: 14px;
-      margin-top: 10px;
-    }
-    .pAHeader1{
-      width: 120px;
-      font-weight: 600;
-      font-size: 22px;
-      flex-shrink: 0;
-    }
-  }
-  
-    
-    
+
    
     .footer{
         width: 100%;

src/views/ProjectManagement3.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ProjectManagement3">
+    <div class="ProjectManagement3 core_dialogue">
       <div class="pA1Header">
       <!-- 详情页 -->
         <div style="display: flex;width: 400px;">
@@ -145,23 +145,7 @@
   
   <style lang="less">
   .ProjectManagement3{
-    .pA1Header{
-      width: 90%;
-      display: flex;
-      justify-content:space-between;
-      align-items: center;
-      .pAHeader1STit{
-        font-size: 14px;
-        margin-top: 10px;
-      }
-      .pAHeader1{
-        width: 120px;
-        font-weight: 600;
-        font-size: 22px;
-        flex-shrink: 0;
-      }
-    }
-    
+
     .operations{
       display: flex;
       justify-content: center;

src/views/ProjectManagement3_1.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ProjectManagement3_1">
+    <div class="ProjectManagement3_1 core_dialogue">
       <div class="pA1Header">
       <!-- 详情页 -->
         <div style="display: flex;width: 400px;">
@@ -252,22 +252,6 @@
 
   <style lang="less">
   .ProjectManagement3_1{
-    .pA1Header{
-      width: 90%;
-      display: flex;
-      justify-content:space-between;
-      align-items: center;
-      .pAHeader1STit{
-        font-size: 14px;
-        margin-top: 10px;
-      }
-      .pAHeader1{
-        width: 120px;
-        font-weight: 600;
-        font-size: 22px;
-        flex-shrink: 0;
-      }
-    }
 
     .MA1Head{
       display: flex;

src/views/ProjectManagement4.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ProjectManagement4">
+    <div class="ProjectManagement4 core_dialogue">
       <div class="pA1Header">
       <!-- 详情页 -->
       <div style="display: flex;width: 400px;">
@@ -119,22 +119,7 @@
   
   <style lang="less">
   .ProjectManagement4{
-    .pA1Header{
-    width: 90%;
-    display: flex;
-    justify-content:space-between;
-    align-items: center;
-    .pAHeader1STit{
-      font-size: 14px;
-      margin-top: 10px;
-    }
-    .pAHeader1{
-      width: 120px;
-      font-weight: 600;
-      font-size: 22px;
-      flex-shrink: 0;
-    }
-  }
+
   
     
     .operations{

src/views/ProjectManagement5.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="ProjectManagement5">
+    <div class="ProjectManagement5 core_dialogue">
       <div class="pA1Header">
       <!-- 详情页 -->
       <div style="display: flex;width: 400px;">
@@ -30,6 +30,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
+        class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         >
        
@@ -133,22 +134,22 @@
   <style lang="less">
   .ProjectManagement5{
 
-    .pA1Header{
-      width: 90%;
-      display: flex;
-      justify-content:space-between;
-      align-items: center;
-      .pAHeader1STit{
-        font-size: 14px;
-        margin-top: 10px;
-      }
-      .pAHeader1{
-        width: 120px;
-        font-weight: 600;
-        font-size: 22px;
-        flex-shrink: 0;
-      }
-    }
+    // .pA1Header{
+    //   width: 90%;
+    //   display: flex;
+    //   justify-content:space-between;
+    //   align-items: center;
+    //   .pAHeader1STit{
+    //     font-size: 14px;
+    //     margin-top: 10px;
+    //   }
+    //   .pAHeader1{
+    //     width: 120px;
+    //     font-weight: 600;
+    //     font-size: 22px;
+    //     flex-shrink: 0;
+    //   }
+    // }
   
     
     .operations{

src/views/ProjectManagementFund1.vue

@@ -2,7 +2,7 @@
   <div class="ProjectManagementFund1">
         <div class="pA1Header">
             <div class="pAHeader1">预算经费</div>
-            <div @click="back" style="margin-top: 10px;">返回</div>
+            <div @click="back" style="margin-top: 10px;cursor: pointer;">返回</div>
         </div>
           <hr>
 

src/views/ProjectManagementFund2.vue

@@ -3,7 +3,7 @@
       <div class="right">
           <div class="pAHeader">
               <div class="pAHeader1">预算经费</div>
-              <div @click="$router.back()" style="margin-top: 10px;">返回</div>
+              <div @click="$router.back()" style="margin-top: 10px;cursor: pointer;">返回</div>
           </div>
           <hr>
          <!-- 跳转导航开始 -->
@@ -105,21 +105,6 @@
 
 
 
-      <!-- <el-dialog
-        title="提示"
-        :visible.sync="dialogVisible1"
-        width="600px"
-        class="projectApplicationfundAddDialog"
-        :before-close="init">
-        <div class="addDialogLogo">LOGO</div>
-        <div class="deleteContent">确定提交“×××”项目立项？</div>
-        <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="init" class="btn5" size="small">确认提交</el-button>
-          <el-button @click="init" class="btn5" style="background:#cccccc" size="small">取消</el-button>
-        </span>
-      </el-dialog> -->
-
-
 
       <!-- 查看详情对话框开始 -->
       <el-dialog
@@ -243,8 +228,7 @@
       export default {
         data() {
           return {
-            dialogVisible1:false,
-            fundDetail:false,
+            fundDetail:true,
             options: [ 
               {
                 value: '选项5',
@@ -289,7 +273,6 @@
         },
         methods:{
           init(){
-            this.dialogVisible1=false;
             this.fundDetail=false;
           },
           content(){

src/views/makerActvity.vue

@@ -73,6 +73,7 @@
         <el-table-column
           prop="projectName"
           label="活动名称"
+          align="center"
           min-width="10%">
         </el-table-column>
         <el-table-column

src/views/makerActvityApply.vue

@@ -53,7 +53,7 @@
                           </div>
                           <div class="inpBlock">
                               <div class="label">联系电话</div>
-                              <el-input v-model="data.select.tel" placeholder="请输入内容"></el-input>
+                              <el-input v-model="data.select.takeCharge" placeholder="请输入内容"></el-input>
                           </div>
                       </div>
 
@@ -106,7 +106,7 @@
                 </el-table-column>
   
                 <el-table-column
-                  prop="tel"
+                  prop="takeCharge"
                   label="活动分工"
                   align="center"
                   >
@@ -114,7 +114,6 @@
                
                 <el-table-column
                   prop="operation"
-                  align="center"
                   label="操作"
                   >
                   <template #default="scope">
@@ -144,10 +143,11 @@
             <!-- 活动介绍区域结束 -->
 
 
-            <div class="footer">
-              <el-button type="primary" class="backBtn" @click="backBtn1" size:small>上一步</el-button>
-              <el-button type="primary" class="backBtn" @click="next()" size:small>下一步</el-button>
-
+            <div class="baseBtn">
+              <div class="blockWidth">
+                <el-button type="primary"  @click="backBtn1" size:small>上一步</el-button>
+                <el-button type="primary"  @click="next()" size:small>下一步</el-button>
+              </div>
             </div>
         </div>
         <!-- 右边填写信息区域结束 -->
@@ -179,7 +179,7 @@
               <div class="diaTit1">
                 <div class="spans1">电话</div>
                 <div>
-                  <el-input v-model="Member.tel"></el-input>
+                  <el-input v-model="Member.takeCharge"></el-input>
                 </div>
               </div>
               <div slot="footer" class="dialog-footer">
@@ -208,7 +208,7 @@
             Member:{
               Name:'袁一鸣',
               class:'21通信',
-              tel:'1234567898'
+              takeCharge:'ui设计'
             },
             value: '中德学院',
             input:'',
@@ -216,7 +216,7 @@
             tableData:[{
               Name:'徐晓慧',
               class:'22电子通信G5',
-              tel:'13751177411',
+              takeCharge:'UI设计',
             },
             ],
           }

src/views/makerActvityApply2.vue

@@ -52,9 +52,11 @@
                 </div>
               </div>
               
-            <div class="footer">
-              <el-button type="primary" class="backBtn" @click="back()" size:small>上一步</el-button>
-              <el-button type="primary" class="backBtn" @click="putIn" size:small>提交</el-button>
+            <div class="baseBtn">
+              <div class="blockWidth">
+                <el-button type="primary" class="backBtn" @click="back()" size:small>上一步</el-button>
+                <el-button type="primary" class="backBtn" @click="putIn" size:small>提交</el-button>
+              </div>
             </div>
         </div>
         <!-- 右方数据展示区结束-->
@@ -130,30 +132,7 @@
         border-radius: 5px;
         overflow: hidden;
       }
-    .footer{
-        width: 100%;
-        margin-top: 30px; 
-        height: 60px;
-        .backBtn{
-            background: #169bd5;
-            font-size: 16px;
-            height: 40px;
-            width: 100px;
-            float: right;
-            width: 100px;
-            margin-left: 10px;
-        }
-    }
-    .textArea{
-      display: flex;
-      justify-content: flex-start;
-      textarea{
-        resize: none;outline: none;
-        background: #f2f2f2;
-        box-sizing: border-box;
-        padding: 10px;
-      }
-    }
+
     .pTit{
       margin: 20px 5px 0px 0; 
       color: #3994ff;
@@ -166,10 +145,10 @@
       box-sizing: border-box;
       padding: 10px 20px 10px 0px;
     }
-.MAputIn{
-//   position: relative;
+
+
+.MAputIn{   //提交对话框样式
   .deleteContent{
-    // margin: 30px 0;
     width: 100%;
     text-align: center;
     font-size: 25px;
@@ -190,33 +169,7 @@
     margin-left:250px;
     color:rgb(246, 247, 246);
   }
-  .addDialogMid{
-    box-sizing: border-box;
-    padding:0 60px 0 10px;
-    .addDialogTit{
-      display: flex;
-      span{
-        width: 80px;
-        line-height: 40px;
-        text-align: left;
-        
-      }
-    }
-    .addDialogTit1{
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 15px;
-    }
-    .addDialogTit2{
-      margin-top: 10px;
-      font-size: 18px;
-      color: #000;
-      text-indent: 2em;
-    }
-    .addDialogCon{
-      margin-top: 20px;
-    }
-  }
+  
   .dialog-footer{
     display: flex;
     justify-content: center;

src/views/makerActvityApplyMain.vue

@@ -99,27 +99,28 @@ import makerActvityApply2 from './makerActvityApply2.vue';
             }
             }
             .right{
-            width: 83%;
-            background: #fff;
-            box-sizing: border-box;
-            padding: 10px 20px;
-            .pAHeader{
-                width: 85%;
-                display: flex;
-                justify-content:space-between;
-                .pAHeader1{
-                width: 200px;
-                font-weight: 600;
-                font-size: 22px;
-                flex-shrink: 0;
-                }
-                .pAHeader2{
-                padding-top: 15px;
-                color: #000;
-                cursor: pointer;
+                width: 83%;
+                background: #fff;
+                box-sizing: border-box;
+                padding: 20px 20px;
+                margin-bottom: 30px; 
+                .pAHeader{
+                    width: 85%;
+                    display: flex;
+                    justify-content:space-between;
+                    .pAHeader1{
+                    width: 200px;
+                    font-weight: 600;
+                    font-size: 22px;
+                    flex-shrink: 0;
+                    }
+                    .pAHeader2{
+                    padding-top: 15px;
+                    color: #000;
+                    cursor: pointer;
+                    }
                 }
             }
-            }
         }
 
   

src/views/makerActvityDetails.vue

@@ -1,9 +1,9 @@
 <template>
      <div class="makerActvityDetails core_dialogue">
 
-            <div class="pAHeader">
+            <div class="pA1Header">
               <div class="pAHeader1">活动详情</div>
-              <span @click="backBtn">返回</span>
+              <span @click="backBtn" style="cursor: pointer;">返回</span>
               <!-- <el-button type="primary" class="addTeacher" style="box-sizing: border-box;padding-left: 30px;" @click="backBtn" size="mini">返回</el-button> -->
             </div>
             <hr>
@@ -116,7 +116,6 @@
                 
                 <el-table-column
                   prop="operation"
-                  align="center"
                   label="操作"
                   >
                   <template #default="scope">
@@ -214,14 +213,14 @@
                     </div>
 
                     <div class="littleBlock">
-                      <div class="dialogLabel">班级</div>
+                      <div class="dialogLabel">工作单位</div>
                       <div>
                         <el-input v-model="Member.class"></el-input>
                       </div>
                     </div>
 
                     <div class="littleBlock">
-                      <div class="dialogLabel">电话</div>
+                      <div class="dialogLabel">活动分工</div>
                       <div>
                         <el-input v-model="Member.takeCharge"></el-input>
                       </div>
@@ -246,8 +245,8 @@ export default {
             }],
             Member:{
               Name:'袁一鸣',
-              class:'21通信',
-              takeCharge:'1234567898'
+              class:'信通学院',
+              takeCharge:'ui'
             },
             value:'',
             input:'',
@@ -298,7 +297,7 @@ export default {
   }
 
   .el-dialog__body{
-    padding:30px 25%;
+    padding:30px 22%;
   }
   
   .el-dialog__header{
@@ -316,7 +315,7 @@ export default {
       width: 70%;
       margin-top: 20px;
       .dialogLabel{      //label
-        min-width: 40px;
+        min-width: 80px;
         font-size: 16px;
         margin-right: 10px;
         display: inline-block;

src/views/makerfund.vue

@@ -65,6 +65,7 @@
         :data="tableData"
         tooltip-effect="dark"
         stripe
+        style="width:100%"
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
         @selection-change="handleSelectionChange">
@@ -73,46 +74,60 @@
           prop="projectName"
           label="项目名称"
           align="center"
-          min-width="11%">
+          >
         </el-table-column>
         <el-table-column
           prop="projectPerson"
+          align="center"
+
           label="负责人"
-          min-width="8%">
+          >
         </el-table-column>
         <el-table-column
+          align="center"
+
           prop="relevancy"
           label="项目类型"
-          min-width="8%">
+          >
         </el-table-column>
         <el-table-column
           prop="budget"
+          align="center"
+
           label="申请经费(元)"
-          min-width="8%">
+          >
         </el-table-column>
         <el-table-column
           prop="useBudget"
+          align="center"
+
           label="实际使用(元)"
-          min-width="8%">
+          >
         </el-table-column>
         <el-table-column
           prop="dept"
+          align="center"
+
           label="所在部门"
-          min-width="8%">
+          >
         </el-table-column>
         <el-table-column
           prop="status"
+          align="center"
+
           label="状态"
-          min-width="6%">
+          >
         </el-table-column>
         <el-table-column
           prop="date"
+          align="center"
+
           label="申请时间"
-          min-width="13%">
+          >
         </el-table-column>
         <el-table-column
           prop="operation"
-          min-width="30%"
+          width="325"
           label="操作"
           >
           <template #default="scope">

src/views/makerfundApply.vue

@@ -10,7 +10,14 @@
     <!-- 项目名称、类型开始 -->
     <div class="Apply1">
         <div class="inpInterval">项目名称</div>
-        <input type="text" class="inpName" placeholder="请输入项目名称.." value="">
+        <el-select v-model="value" style="width: 30%;" placeholder="请选择">
+            <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            </el-option>
+        </el-select>
     </div>
     <div class="Apply1">
         <div class="inpInterval">项目类型</div>
@@ -28,7 +35,7 @@
 
 
 
-    <div class="disburseSort">
+    <div class="tabTit">
             经费支出类别(单位:元)
     </div>
     <hr>
@@ -46,15 +53,15 @@
                 </el-select>
             </div>
             <div class="howMoney">
-                <div class="inpInterval">预算</div>
+                <div class="inpInterval twoStyle">预算</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
             <div class="howMoney">
-                <div class="inpInterval">已支付</div>
+                <div class="inpInterval twoStyle">已支付</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
             <div class="howMoney">
-                <div class="inpInterval">余额</div>
+                <div class="inpInterval twoStyle">余额</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
         </div>
@@ -89,15 +96,15 @@
                 </el-select>
             </div>
             <div class="howMoney">
-                <div class="inpInterval">预算</div>
+                <div class="inpInterval twoStyle">预算</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
             <div class="howMoney">
-                <div class="inpInterval">已支付</div>
+                <div class="inpInterval twoStyle">已支付</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
             <div class="howMoney">
-                <div class="inpInterval">余额</div>
+                <div class="inpInterval twoStyle">余额</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
         </div>
@@ -126,15 +133,15 @@
                 <el-input v-model="input" placeholder="请输入内容"></el-input>
             </div>
             <div class="howMoney">
-                <div class="inpInterval">预算</div>
+                <div class="inpInterval twoStyle">预算</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
             <div class="howMoney">
-                <div class="inpInterval">已支付</div>
+                <div class="inpInterval twoStyle">已支付</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
             <div class="howMoney">
-                <div class="inpInterval">余额</div>
+                <div class="inpInterval twoStyle">余额</div>
                 <input type="text" class="howMoneyInp" placeholder="金额" value="">
             </div>
         </div>
@@ -152,7 +159,7 @@
        
     </div>
     <div>
-        <div class="disburseSort">附件上传</div>
+        <div class="tabTit">附件上传</div>
         <hr>
         <!-- <div class="makerfundDetailsAccessoryBlock">文件</div> -->
         <div class="makerfundDetailsaddMoneyBtn">
@@ -160,9 +167,11 @@
         </div>
 
       </div>
-    <div class="footer">
-        <el-button type="primary">生成表单</el-button>
-        <el-button type="primary">提交</el-button>
+    <div class="baseBtn">
+        <div class="blockWidth">
+            <el-button type="primary">生成表单</el-button>
+            <el-button type="primary">提交</el-button>
+        </div>
        </div>
   </div>
 </template>
@@ -231,13 +240,7 @@ export default {
         padding-right: 15px;
         font-size: 16px;
     }
-  .disburseSort{
-    width: 300px;
-    margin:30px 0px 10px 0;
-    text-align: left;
-    font-size: 18px;
-    font-weight: 600;
-  }
+
   .moneyBlock{
     max-width: 100%;
     .howMoney{

src/views/makerfundDetails.vue

@@ -45,15 +45,15 @@
                   </el-select>
            </div>
            <div class="howMoney">
-              <span class="inpInterval">预算</span>
+              <span class="inpInterval twoStyle">预算</span>
               <el-input  placeholder="金额" v-model="value"></el-input>
            </div>
            <div class="howMoney">
-              <span class="inpInterval">已支付</span>
+              <span class="inpInterval twoStyle">已支付</span>
               <el-input type="text" placeholder="金额" v-model="value"></el-input>
             </div>
            <div class="howMoney">
-            <span class="inpInterval">余额</span>
+            <span class="inpInterval twoStyle">余额</span>
               <el-input type="text" placeholder="金额" v-model="value"></el-input>
            </div>
       </div>
@@ -78,18 +78,18 @@
       <div class="Apply1">
         <div class="howMoney">
             <span class="inpInterval">其他</span>
-              <el-input  placeholder="其他" v-model="value"></el-input>
+              <el-input placeholder="其他" v-model="value"></el-input>
            </div>
            <div class="howMoney">
-              <span class="inpInterval">预算</span>
+              <span class="inpInterval twoStyle" >预算</span>
               <el-input  placeholder="金额" v-model="value"></el-input>
            </div>
            <div class="howMoney">
-              <span class="inpInterval">已支付</span>
+              <span class="inpInterval twoStyle">已支付</span>
               <el-input type="text" placeholder="金额" v-model="value"></el-input>
             </div>
            <div class="howMoney">
-            <span class="inpInterval">余额</span>
+            <span class="inpInterval twoStyle">余额</span>
               <el-input type="text" placeholder="金额" v-model="value"></el-input>
            </div>
       </div>
@@ -135,7 +135,28 @@
               options: [{
               value: '选项1',
               label: '黄金糕'
-              }],
+              },
+              {
+              value: '选项1',
+              label: '黄金糕'
+              },
+              {
+              value: '选项1',
+              label: '黄金糕'
+              },
+              {
+              value: '选项1',
+              label: '黄金糕'
+              },
+              {
+              value: '选项1',
+              label: '黄金糕'
+              },
+              {
+              value: '选项1',
+              label: '黄金糕'
+              },
+            ],
               projectName:''
           }
       },
@@ -214,13 +235,6 @@
         margin-right: 30px;
       }
       .inpInterval{
-        // display: flex;
-        // align-items: center;
-        // min-width: 100px;
-        // justify-content:center;
-        // display: inline-block;
-        // text-align: justify;
-        // transform: translate(0,22%);
           min-width: 70px;
           margin-right: 5px;
           display: inline-block;
@@ -230,7 +244,6 @@
           transform: translate(0,22%);
           padding-right: 15px;
           font-size: 16px;
-
       }
       .inpName{
           height: 40px;

src/views/projectApplicationApply.vue

@@ -25,46 +25,59 @@
             </div>
             <hr>
 
-  <!-- 项目立项申请输入框开始 -->
-            <div class="projectApplicationApplySelects">
-              <div class="inp1" style="width: 92%;">
-                  <span class="inpText">项目名称</span>
-                  <el-input v-model="data.select.projectName" placeholder="请输入内容"></el-input>
-              </div>
-              <div class="inp1">
-                  <span class="inpText">项目负责人</span>
-                  <el-input v-model="data.select.person" placeholder="请输入内容"></el-input>
-              </div>
-              <div class="inp1">
-                  <span class="inpText">项目开始时间</span>
-                  <el-date-picker
-                    v-model="data.select.Data"
-                    type="date"
-                    style="width: 100%;"
-                    placeholder="选择日期">
-                  </el-date-picker>
-              </div>
-              <div class="inp1">
-                  <span class="inpText">所在部门</span>
-                  <el-select v-model="data.select.value" style="width: 100%;">
-                    <el-option
-                      v-for="item in data.options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-              </div>
-              <div class="inp1">
-                  <span class="inpText">预算总经费</span>
-                  <el-input v-model="data.select.fund" placeholder="请输入内容"></el-input>
-              </div>
-              <div class="inp1">
-                  <span class="inpText">联系电话</span>
-                  <el-input v-model="data.select.phone" placeholder="请输入内容"></el-input>
+                <!-- 活动申请填写信息区域开始 -->
+                <div class="select">
+                    <div class="selectTop">
+                      <div class="label">项目名称</div>
+                      <el-input v-model="data.projectName" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div class="selectMid">
+                      <div class="selectLeft">
+                          <div class="inpBlock">
+                              <div class="label">预算经费</div>
+                              <el-input v-model="data.select.fund" placeholder="请输入内容"></el-input>
+                          </div>
+                          <div class="inpBlock">
+                              <div class="label">负责人</div>
+                              <el-input v-model="data.select.person" placeholder="请输入内容"></el-input>
+                          </div>
+                          <div class="inpBlock">
+                              <div class="label">所在部门</div>
+                              <el-select v-model="data.select.value" style="width: 100%;" placeholder="请选择">
+                                <el-option
+                                  v-for="item in data.options"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                              </el-select>
+                          </div>
+                          <div class="inpBlock">
+                              <div class="label">联系电话</div>
+                              <el-input v-model="data.select.tel" placeholder="请输入内容"></el-input>
+                          </div>
+                      </div>
+
+                      <div class="selectRight">
+                        <div class="inpBlock">
+                              <div class="label">项目开始时间</div>
+                              <el-date-picker
+                                v-model="data.select.value1"
+                                type="date"
+                                style="width: 100%;"
+                                placeholder="选择日期">
+                              </el-date-picker>
+                          </div>
+                          <div class="inpBlock">
+                              <div class="label">预算总经费</div>
+                              <el-input v-model="data.select.fund" placeholder="请输入内容"></el-input>
+                          </div>
+                          
+                      </div>
+                    </div>
+                   
               </div>
-            </div>
-  <!-- 项目立项申请输入框结束-->
+              <!-- 活动申请填写信息区域结束 -->
 
 
 
@@ -141,9 +154,11 @@
   <!-- 项目简介结束 -->
 
   <!-- 结束按钮开始 -->
-            <div class="footer">
-              <el-button type="primary" class="backBtn" @click="backBtn1" size:small>上一步</el-button>
-              <el-button type="primary" class="backBtn" @click="backBtn" size:small>下一步</el-button>
+            <div class="baseBtn">
+              <div class="blockWidth">
+                <el-button type="primary" class="backBtn" @click="backBtn1" size:small>上一步</el-button>
+                <el-button type="primary" class="backBtn" @click="backBtn" size:small>下一步</el-button>
+              </div>
             </div>
   <!-- 结束按钮结束 -->
         </div>

src/views/projectApplicationApply2.vue

@@ -50,9 +50,11 @@
                 <vue-editor v-model="data.contentFive" :editorToolbar="customToolbar"></vue-editor>
               </div>
             </div>
-            <div class="footer">
-              <el-button type="primary" class="backBtn" @click="backBtn1" size:small>上一步</el-button>
-              <el-button type="primary" class="backBtn" @click="backBtn" size:small>下一步</el-button>
+            <div class="baseBtn">
+              <div class="blockWidth">
+                <el-button type="primary" class="backBtn" @click="backBtn1" size:small>上一步</el-button>
+                <el-button type="primary" class="backBtn" @click="backBtn" size:small>下一步</el-button>
+              </div>
             </div>
         </div>
       </div>

src/views/projectApplicationApply3.vue

@@ -165,9 +165,11 @@
           <!-- 经费明细和表格结束 -->
 
 
-          <div class="footer">
-            <el-button type="primary" class="backBtn" @click="back()">上一步</el-button>
-            <el-button type="primary" class="backBtn"  @click="submit" >提交</el-button>
+          <div class="baseBtn">
+            <div class="blockWidth">
+              <el-button type="primary" class="backBtn" @click="back()">上一步</el-button>
+              <el-button type="primary" class="backBtn"  @click="submit" >提交</el-button>
+            </div>
           </div>
       </div>
 

src/views/projectApplicationApplyMain.vue

@@ -65,7 +65,8 @@
                   Data:'2023-3-2',
                   value:"中德学院",
                   fund:'300000',
-                  phone:'16625153232'
+                  tel:'16625153232',
+                  value1:"2023-11-12"
                 },
                 options: [{
                     value: '选项1',
@@ -125,7 +126,6 @@
       display: flex;
       flex-direction: column;
       align-items: center;
-    
     .pAHeader3{   //返回键
         position: absolute;
         right: 0px;
@@ -141,6 +141,7 @@
     }
     .Main_area{  //宽度
       width: 95%;
+      margin-bottom: 50px;
     }
     // 顶部导航区
 
@@ -305,47 +306,6 @@
 
 
 
- //二级标题开始
- .tabTit{
-      width: 100%;
-      display: flex;
-      justify-content: space-between;
-      text-align: left;
-      font-size: 18px;
-      font-weight:bold;
-      box-sizing: border-box;
-      margin: 20px 0 10px 0;
-      [type='button']{
-        font-size: 16px;
-      }
-      .addBtn{
-        width: 100px;
-        height: 30px;
-        line-height: 5px;
-      }
-  }
- //二级标题结束
-
-  // 上下步按钮
-  .footer{
-      width: 100%;
-      height: 50px;
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-      margin-top: 30px;
-      margin-bottom: 30px;
-      .backBtn{
-          background: #169bd5;
-          height: 35px;
-          line-height: 0px;
-          width: 100px;
-          float: right;
-          width: 100px;
-          font-size: 16px;
-          margin-left: 10px;
-      }
-  }
 
 
   </style>

src/views/projectSettlement1.vue

@@ -2,12 +2,13 @@
     <div class="projectSettlement1">
 
         <!-- 详情页 -->
-      <div class="ps1Header">
-        <div style="width: 500px;display: flex;">
+      <div class="pA1Header">
+        <div style="width: 400px;display: flex;">
           <div class="pAHeader1">项目管理</div>
           <div class="pAHeader1STit">项目详情</div>
         </div>
-        <div @click="back" style="cursor:pointer;margin-top: 6px;font-size: 16px;">返回</div>
+
+        <div @click="back" style="cursor:pointer;">返回</div>
       </div>
       <hr>
       <div class="AppBar">
@@ -23,39 +24,59 @@
       <div class="psSmallTit">
         结题时间:2023年-11月-20日
       </div>
-      <div class="selects">
-        <div class="inp1" style="width: 80%;">
-            <div class="inpText">项目名称</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
-        </div>
-        <div class="inp1">
-            <div class="inpText">项目负责人</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
-        </div>
-        <div class="inp1">
-            <div class="inpText">项目开始时间</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
-        </div>
-        <div class="inp1">
-            <div class="inpText">所在部门</div>
-            <el-select v-model="value" style="width:100%;" placeholder="请选择">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-        </div>
-        <div class="inp1">
-            <div class="inpText">预算总经费</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
-        </div>
-        <div class="inp1">
-            <div class="inpText">联系电话</div>
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
-        </div>
-      </div>
+
+
+
+<!-- 活动申请填写信息区域开始 -->
+     <div class="select">
+              <div class="selectTop">
+                <div class="label">项目名称</div>
+                <el-input v-model="input" placeholder="请输入内容"></el-input>
+              </div>
+              <div class="selectMid">
+                <div class="selectLeft">
+               
+                    <div class="inpBlock">
+                        <div class="label">负责人</div>
+                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    <div class="inpBlock">
+                        <div class="label">所在部门</div>
+                        <el-select v-model="input" style="width: 100%;" placeholder="请选择">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                    </div>
+                    <div class="inpBlock">
+                        <div class="label">联系电话</div>
+                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                </div>
+
+                <div class="selectRight">
+                  <div class="inpBlock">
+                        <div class="label">项目开始时间</div>
+                        <el-date-picker
+                          v-model="value"
+                          type="date"
+                          style="width: 100%;"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </div>
+                    <div class="inpBlock">
+                        <div class="label">预算总经费</div>
+                        <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    </div>
+                    
+                </div>
+              </div>
+              
+     </div>
+        <!-- 活动申请填写信息区域结束 -->
 
         <!-- 项目成员区域开始 -->
         <div class="PS1tabTit">
@@ -89,13 +110,6 @@
             >
           </el-table-column>
   
-          <el-table-column
-            prop="score"
-            label="学分"
-            align="center"
-            >
-          </el-table-column>
-          
           <el-table-column
             prop="operation"
             label="操作"
@@ -140,34 +154,23 @@
               label: '中德学院'
             }],
             value: '中德学院',
-           input:'3D智能演奏工具',
+           input:'',
             tableData:[{
               Name:'徐晓慧',
               class:'22电子通信G5',
               tel:'13751177411',
-              score:'-',
             },
             {
               Name:'林凡文',
               class:'22电子通信G5',
               tel:'13751177411',
-              score:'-',
             },
             {
               Name:'林凡文',
               class:'22电子通信G5',
               tel:'13751177411',
-              score:'-',
             },
             ],
-            pavalues:{
-              value:'',
-              value1:'',
-              value2:'',
-              value3:'',
-              value4:'',
-  
-            }
           }
         },
         methods:{
@@ -207,22 +210,22 @@
   <style lang="less">
   .projectSettlement1{
 
-    .ps1Header{
-      width: 100%;
-      display: flex;
-      justify-content:space-between;
-      .pAHeader1STit{
-        font-size: 16px;
-        margin-top:10px ;
-      }
-      .pAHeader1{
-        width: 110px;
-        font-weight: 600;
-        font-size: 22px;
-        display: flex;
-        // flex-shrink: 0;
-      }
-    }
+    // .ps1Header{
+    //   width: 100%;
+    //   display: flex;
+    //   justify-content:space-between;
+    //   .pAHeader1STit{
+    //     font-size: 16px;
+    //     margin-top:10px ;
+    //   }
+    //   .pAHeader1{
+    //     width: 110px;
+    //     font-weight: 600;
+    //     font-size: 22px;
+    //     display: flex;
+    //     // flex-shrink: 0;
+    //   }
+    // }
   
     .selects{
         width: 100%;
@@ -318,7 +321,7 @@
     }
     .psSmallTit{
         width: 100%;
-        margin: 15px 0px 5px 0px;
+        margin: 15px 0px 20px 0px;
         text-align: left;
         font-size: 16px;
     }

src/views/projectSettlement2.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="projectSettlement2">
-      <div class="ps1Header">
+      <div class="pA1Header">
         <!-- 详情页 -->
-        <div style="display: flex;">
+        <div style="display: flex;width: 400px;">
           <div class="pAHeader1">项目管理</div>
           <span class="pAHeader1STit">项目详情</span>
         </div>
-        <div @click="$router.back()" style="cursor:pointer;margin-top: 6px;font-size: 16px;">返回</div>
+        <div @click="$router.back()" style="cursor:pointer;">返回</div>
       </div>
       <hr>
       <div class="AppBar">